Merge pull request #212 from SumoLogic/sumo_252260

himsharma01 · web-flow · commit e31b5ee79240 · 2024-12-10T16:22:55.000+05:30
SAM and Telemetry updated for AWSO 2.11.0
diff --git a/awsautoenableS3Logging/packaged.yaml b/awsautoenableS3Logging/packaged.yaml
@@ -24,10 +24,10 @@ Metadata:
     - s3logging
     - flowlogs
     Name: sumologic-s3-logging-auto-enable
-    SemanticVersion: 1.0.15
+    SemanticVersion: 1.0.16
     SourceCodeUrl: https://github.com/SumoLogic/sumologic-aws-lambda/tree/main/awsautoenableS3Logging
-    LicenseUrl: s3://appdevstore/AutoEnableS3Logs/v1.0.15/978602b5b9ec16f8bab0e38fd6b3998f
-    ReadmeUrl: s3://appdevstore/AutoEnableS3Logs/v1.0.15/d05d411471e0bb4db3389f2523f515f0
+    LicenseUrl: s3://appdevstore/AutoEnableS3Logs/v1.0.16/978602b5b9ec16f8bab0e38fd6b3998f
+    ReadmeUrl: s3://appdevstore/AutoEnableS3Logs/v1.0.16/d05d411471e0bb4db3389f2523f515f0
     SpdxLicenseId: Apache-2.0
 Mappings:
   Region2ELBAccountId:
@@ -229,7 +229,7 @@ Resources:
     Type: AWS::Serverless::Function
     Condition: auto_enable_new
     Properties:
-      CodeUri: s3://appdevstore/sumo_app_utils/v2.0.18/sumo_app_utils.zip
+      CodeUri: s3://appdevstore/sumo_app_utils/v2.0.19/sumo_app_utils.zip
       Handler: awsresource.enable_s3_logs
       Runtime: python3.13
       Role:
@@ -467,7 +467,7 @@ Resources:
     Properties:
       Handler: main.handler
       Runtime: python3.13
-      CodeUri: s3://appdevstore/sumo_app_utils/v2.0.18/sumo_app_utils.zip
+      CodeUri: s3://appdevstore/sumo_app_utils/v2.0.19/sumo_app_utils.zip
       MemorySize: 128
       Timeout: 900
       Role:
diff --git a/awsautoenableS3Logging/sumologic-s3-logging-auto-enable.yaml b/awsautoenableS3Logging/sumologic-s3-logging-auto-enable.yaml
@@ -24,7 +24,7 @@ Metadata:
       - s3logging
       - flowlogs
     Name: sumologic-s3-logging-auto-enable
-    SemanticVersion: 1.0.15
+    SemanticVersion: 1.0.16
     SourceCodeUrl: https://github.com/SumoLogic/sumologic-aws-lambda/tree/main/awsautoenableS3Logging
     LicenseUrl: ./LICENSE
     ReadmeUrl: ./README.md
@@ -208,7 +208,7 @@ Resources:
     Type: 'AWS::Serverless::Function'
     Condition: auto_enable_new
     Properties:
-      CodeUri: s3://appdevstore/sumo_app_utils/v2.0.18/sumo_app_utils.zip
+      CodeUri: s3://appdevstore/sumo_app_utils/v2.0.19/sumo_app_utils.zip
       Handler: "awsresource.enable_s3_logs"
       Runtime: python3.13
       Role: !GetAtt SumoLambdaRole.Arn
@@ -385,7 +385,7 @@ Resources:
     Properties:
       Handler: main.handler
       Runtime: python3.13
-      CodeUri: s3://appdevstore/sumo_app_utils/v2.0.18/sumo_app_utils.zip
+      CodeUri: s3://appdevstore/sumo_app_utils/v2.0.19/sumo_app_utils.zip
       MemorySize: 128
       Timeout: 900
       Role:
diff --git a/cloudformation-telemetry/install_python_dependencies.sh b/cloudformation-telemetry/install_python_dependencies.sh
@@ -1,25 +1,27 @@
 #!/bin/bash
 
 # Pull the Amazon Linux image from Docker Hub
-docker pull amazonlinux
+# aws ecr-public get-login-password --region us-east-1 | docker login --username AWS --password-stdin public.ecr.aws
+docker pull public.ecr.aws/lambda/python:3.13-x86_64
 
 # Run the Amazon Linux container in detached mode
-docker run -d --name telemetry amazonlinux tail -f /dev/null
+docker run -d --name telemetry public.ecr.aws/lambda/python:3.13-x86_64 lambda_function.lambda_handler
 
