Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Sumo 252075: Updated python version to 3.13 in AWSO #217

Merged
merged 2 commits into from
Dec 6, 2024
Merged

Sumo 252075: Updated python version to 3.13 in AWSO #217

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
2ecdbe4
Updated python version to 3.13
akhil-sumologic Dec 4, 2024
f3a859c
Updated AWSO version to 2.11.0 in yaml/sh files
akhil-sumologic Dec 6, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Binary file modified ...rvability/apps/SumoLogicAWSObservabilityHelper/SumoLogicAWSObservabilityHelperv2.0.20.zip
View file
Open in desktop
Binary file not shown.
4 changes: 2 additions & 2 deletions aws-observability/apps/alb/alb_app.template.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -291,10 +291,10 @@ Resources:
Type: 'AWS::Serverless::Function'
Properties:
Handler: main.handler
Runtime: python3.12
Runtime: python3.13
CodeUri:
Bucket: !FindInMap [ RegionMap, !Ref 'AWS::Region', bucketname ]
Key: "sumologic-aws-observability/apps/SumoLogicAWSObservabilityHelper/SumoLogicAWSObservabilityHelperv2.0.19.zip"
Key: "sumologic-aws-observability/apps/SumoLogicAWSObservabilityHelper/SumoLogicAWSObservabilityHelperv2.0.20.zip"
MemorySize: 128
Timeout: 900
Role:
Expand Down
8 changes: 4 additions & 4 deletions aws-observability/apps/common/resources.template.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -487,7 +487,7 @@ Resources:
Type: 'AWS::Serverless::Function'
Properties:
Handler: main.handler
Runtime: python3.12
Runtime: python3.13
Description: "Lambda Function for deploying SumoLogic AWS Observability Solution."
CodeUri:
Bucket: !FindInMap [ RegionMap, !Ref 'AWS::Region', bucketname ]
Expand Down Expand Up @@ -531,11 +531,11 @@ Resources:
Type: 'AWS::Serverless::Function'
Properties:
Handler: main.handler
Runtime: python3.12
Runtime: python3.13
Description: "Lambda Function for deploying SumoLogic AWS Observability Solution."
CodeUri:
Bucket: !FindInMap [ RegionMap, !Ref 'AWS::Region', bucketname ]
Key: "sumologic-aws-observability/apps/SumoLogicAWSObservabilityHelper/SumoLogicAWSObservabilityHelperv2.0.19.zip"
Key: "sumologic-aws-observability/apps/SumoLogicAWSObservabilityHelper/SumoLogicAWSObservabilityHelperv2.0.20.zip"
MemorySize: 128
Timeout: 900
Role:
Expand Down Expand Up @@ -1108,7 +1108,7 @@ Resources:
Handler: index.lambda_handler
MemorySize: 128
Role: !GetAtt "LambdaRole.Arn"
Runtime: python3.11
Runtime: python3.13
Timeout: 60
Environment:
Variables:
Expand Down
4 changes: 2 additions & 2 deletions aws-observability/apps/controltower/controltower.template.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -212,7 +212,7 @@ Resources:
from botocore.exceptions import ClientError

name = 'SUMO-LOGIC-AWS-OBSERVABILITY'
templateURL = "https://sumologic-appdev-aws-sam-apps.s3.amazonaws.com/aws-observability-versions/v2.10.0/sumologic_observability.master.template.yaml"
templateURL = "https://sumologic-appdev-aws-sam-apps.s3.amazonaws.com/aws-observability-versions/v2.11.0/sumologic_observability.master.template.yaml"
ALL = ["CAPABILITY_IAM", "CAPABILITY_NAMED_IAM", "CAPABILITY_AUTO_EXPAND"]