-# Install Python, pip, and other dependencies inside the container
-docker exec -it telemetry /bin/bash -c "yum update -y && yum install -y python3-pip zip && python3 -m pip install virtualenv"
+# Install dependencies inside the container
+docker exec -it telemetry /bin/bash -c "dnf install -y zip"
 
 # Create a virtual environment and install dependencies
 docker exec -it telemetry /bin/bash -c "python3 -m venv temp-venv && source temp-venv/bin/activate && mkdir telemetry && cd telemetry && pip install crhelper sumologic-appclient-sdk future_fstrings setuptools -t ."
 
 # Copy python file from host to container
-docker cp ./lambda_function.py telemetry:/telemetry
+docker cp ./lambda_function.py telemetry:/var/task/telemetry
+docker cp ./metadata.yaml telemetry:/var/task/telemetry
 
 # Zip the contents of the telemetry directory
 docker exec -it telemetry /bin/bash -c "cd telemetry && ls -l && zip -r ../telemetry.zip ."
 
 # Copy the telemetry.zip file from the container to the host
-docker cp telemetry:/telemetry.zip ./telemetry.zip
+docker cp telemetry:/var/task/telemetry.zip ./telemetry.zip
 
 # Stop and remove the container
 docker stop telemetry
diff --git a/cloudformation-telemetry/metadata.yaml b/cloudformation-telemetry/metadata.yaml
@@ -0,0 +1,21 @@
+Logging:
+ LOG_FORMAT: "%(levelname)s | %(asctime)s | %(threadName)s | %(name)s | %(message)s"
+ ROTATION_TYPE: D
+ ROTATION_INTERVAL: 10
+ ENABLE_CONSOLE_LOG: true
+ ENABLE_LOGFILE: false
+ LOG_FILEPATH: /tmp/cloudformation-telemetry/telemetry.log
+ LOG_LEVEL: "DEBUG"
+
+Collection:
+ MAX_PAYLOAD_BYTESIZE: 500000
+ MAX_RETRY: 5
+ BACKOFF_FACTOR: 1
+ COMPRESSED: true
+ TIMEOUT: 60
+
+DeployMetaData:
+ PACKAGENAME: "cloudformation-telemetry"
+
+SumoLogic:
+  SUMO_ENDPOINT: null
diff --git a/cloudformation-telemetry/telemetry.zip b/cloudformation-telemetry/telemetry.zip
diff --git a/cloudtrailbenchmark/packaged.yaml b/cloudtrailbenchmark/packaged.yaml
@@ -43,9 +43,9 @@ Metadata:
     - benchmark
     - cloudtrail
     Name: sumologic-aws-cloudtrail-benchmark
-    LicenseUrl: s3://appdevstore/cloudtrailbenchmark/v1.0.17/cac1a6df52c685e0f6ebe4ae72078c80
-    ReadmeUrl: s3://appdevstore/cloudtrailbenchmark/v1.0.17/8a901bb4fbbe82f128fc502dd3077508
-    SemanticVersion: 1.0.17
+    LicenseUrl: s3://appdevstore/cloudtrailbenchmark/v1.0.18/cac1a6df52c685e0f6ebe4ae72078c80
+    ReadmeUrl: s3://appdevstore/cloudtrailbenchmark/v1.0.18/8a901bb4fbbe82f128fc502dd3077508
+    SemanticVersion: 1.0.18
     SourceCodeUrl: https://github.com/SumoLogic/sumologic-aws-lambda/tree/main/cloudtrailbenchmark
 Parameters:
   CollectorName:
@@ -127,7 +127,7 @@ Resources:
     Properties:
       Location:
         ApplicationId: arn:aws:serverlessrepo:us-east-1:956882708938:applications/sumologic-app-utils
-        SemanticVersion: 2.0.18
+        SemanticVersion: 2.0.19
     Metadata:
       SamResourceId: SumoAppUtils
   SumoRole:
diff --git a/cloudtrailbenchmark/template.yaml b/cloudtrailbenchmark/template.yaml
@@ -49,7 +49,7 @@ Metadata:
     Name: sumologic-aws-cloudtrail-benchmark
     LicenseUrl: ./LICENSE
     ReadmeUrl: ./README.md
-    SemanticVersion: 1.0.17
+    SemanticVersion: 1.0.18
     SourceCodeUrl: https://github.com/SumoLogic/sumologic-aws-lambda/tree/main/cloudtrailbenchmark
 
 
@@ -123,7 +123,7 @@ Resources:
     Properties:
       Location:
         ApplicationId: arn:aws:serverlessrepo:us-east-1:956882708938:applications/sumologic-app-utils