Expand Down Expand Up @@ -282,7 +282,7 @@ Resources:
Handler: index.lambda_handler
MemorySize: 128
Role: !GetAtt "LambdaRoleToCaptureEvents.Arn"
Runtime: python3.11
Runtime: python3.13
Timeout: 60
Environment:
Variables:
Expand Down
4 changes: 2 additions & 2 deletions aws-observability/apps/elb/elb_app.template.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -288,10 +288,10 @@ Resources:
Type: 'AWS::Serverless::Function'
Properties:
Handler: main.handler
Runtime: python3.12
Runtime: python3.13
CodeUri:
Bucket: !FindInMap [ RegionMap, !Ref 'AWS::Region', bucketname ]
Key: "sumologic-aws-observability/apps/SumoLogicAWSObservabilityHelper/SumoLogicAWSObservabilityHelperv2.0.19.zip"
Key: "sumologic-aws-observability/apps/SumoLogicAWSObservabilityHelper/SumoLogicAWSObservabilityHelperv2.0.20.zip"
MemorySize: 128
Timeout: 900
Role:
Expand Down
4 changes: 2 additions & 2 deletions aws-observability/apps/hostmetricsfields/host_metrics_add_fields.template.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -180,10 +180,10 @@ Resources:
Type: AWS::Lambda::Function
Properties:
Handler: main.handler
Runtime: python3.12
Runtime: python3.13
Code:
S3Bucket: !FindInMap [RegionMap, !Ref 'AWS::Region', bucketname]
S3Key: "sumologic-aws-observability/apps/SumoLogicAWSObservabilityHelper/SumoLogicAWSObservabilityHelperv2.0.19.zip"
S3Key: "sumologic-aws-observability/apps/SumoLogicAWSObservabilityHelper/SumoLogicAWSObservabilityHelperv2.0.20.zip"
MemorySize: 128
Timeout: 900
Role: !GetAtt LambdaRole.Arn
Expand Down
4 changes: 2 additions & 2 deletions aws-observability/apps/permissionchecker/permissioncheck.nested.template.test.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -358,10 +358,10 @@ Resources:
Type: 'AWS::Serverless::Function'
Properties:
Handler: main.handler
Runtime: python3.12
Runtime: python3.13
CodeUri:
Bucket: !FindInMap [RegionMap, !Ref 'AWS::Region', bucketname]
Key: "sumologic-aws-observability/apps/SumoLogicAWSObservabilityHelper/SumoLogicAWSObservabilityHelperv2.0.19.zip"
Key: "sumologic-aws-observability/apps/SumoLogicAWSObservabilityHelper/SumoLogicAWSObservabilityHelperv2.0.20.zip"
MemorySize: 128
Timeout: 900
Role:
Expand Down
4 changes: 2 additions & 2 deletions aws-observability/apps/permissionchecker/permissioncheck.nested.template.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -366,10 +366,10 @@ Resources:
Type: 'AWS::Serverless::Function'
Properties:
Handler: main.handler
Runtime: python3.12
Runtime: python3.13
CodeUri:
Bucket: !FindInMap [RegionMap, !Ref 'AWS::Region', bucketname]
Key: "sumologic-aws-observability/apps/SumoLogicAWSObservabilityHelper/SumoLogicAWSObservabilityHelperv2.0.19.zip"
Key: "sumologic-aws-observability/apps/SumoLogicAWSObservabilityHelper/SumoLogicAWSObservabilityHelperv2.0.20.zip"
MemorySize: 128
Timeout: 900
Role:
Expand Down
2 changes: 1 addition & 1 deletion aws-observability/apps/permissionchecker/permissioncheck.template.test.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@ Mappings:
CommonData:
NestedTemplate:
BucketName: "sumologic-appdev-aws-sam-apps"
Version: "v2.10.0"
Version: "v2.11.0"

Resources:

Expand Down
2 changes: 1 addition & 1 deletion aws-observability/apps/permissionchecker/permissioncheck.template.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@ Mappings:
CommonData:
NestedTemplate:
BucketName: "sumologic-appdev-aws-sam-apps"
Version: "v2.10.0"
Version: "v2.11.0"

Resources:

Expand Down
4 changes: 2 additions & 2 deletions aws-observability/apps/rootcause/rootcauseexplorer.template.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -318,10 +318,10 @@ Resources:
Type: 'AWS::Serverless::Function'
Properties:
Handler: main.handler
Runtime: python3.12
Runtime: python3.13
CodeUri:
Bucket: !FindInMap [ RegionMap, !Ref 'AWS::Region', bucketname ]
Key: "sumologic-aws-observability/apps/SumoLogicAWSObservabilityHelper/SumoLogicAWSObservabilityHelperv2.0.19.zip"
Key: "sumologic-aws-observability/apps/SumoLogicAWSObservabilityHelper/SumoLogicAWSObservabilityHelperv2.0.20.zip"
MemorySize: 128
Timeout: 900
Role:
Expand Down
2 changes: 1 addition & 1 deletion aws-observability/scripts/AWSOAutoSetupScript/DeployAWSOPosix.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@ then
AWS_REGION=us-east-1;
fi

masterTemplateURL="https://sumologic-appdev-aws-sam-apps.s3.amazonaws.com/aws-observability-versions/v2.10.0/sumologic_observability.master.template.yaml"
masterTemplateURL="https://sumologic-appdev-aws-sam-apps.s3.amazonaws.com/aws-observability-versions/v2.11.0/sumologic_observability.master.template.yaml"

#identify sumo deployment associated with sumo accessId and accessKey
export apiUrl="https://api.sumologic.com"
Expand Down
2 changes: 1 addition & 1 deletion aws-observability/scripts/AWSOAutoSetupScript/DeployAWSOPosixTest.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@ then
AWS_REGION=us-east-1;
fi