-        SemanticVersion: 2.0.18
+        SemanticVersion: 2.0.19
 
   SumoRole:
     Condition: SetupSumoResources
diff --git a/cloudtrailbenchmark/testdeploy.sh b/cloudtrailbenchmark/testdeploy.sh
@@ -12,7 +12,7 @@ else
 fi
 uid=$(cat /dev/random | LC_CTYPE=C tr -dc "[:lower:]" | head -c 6)
 
-version="1.0.17"
+version="1.0.18"
 
 sam package --template-file template.yaml --s3-bucket $SAM_S3_BUCKET  --output-template-file packaged.yaml --s3-prefix "cloudtrailbenchmark/v$version" --region $AWS_REGION --profile $AWS_PROFILE
 
diff --git a/sumologic-app-utils/deploy.sh b/sumologic-app-utils/deploy.sh
@@ -31,7 +31,7 @@ rm sumo_app_utils.zip
 
 ./build.sh
 
-version="2.0.18"
+version="2.0.19"
 
 aws s3 cp sumo_app_utils.zip s3://$SAM_S3_BUCKET/sumo_app_utils/v"$version"/sumo_app_utils.zip --region $AWS_REGION --acl public-read
 
diff --git a/sumologic-app-utils/packaged_sumo_app_utils.yaml b/sumologic-app-utils/packaged_sumo_app_utils.yaml
@@ -20,17 +20,17 @@ Metadata:
     - sumologic
     - serverless
     Name: sumologic-app-utils
-    SemanticVersion: 2.0.18
+    SemanticVersion: 2.0.19
     SourceCodeUrl: https://github.com/SumoLogic/sumologic-aws-lambda/tree/main/sumologic-app-utils
     SpdxLicenseId: Apache-2.0
-    ReadmeUrl: s3://appdevstore/sumo_app_utils/v2.0.18/4d5a92c06a7fa9d956a900e51a1f6be4
+    ReadmeUrl: s3://appdevstore/sumo_app_utils/v2.0.19/4d5a92c06a7fa9d956a900e51a1f6be4
 Resources:
   SumoAppUtilsFunction:
     Type: AWS::Serverless::Function
     Properties:
       Handler: main.handler
       Runtime: python3.13
-      CodeUri: s3://appdevstore/sumo_app_utils/v2.0.18/sumo_app_utils.zip
+      CodeUri: s3://appdevstore/sumo_app_utils/v2.0.19/sumo_app_utils.zip
       MemorySize: 128
       Timeout: 300
       Policies:
diff --git a/sumologic-app-utils/src/constants.py b/sumologic-app-utils/src/constants.py
@@ -12,7 +12,7 @@
           "type": "array",
           "items": {
             "type": "string",
-            "pattern": "^[a-zA-Z0-9_]+=[a-zA-Z0-9_;]+$"
+            "pattern": "[a-zA-Z0-9=_;,]+$"
           }
         }
       },
diff --git a/sumologic-app-utils/sumo_app_utils.yaml b/sumologic-app-utils/sumo_app_utils.yaml
@@ -17,7 +17,7 @@ Metadata:
       - sumologic
       - serverless
     Name: sumologic-app-utils
-    SemanticVersion: 2.0.18
+    SemanticVersion: 2.0.19
     SourceCodeUrl: https://github.com/SumoLogic/sumologic-aws-lambda/tree/main/sumologic-app-utils
     SpdxLicenseId: Apache-2.0
     ReadmeUrl: ./README.md
@@ -29,7 +29,7 @@ Resources:
     Properties:
       Handler: main.handler
       Runtime: python3.13
-      CodeUri: s3://appdevstore/sumo_app_utils/v2.0.18/sumo_app_utils.zip
+      CodeUri: s3://appdevstore/sumo_app_utils/v2.0.19/sumo_app_utils.zip
       MemorySize: 128
       Timeout: 300
       Policies:
diff --git a/sumologic-app-utils/sumo_app_utils.zip b/sumologic-app-utils/sumo_app_utils.zip

Original file line number	Diff line number	Diff line change
`@@ -12,7 +12,7 @@`
`12`	`12`	`"type": "array",`
`13`	`13`	`"items": {`
`14`	`14`	`"type": "string",`
`15`		`- "pattern": "^[a-zA-Z0-9_]+=[a-zA-Z0-9_;]+$"`
	`15`	`+ "pattern": "[a-zA-Z0-9=_;,]+$"`
`16`	`16`	`}`
`17`	`17`	`}`
`18`	`18`	`},`