masterTemplateURL="https://sumologic-appdev-aws-sam-apps.s3.amazonaws.com/aws-observability-versions/v2.10.0/sumologic_observability.master.template.yaml"
masterTemplateURL="https://sumologic-appdev-aws-sam-apps.s3.amazonaws.com/aws-observability-versions/v2.11.0/sumologic_observability.master.template.yaml"

#identify sumo deployment associated with sumo accessId and accessKey
export apiUrl="https://api.sumologic.com"
Expand Down
2 changes: 1 addition & 1 deletion aws-observability/scripts/AWSOAutoSetupScript/DeployAWSOWin.ps1
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ $now=Get-Date
echo "AWS Observability Script initiated at : $now"

#identify sumo deployment associated with sumo accessId and accessKey
$masterTemplateURL="https://sumologic-appdev-aws-sam-apps.s3.amazonaws.com/aws-observability-versions/v2.10.0/sumologic_observability.master.template.yaml"
$masterTemplateURL="https://sumologic-appdev-aws-sam-apps.s3.amazonaws.com/aws-observability-versions/v2.11.0/sumologic_observability.master.template.yaml"
$apiUrl="https://api.sumologic.com"
$deployment="us1"
[Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12
Expand Down
2 changes: 1 addition & 1 deletion aws-observability/scripts/AWSOAutoSetupScript/DeployAWSOWinTest.ps1
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ $now=Get-Date
echo "AWS Observability Script initiated at : $now"

#identify sumo deployment associated with sumo accessId and accessKey
$masterTemplateURL="https://sumologic-appdev-aws-sam-apps.s3.amazonaws.com/aws-observability-versions/v2.10.0/sumologic_observability.master.template.yaml"
$masterTemplateURL="https://sumologic-appdev-aws-sam-apps.s3.amazonaws.com/aws-observability-versions/v2.11.0/sumologic_observability.master.template.yaml"
$apiUrl="https://api.sumologic.com"
$deployment="us1"
[Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12
Expand Down
2 changes: 1 addition & 1 deletion aws-observability/scripts/DeployTemplate/DeployTemplate.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ export parameters_path=parameters-${ENV_NAME}.json

# Downloading the template to local for use. Remove if the template with same name if already present.
rm sumologic_observability_template.yaml
aws s3 cp s3://sumologic-appdev-aws-sam-apps/aws-observability-versions/v2.10.0/sumologic_observability.master.template.yaml sumologic_observability_template.yaml
aws s3 cp s3://sumologic-appdev-aws-sam-apps/aws-observability-versions/v2.11.0/sumologic_observability.master.template.yaml sumologic_observability_template.yaml

# Deploy the template. If the Stack name already exist, stack will be updated else created.
aws cloudformation deploy --profile ${AWS_PROFILE} --region ${AWS_REGION} \
Expand Down
2 changes: 1 addition & 1 deletion aws-observability/scripts/TestTemplate.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
#!/bin/sh

export folder_name=rootcause
export template_version="v2.10.0"
export template_version="v2.11.0"
export template_bucket="sumologic-appdev-aws-sam-apps"
export lambda_arn="arn:aws:lambda:ap-south-1:668508221233:function:LambdaFucntion-LambdaHelper-1C1GGLRYPWBB0"

Expand Down
2 changes: 1 addition & 1 deletion aws-observability/sync.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ APPS_TEMPLATES_DIR=./apps
APPS_JSON_DIR=./json

# Bucket name
CF_VERSION=v2.10.0
CF_VERSION=v2.11.0
BUCKET_REGION=us-east-1
BUCKET=sumologic-appdev-aws-sam-apps
S3_KEY_PREFIX=aws-observability-versions/${CF_VERSION}
Expand Down
4 changes: 2 additions & 2 deletions aws-observability/templates/sumologic_observability.master.template.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -606,7 +606,7 @@ Resources:
DeletionPolicy: Retain
Properties:
Handler: lambda_function.lambda_handler
Runtime: python3.12
Runtime: python3.13
Code:
S3Bucket: !FindInMap [ RegionMap, !Ref 'AWS::Region', bucketname ]
S3Key: "sumologic-aws-observability/apps/SumoLogicAWSObservabilityHelper/telemetryv1.0.0.zip"
Expand Down Expand Up @@ -637,7 +637,7 @@ Resources:
sumoOrgId:
!Ref Section1dSumoLogicOrganizationId
solutionName: 'AWSO'
solutionVersion: 'v2.10.0'
solutionVersion: 'v2.11.0'
deploymentSource: 'cloudFormation'
TelemetryEndpoint: "https://endpoint1.collection.us2.sumologic.com/receiver/v1/http/ZaVnC4dhaV1S68eao6UYB3LFtqQ7ur1xYlT1EHCfXdhvi6uPNc0aUXIpvq5i_aHewOp5xxxwnGZ5MmSWDR6qV5td4exMM4pZE4Tk6rqKvgextLx7I6IRpg=="
scanInterval: 60
Expand Down
Loading