From be74e4f064ff7c819fe40cc4bc93f8a91cc05eed Mon Sep 17 00:00:00 2001 From: Akhil Dangore Date: Mon, 10 Jun 2024 18:46:00 +0530 Subject: [PATCH 1/4] Moved fields into common template from individual child templates --- .../apps/alb/alb_app.template.yaml | 10 -- .../apigateway/api_gateway_app.template.yaml | 23 --- .../apps/common/resources.template.yaml | 165 ++++++++++++++++++ .../apps/dynamodb/dynamodb_app.template.yaml | 10 -- .../ec2metrics/ec2_metrics_app.template.yaml | 10 -- .../apps/ecs/ecs_app.template.yaml | 10 -- .../elasticache/elasticache_app.template.yaml | 10 -- .../apps/elb/elb_app.template.yaml | 9 - .../apps/lambda/lambda_app.template.yaml | 10 -- .../apps/nlb/nlb_app.template.yaml | 11 -- .../apps/rds/rds_app.template.yaml | 12 -- .../apps/sns/sns_app.template.yaml | 10 -- .../apps/sqs/sqs_app.template.yaml | 12 -- ...mologic_observability.master.template.yaml | 5 +- 14 files changed, 168 insertions(+), 139 deletions(-) diff --git a/aws-observability/apps/alb/alb_app.template.yaml b/aws-observability/apps/alb/alb_app.template.yaml index 2fb3eb4e..d4fe9ef0 100755 --- a/aws-observability/apps/alb/alb_app.template.yaml +++ b/aws-observability/apps/alb/alb_app.template.yaml @@ -384,16 +384,6 @@ Resources: SumoAccessKey: !Ref Section1cSumoAccessKey SumoDeployment: !Ref Section1aSumoDeployment - AddLoadBalancerField: - Type: Custom::SumoLogicFieldsSchema - Properties: - ServiceToken: !Ref Section6aParentStackLambdaARN - FieldName: "loadbalancer" - RemoveOnDeleteStack: false - SumoAccessID: !Ref Section1bSumoAccessID - SumoAccessKey: !Ref Section1cSumoAccessKey - SumoDeployment: !Ref Section1aSumoDeployment - Outputs: ExistingMetricSourceName: Description: "Existing CloudWatch Metrics Source Name" diff --git a/aws-observability/apps/apigateway/api_gateway_app.template.yaml b/aws-observability/apps/apigateway/api_gateway_app.template.yaml index 936ba42b..6f9dbeff 100755 --- a/aws-observability/apps/apigateway/api_gateway_app.template.yaml +++ b/aws-observability/apps/apigateway/api_gateway_app.template.yaml @@ -205,9 +205,6 @@ Resources: AccessLogsFieldExtractionRule: Type: Custom::SumoLogicFieldExtractionRule Condition: create_fer - DependsOn: - - AddApiNameField - - AddApiIdField Properties: ServiceToken: !Ref Section4aParentStackLambdaARN RemoveOnDeleteStack: false @@ -234,23 +231,3 @@ Resources: SumoAccessID: !Ref Section1bSumoAccessID SumoAccessKey: !Ref Section1cSumoAccessKey SumoDeployment: !Ref Section1aSumoDeployment - - AddApiNameField: - Type: Custom::SumoLogicFieldsSchema - Properties: - ServiceToken: !Ref Section4aParentStackLambdaARN - FieldName: "apiname" - RemoveOnDeleteStack: false - SumoAccessID: !Ref Section1bSumoAccessID - SumoAccessKey: !Ref Section1cSumoAccessKey - SumoDeployment: !Ref Section1aSumoDeployment - - AddApiIdField: - Type: Custom::SumoLogicFieldsSchema - Properties: - ServiceToken: !Ref Section4aParentStackLambdaARN - FieldName: "apiid" - RemoveOnDeleteStack: false - SumoAccessID: !Ref Section1bSumoAccessID - SumoAccessKey: !Ref Section1cSumoAccessKey - SumoDeployment: !Ref Section1aSumoDeployment \ No newline at end of file diff --git a/aws-observability/apps/common/resources.template.yaml b/aws-observability/apps/common/resources.template.yaml index 71dec66a..f55c7766 100755 --- a/aws-observability/apps/common/resources.template.yaml +++ b/aws-observability/apps/common/resources.template.yaml @@ -49,6 +49,15 @@ Parameters: Description: "Provide the Sumo Logic Account ID for trust relationship." Default: "" + InstallObservabilityApps: + Type: String + Default: 'Yes' + Description: "Yes - Installs Apps (EC2, Application Load Balancer, RDS, API Gateway, Lambda, Dynamo DB, ECS, ElastiCache and NLB) and Alerts for the Sumo Logic AWS Observability Solution. All the Apps are installed in the folder 'AWS Observability'. + No - Skips the installation of Apps and Alerts." + AllowedValues: + - 'Yes' + - 'No' + CreateMetaDataSource: Type: String Description: "Yes - Creates Sumo Logic MetaData Source. A common metadata source will be created with the region selected. @@ -247,6 +256,7 @@ Parameters: Conditions: # Sources Conditions + install_observability_apps: !Equals [ !Ref InstallObservabilityApps, 'Yes' ] install_metadata_source: !Equals [ !Ref CreateMetaDataSource, 'Yes' ] install_cloud_watch_metric_source: !Equals [ !Ref CreateCloudWatchMetricsSource, 'Yes' ] install_alb_logs_source: !Equals [ !Ref CreateALBLogSource, 'Yes' ] @@ -883,6 +893,161 @@ Resources: SumoAccessKey: !Ref SumoLogicAccessKey SumoDeployment: !Ref SumoLogicDeployment + # ALB App + AddLoadBalancerField: + Condition: install_observability_apps + Type: Custom::SumoLogicFieldsSchema + Properties: + ServiceToken: !GetAtt LambdaHelper.Arn + FieldName: "loadbalancer" + RemoveOnDeleteStack: false + SumoAccessID: !Ref SumoLogicAccessID + SumoAccessKey: !Ref SumoLogicAccessKey + SumoDeployment: !Ref SumoLogicDeployment + + # Dynamodb App + AddTableNameField: + Condition: install_observability_apps + Type: Custom::SumoLogicFieldsSchema + Properties: + ServiceToken: !GetAtt LambdaHelper.Arn + FieldName: "tablename" + RemoveOnDeleteStack: false + SumoAccessID: !Ref SumoLogicAccessID + SumoAccessKey: !Ref SumoLogicAccessKey + SumoDeployment: !Ref SumoLogicDeployment + + # ELb App + AddLoadBalancerNameField: + Condition: install_observability_apps + Type: Custom::SumoLogicFieldsSchema + Properties: + ServiceToken: !GetAtt LambdaHelper.Arn + FieldName: "loadbalancername" + RemoveOnDeleteStack: false + SumoAccessID: !Ref SumoLogicAccessID + SumoAccessKey: !Ref SumoLogicAccessKey + SumoDeployment: !Ref SumoLogicDeployment + + # Lambda App + AddFunctionNameField: + Condition: install_observability_apps + Type: Custom::SumoLogicFieldsSchema + Properties: + ServiceToken: !GetAtt LambdaHelper.Arn + FieldName: "functionname" + RemoveOnDeleteStack: false + SumoAccessID: !Ref SumoLogicAccessID + SumoAccessKey: !Ref SumoLogicAccessKey + SumoDeployment: !Ref SumoLogicDeployment + + # EC2 App + AddInstanceIdField: + Condition: install_observability_apps + Type: Custom::SumoLogicFieldsSchema + Properties: + ServiceToken: !GetAtt LambdaHelper.Arn + FieldName: "instanceid" + RemoveOnDeleteStack: false + SumoAccessID: !Ref SumoLogicAccessID + SumoAccessKey: !Ref SumoLogicAccessKey + SumoDeployment: !Ref SumoLogicDeployment + + # RDS App + AddDBIdentifierField: + Condition: install_observability_apps + Type: Custom::SumoLogicFieldsSchema + Properties: + ServiceToken: !GetAtt LambdaHelper.Arn + FieldName: "dbidentifier" + RemoveOnDeleteStack: false + SumoAccessID: !Ref SumoLogicAccessID + SumoAccessKey: !Ref SumoLogicAccessKey + SumoDeployment: !Ref SumoLogicDeployment + + # Elastic App + AddCacheClusterIdField: + Condition: install_observability_apps + Type: Custom::SumoLogicFieldsSchema + Properties: + ServiceToken: !GetAtt LambdaHelper.Arn + FieldName: "cacheclusterid" + RemoveOnDeleteStack: false + SumoAccessID: !Ref SumoLogicAccessID + SumoAccessKey: !Ref SumoLogicAccessKey + SumoDeployment: !Ref SumoLogicDeployment + + # API gateway App + AddApiNameField: + Condition: install_observability_apps + Type: Custom::SumoLogicFieldsSchema + Properties: + ServiceToken: !GetAtt LambdaHelper.Arn + FieldName: "apiname" + RemoveOnDeleteStack: false + SumoAccessID: !Ref SumoLogicAccessID + SumoAccessKey: !Ref SumoLogicAccessKey + SumoDeployment: !Ref SumoLogicDeployment + + # API gateway App + AddApiIdField: + Condition: install_observability_apps + Type: Custom::SumoLogicFieldsSchema + Properties: + ServiceToken: !GetAtt LambdaHelper.Arn + FieldName: "apiid" + RemoveOnDeleteStack: false + SumoAccessID: !Ref SumoLogicAccessID + SumoAccessKey: !Ref SumoLogicAccessKey + SumoDeployment: !Ref SumoLogicDeployment + + # SNS App + AddTopicNameField: + Condition: install_observability_apps + Type: Custom::SumoLogicFieldsSchema + Properties: + ServiceToken: !GetAtt LambdaHelper.Arn + FieldName: "topicname" + RemoveOnDeleteStack: false + SumoAccessID: !Ref SumoLogicAccessID + SumoAccessKey: !Ref SumoLogicAccessKey + SumoDeployment: !Ref SumoLogicDeployment + + # SQS App + AddQueueNameField: + Condition: install_observability_apps + Type: Custom::SumoLogicFieldsSchema + Properties: + ServiceToken: !GetAtt LambdaHelper.Arn + FieldName: "queuename" + RemoveOnDeleteStack: false + SumoAccessID: !Ref SumoLogicAccessID + SumoAccessKey: !Ref SumoLogicAccessKey + SumoDeployment: !Ref SumoLogicDeployment + + # ECS App + AddClusterNameField: + Condition: install_observability_apps + Type: Custom::SumoLogicFieldsSchema + Properties: + ServiceToken: !GetAtt LambdaHelper.Arn + FieldName: "clustername" + RemoveOnDeleteStack: false + SumoAccessID: !Ref SumoLogicAccessID + SumoAccessKey: !Ref SumoLogicAccessKey + SumoDeployment: !Ref SumoLogicDeployment + + # NLB App + AddNETLoadBalancerField: + Condition: install_observability_apps + Type: Custom::SumoLogicFieldsSchema + Properties: + ServiceToken: !GetAtt LambdaHelper.Arn + FieldName: "networkloadbalancer" + RemoveOnDeleteStack: false + SumoAccessID: !Ref SumoLogicAccessID + SumoAccessKey: !Ref SumoLogicAccessKey + SumoDeployment: !Ref SumoLogicDeployment ############# START - RESOURCES FOR METADATA SOURCE ################# SumoLogicMetaDataSource: diff --git a/aws-observability/apps/dynamodb/dynamodb_app.template.yaml b/aws-observability/apps/dynamodb/dynamodb_app.template.yaml index 7effe15f..ad58561f 100755 --- a/aws-observability/apps/dynamodb/dynamodb_app.template.yaml +++ b/aws-observability/apps/dynamodb/dynamodb_app.template.yaml @@ -200,13 +200,3 @@ Resources: SumoAccessID: !Ref Section1bSumoAccessID SumoAccessKey: !Ref Section1cSumoAccessKey SumoDeployment: !Ref Section1aSumoDeployment - - AddTableNameField: - Type: Custom::SumoLogicFieldsSchema - Properties: - ServiceToken: !Ref Section4aParentStackLambdaARN - FieldName: "tablename" - RemoveOnDeleteStack: false - SumoAccessID: !Ref Section1bSumoAccessID - SumoAccessKey: !Ref Section1cSumoAccessKey - SumoDeployment: !Ref Section1aSumoDeployment \ No newline at end of file diff --git a/aws-observability/apps/ec2metrics/ec2_metrics_app.template.yaml b/aws-observability/apps/ec2metrics/ec2_metrics_app.template.yaml index ee1f5318..6a2f2e3c 100755 --- a/aws-observability/apps/ec2metrics/ec2_metrics_app.template.yaml +++ b/aws-observability/apps/ec2metrics/ec2_metrics_app.template.yaml @@ -265,13 +265,3 @@ Resources: SumoAccessKey: !Ref Section1cSumoAccessKey SumoDeployment: !Ref Section1aSumoDeployment orgid: !Ref Section1eOrgId - - AddInstanceIdField: - Type: Custom::SumoLogicFieldsSchema - Properties: - ServiceToken: !Ref Section3aParentStackLambdaARN - FieldName: "instanceid" - RemoveOnDeleteStack: false - SumoAccessID: !Ref Section1bSumoAccessID - SumoAccessKey: !Ref Section1cSumoAccessKey - SumoDeployment: !Ref Section1aSumoDeployment \ No newline at end of file diff --git a/aws-observability/apps/ecs/ecs_app.template.yaml b/aws-observability/apps/ecs/ecs_app.template.yaml index c103ec89..e4895728 100755 --- a/aws-observability/apps/ecs/ecs_app.template.yaml +++ b/aws-observability/apps/ecs/ecs_app.template.yaml @@ -161,16 +161,6 @@ Conditions: Resources: - AddClusterNameField: - Type: Custom::SumoLogicFieldsSchema - Properties: - ServiceToken: !Ref Section4aParentStackLambdaARN - FieldName: "clustername" - RemoveOnDeleteStack: false - SumoAccessID: !Ref Section1bSumoAccessID - SumoAccessKey: !Ref Section1cSumoAccessKey - SumoDeployment: !Ref Section1aSumoDeployment - sumoApp: Type: Custom::App Condition: install_app diff --git a/aws-observability/apps/elasticache/elasticache_app.template.yaml b/aws-observability/apps/elasticache/elasticache_app.template.yaml index e7b2ea3e..f7295796 100755 --- a/aws-observability/apps/elasticache/elasticache_app.template.yaml +++ b/aws-observability/apps/elasticache/elasticache_app.template.yaml @@ -201,13 +201,3 @@ Resources: SumoAccessID: !Ref Section1bSumoAccessID SumoAccessKey: !Ref Section1cSumoAccessKey SumoDeployment: !Ref Section1aSumoDeployment - - AddCacheClusterIdField: - Type: Custom::SumoLogicFieldsSchema - Properties: - ServiceToken: !Ref Section4aParentStackLambdaARN - FieldName: "cacheclusterid" - RemoveOnDeleteStack: false - SumoAccessID: !Ref Section1bSumoAccessID - SumoAccessKey: !Ref Section1cSumoAccessKey - SumoDeployment: !Ref Section1aSumoDeployment \ No newline at end of file diff --git a/aws-observability/apps/elb/elb_app.template.yaml b/aws-observability/apps/elb/elb_app.template.yaml index 516ab6e9..ef1a6b44 100755 --- a/aws-observability/apps/elb/elb_app.template.yaml +++ b/aws-observability/apps/elb/elb_app.template.yaml @@ -381,15 +381,6 @@ Resources: SumoAccessKey: !Ref Section1cSumoAccessKey SumoDeployment: !Ref Section1aSumoDeployment - AddLoadBalancerNameField: - Type: Custom::SumoLogicFieldsSchema - Properties: - ServiceToken: !Ref Section6aParentStackLambdaARN - FieldName: "loadbalancername" - RemoveOnDeleteStack: false - SumoAccessID: !Ref Section1bSumoAccessID - SumoAccessKey: !Ref Section1cSumoAccessKey - SumoDeployment: !Ref Section1aSumoDeployment Outputs: ExistingLogSourceName: diff --git a/aws-observability/apps/lambda/lambda_app.template.yaml b/aws-observability/apps/lambda/lambda_app.template.yaml index 6c21130e..902ffead 100755 --- a/aws-observability/apps/lambda/lambda_app.template.yaml +++ b/aws-observability/apps/lambda/lambda_app.template.yaml @@ -374,16 +374,6 @@ Resources: SumoAccessKey: !Ref Section1cSumoAccessKey SumoDeployment: !Ref Section1aSumoDeployment - AddFunctionNameField: - Type: Custom::SumoLogicFieldsSchema - Properties: - ServiceToken: !Ref Section7aParentStackLambdaARN - FieldName: "functionname" - RemoveOnDeleteStack: false - SumoAccessID: !Ref Section1bSumoAccessID - SumoAccessKey: !Ref Section1cSumoAccessKey - SumoDeployment: !Ref Section1aSumoDeployment - Outputs: ExistingMetricSourceName: Description: "Existing CloudWatch Metrics Source Name" diff --git a/aws-observability/apps/nlb/nlb_app.template.yaml b/aws-observability/apps/nlb/nlb_app.template.yaml index 04ded112..081426eb 100755 --- a/aws-observability/apps/nlb/nlb_app.template.yaml +++ b/aws-observability/apps/nlb/nlb_app.template.yaml @@ -161,19 +161,8 @@ Conditions: Resources: - AddLoadBalancerField: - Type: Custom::SumoLogicFieldsSchema - Properties: - ServiceToken: !Ref Section4aParentStackLambdaARN - FieldName: "networkloadbalancer" - RemoveOnDeleteStack: false - SumoAccessID: !Ref Section1bSumoAccessID - SumoAccessKey: !Ref Section1cSumoAccessKey - SumoDeployment: !Ref Section1aSumoDeployment - MetricRule: Type: Custom::SumoLogicMetricRules - DependsOn: AddLoadBalancerField Properties: ServiceToken: !Ref Section4aParentStackLambdaARN RemoveOnDeleteStack: false diff --git a/aws-observability/apps/rds/rds_app.template.yaml b/aws-observability/apps/rds/rds_app.template.yaml index fabcf382..168b9ae9 100755 --- a/aws-observability/apps/rds/rds_app.template.yaml +++ b/aws-observability/apps/rds/rds_app.template.yaml @@ -163,7 +163,6 @@ Resources: ClusterMetricRule: Type: Custom::SumoLogicMetricRules - DependsOn: AddDBIdentifierField Properties: ServiceToken: !Ref Section4aParentStackLambdaARN RemoveOnDeleteStack: false @@ -177,7 +176,6 @@ Resources: InstanceMetricRule: Type: Custom::SumoLogicMetricRules - DependsOn: AddDBIdentifierField Properties: ServiceToken: !Ref Section4aParentStackLambdaARN RemoveOnDeleteStack: false @@ -234,13 +232,3 @@ Resources: SumoAccessID: !Ref Section1bSumoAccessID SumoAccessKey: !Ref Section1cSumoAccessKey SumoDeployment: !Ref Section1aSumoDeployment - - AddDBIdentifierField: - Type: Custom::SumoLogicFieldsSchema - Properties: - ServiceToken: !Ref Section4aParentStackLambdaARN - FieldName: "dbidentifier" - RemoveOnDeleteStack: false - SumoAccessID: !Ref Section1bSumoAccessID - SumoAccessKey: !Ref Section1cSumoAccessKey - SumoDeployment: !Ref Section1aSumoDeployment \ No newline at end of file diff --git a/aws-observability/apps/sns/sns_app.template.yaml b/aws-observability/apps/sns/sns_app.template.yaml index ac2ad2c4..6287b5ec 100755 --- a/aws-observability/apps/sns/sns_app.template.yaml +++ b/aws-observability/apps/sns/sns_app.template.yaml @@ -211,13 +211,3 @@ Resources: SumoAccessID: !Ref Section1bSumoAccessID SumoAccessKey: !Ref Section1cSumoAccessKey SumoDeployment: !Ref Section1aSumoDeployment - - AddTopicNameField: - Type: Custom::SumoLogicFieldsSchema - Properties: - ServiceToken: !Ref Section4aParentStackLambdaARN - FieldName: "topicname" - RemoveOnDeleteStack: false - SumoAccessID: !Ref Section1bSumoAccessID - SumoAccessKey: !Ref Section1cSumoAccessKey - SumoDeployment: !Ref Section1aSumoDeployment \ No newline at end of file diff --git a/aws-observability/apps/sqs/sqs_app.template.yaml b/aws-observability/apps/sqs/sqs_app.template.yaml index 53dfc08e..f80bee56 100755 --- a/aws-observability/apps/sqs/sqs_app.template.yaml +++ b/aws-observability/apps/sqs/sqs_app.template.yaml @@ -206,15 +206,3 @@ Resources: SumoAccessID: !Ref Section1bSumoAccessID SumoAccessKey: !Ref Section1cSumoAccessKey SumoDeployment: !Ref Section1aSumoDeployment - - AddQueueNameField: - Type: Custom::SumoLogicFieldsSchema - Properties: - ServiceToken: !Ref Section4aParentStackLambdaARN - FieldName: "queuename" - RemoveOnDeleteStack: false - SumoAccessID: !Ref Section1bSumoAccessID - SumoAccessKey: !Ref Section1cSumoAccessKey - SumoDeployment: !Ref Section1aSumoDeployment - - \ No newline at end of file diff --git a/aws-observability/templates/sumologic_observability.master.template.yaml b/aws-observability/templates/sumologic_observability.master.template.yaml index 3bf96ecd..55479812 100644 --- a/aws-observability/templates/sumologic_observability.master.template.yaml +++ b/aws-observability/templates/sumologic_observability.master.template.yaml @@ -461,7 +461,7 @@ Mappings: CommonData: NestedTemplate: BucketName: "sumologic-appdev-aws-sam-apps" - Version: "v2.8.0" + Version: "v2.10.0" CollectorDetails: SumoLogicAccountID: 926226587429 CollectorNamePrefix: "aws-observability" @@ -490,6 +490,7 @@ Resources: AccountAlias: !Ref Section2aAccountAlias AccountAliasMappingS3URL: !Ref Section2bAccountAliasMappingS3URL SumoLogicAccountID: !FindInMap [CommonData, CollectorDetails, SumoLogicAccountID] + InstallObservabilityApps: !Ref Section3aInstallObservabilityApps CreateMetaDataSource: "No" CreateCloudWatchMetricsSource: !If [ create_cw_metrics_source, "Yes", "No" ] CloudWatchMetricsSourceName: !Sub "cloudwatch-metrics-${AWS::Region}" @@ -559,7 +560,7 @@ Resources: sumoEC2MetricsAppStack: Type: AWS::CloudFormation::Stack - DependsOn: sumoNlbMetricsAppStack + DependsOn: sumoAlbMetricsAppStack Properties: TemplateURL: !Sub - "https://${BucketName}.s3.amazonaws.com/aws-observability-versions/${Version}/ec2metrics/ec2_metrics_app.template.yaml" From 53f11e1b90fb834875344374184ee823b1a3a695 Mon Sep 17 00:00:00 2001 From: Akhil Dangore Date: Mon, 10 Jun 2024 18:48:42 +0530 Subject: [PATCH 2/4] Corrected version --- .../templates/sumologic_observability.master.template.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/aws-observability/templates/sumologic_observability.master.template.yaml b/aws-observability/templates/sumologic_observability.master.template.yaml index 55479812..6aef785e 100644 --- a/aws-observability/templates/sumologic_observability.master.template.yaml +++ b/aws-observability/templates/sumologic_observability.master.template.yaml @@ -461,7 +461,7 @@ Mappings: CommonData: NestedTemplate: BucketName: "sumologic-appdev-aws-sam-apps" - Version: "v2.10.0" + Version: "v2.9.0" CollectorDetails: SumoLogicAccountID: 926226587429 CollectorNamePrefix: "aws-observability" From 6be486939dab6796d8af9e4df4d4a5b2f721fa9c Mon Sep 17 00:00:00 2001 From: Akhil Dangore Date: Tue, 11 Jun 2024 11:02:31 +0530 Subject: [PATCH 3/4] Upgraded version --- aws-observability/apps/alb/alb_app.template.yaml | 2 +- .../apps/apigateway/api_gateway_app.template.yaml | 2 +- aws-observability/apps/autoenable/auto_enable.template.yaml | 2 +- .../apps/cloudwatchmetrics/cloudwatchmetrics.template.yaml | 2 +- aws-observability/apps/common/resources.template.yaml | 2 +- .../apps/controltower/controltower.template.yaml | 4 ++-- aws-observability/apps/dynamodb/dynamodb_app.template.yaml | 2 +- .../apps/ec2metrics/ec2_metrics_app.template.yaml | 2 +- aws-observability/apps/ecs/ecs_app.template.yaml | 2 +- .../apps/elasticache/elasticache_app.template.yaml | 2 +- aws-observability/apps/elb/elb_app.template.yaml | 2 +- .../hostmetricsfields/host_metrics_add_fields.template.yaml | 2 +- aws-observability/apps/lambda/lambda_app.template.yaml | 2 +- aws-observability/apps/nlb/nlb_app.template.yaml | 2 +- .../permissioncheck.nested.template.test.yaml | 2 +- .../permissionchecker/permissioncheck.nested.template.yaml | 2 +- .../apps/permissionchecker/permissioncheck.template.test.yaml | 4 ++-- .../apps/permissionchecker/permissioncheck.template.yaml | 4 ++-- aws-observability/apps/rds/rds_app.template.yaml | 2 +- .../apps/rootcause/rootcauseexplorer.template.yaml | 2 +- aws-observability/apps/sns/sns_app.template.yaml | 2 +- aws-observability/apps/sqs/sqs_app.template.yaml | 2 +- 22 files changed, 25 insertions(+), 25 deletions(-) diff --git a/aws-observability/apps/alb/alb_app.template.yaml b/aws-observability/apps/alb/alb_app.template.yaml index d4fe9ef0..bfbd0121 100755 --- a/aws-observability/apps/alb/alb_app.template.yaml +++ b/aws-observability/apps/alb/alb_app.template.yaml @@ -1,6 +1,6 @@ AWSTemplateFormatVersion: '2010-09-09' Transform: 'AWS::Serverless-2016-10-31' -Description: "Version - v2.8.0: Template to setup the ALB app with AWS and Sumo Logic resources for AWS Observability Solution." +Description: "Version - v2.9.0: Template to setup the ALB app with AWS and Sumo Logic resources for AWS Observability Solution." Metadata: 'AWS::CloudFormation::Interface': diff --git a/aws-observability/apps/apigateway/api_gateway_app.template.yaml b/aws-observability/apps/apigateway/api_gateway_app.template.yaml index 6f9dbeff..de1655b2 100755 --- a/aws-observability/apps/apigateway/api_gateway_app.template.yaml +++ b/aws-observability/apps/apigateway/api_gateway_app.template.yaml @@ -1,6 +1,6 @@ AWSTemplateFormatVersion: '2010-09-09' Transform: 'AWS::Serverless-2016-10-31' -Description: "Version - v2.8.0: Template to setup the API Gateway app with AWS and Sumo Logic resources for AWS Observability Solution." +Description: "Version - v2.9.0: Template to setup the API Gateway app with AWS and Sumo Logic resources for AWS Observability Solution." Metadata: 'AWS::CloudFormation::Interface': diff --git a/aws-observability/apps/autoenable/auto_enable.template.yaml b/aws-observability/apps/autoenable/auto_enable.template.yaml index 1649a1b8..c04955e2 100644 --- a/aws-observability/apps/autoenable/auto_enable.template.yaml +++ b/aws-observability/apps/autoenable/auto_enable.template.yaml @@ -1,6 +1,6 @@ AWSTemplateFormatVersion: '2010-09-09' Transform: 'AWS::Serverless-2016-10-31' -Description: "Version - v2.8.0: Template to setup Auto Enable ALB Access Logging and Lambda Auto Subscribe Log Groups for AWS Observability Solution." +Description: "Version - v2.9.0: Template to setup Auto Enable ALB Access Logging and Lambda Auto Subscribe Log Groups for AWS Observability Solution." Parameters: SumoLogicResourceRemoveOnDeleteStack: diff --git a/aws-observability/apps/cloudwatchmetrics/cloudwatchmetrics.template.yaml b/aws-observability/apps/cloudwatchmetrics/cloudwatchmetrics.template.yaml index fa22d1ea..fb5c7e54 100644 --- a/aws-observability/apps/cloudwatchmetrics/cloudwatchmetrics.template.yaml +++ b/aws-observability/apps/cloudwatchmetrics/cloudwatchmetrics.template.yaml @@ -1,6 +1,6 @@ AWSTemplateFormatVersion: '2010-09-09' Transform: 'AWS::Serverless-2016-10-31' -Description: "Version - v2.8.0: Template to Setup Sumo Logic CloudWatch Metric Source. The template setup CW Metrics Sources for Namespaces." +Description: "Version - v2.9.0: Template to Setup Sumo Logic CloudWatch Metric Source. The template setup CW Metrics Sources for Namespaces." Parameters: SumoLogicDeployment: diff --git a/aws-observability/apps/common/resources.template.yaml b/aws-observability/apps/common/resources.template.yaml index f55c7766..014769e4 100755 --- a/aws-observability/apps/common/resources.template.yaml +++ b/aws-observability/apps/common/resources.template.yaml @@ -1,6 +1,6 @@ AWSTemplateFormatVersion: '2010-09-09' Transform: 'AWS::Serverless-2016-10-31' -Description: "Version - v2.8.0: Template to Setup Sumo Logic Sources and supporting AWS Resources for CloudTrail, ALB, Lambda CloudWatch Logs and CloudWatch Metrics." +Description: "Version - v2.9.0: Template to Setup Sumo Logic Sources and supporting AWS Resources for CloudTrail, ALB, Lambda CloudWatch Logs and CloudWatch Metrics." Parameters: SumoLogicDeployment: diff --git a/aws-observability/apps/controltower/controltower.template.yaml b/aws-observability/apps/controltower/controltower.template.yaml index ab74ce27..04c60967 100644 --- a/aws-observability/apps/controltower/controltower.template.yaml +++ b/aws-observability/apps/controltower/controltower.template.yaml @@ -1,6 +1,6 @@ AWSTemplateFormatVersion: '2010-09-09' Transform: AWS::Serverless-2016-10-31 -Description: "Version - v2.8.0: The Template should be deployed in Master account. This template setup the Lambda trigger for new account created using AWS Control Tower Account Factory process. The Lambda install the AWS Observability CF template on the regions of new AWS account using stack Sets." +Description: "Version - v2.9.0: The Template should be deployed in Master account. This template setup the Lambda trigger for new account created using AWS Control Tower Account Factory process. The Lambda install the AWS Observability CF template on the regions of new AWS account using stack Sets." Globals: Function: @@ -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.8.0/sumologic_observability.master.template.yaml" + templateURL = "https://sumologic-appdev-aws-sam-apps.s3.amazonaws.com/aws-observability-versions/v2.9.0/sumologic_observability.master.template.yaml" ALL = ["CAPABILITY_IAM", "CAPABILITY_NAMED_IAM", "CAPABILITY_AUTO_EXPAND"] diff --git a/aws-observability/apps/dynamodb/dynamodb_app.template.yaml b/aws-observability/apps/dynamodb/dynamodb_app.template.yaml index ad58561f..c40f5c26 100755 --- a/aws-observability/apps/dynamodb/dynamodb_app.template.yaml +++ b/aws-observability/apps/dynamodb/dynamodb_app.template.yaml @@ -1,6 +1,6 @@ AWSTemplateFormatVersion: '2010-09-09' Transform: 'AWS::Serverless-2016-10-31' -Description: "Version - v2.8.0: Template to setup the DynamoDB app with AWS and Sumo Logic resources for AWS Observability Solution." +Description: "Version - v2.9.0: Template to setup the DynamoDB app with AWS and Sumo Logic resources for AWS Observability Solution." Metadata: 'AWS::CloudFormation::Interface': diff --git a/aws-observability/apps/ec2metrics/ec2_metrics_app.template.yaml b/aws-observability/apps/ec2metrics/ec2_metrics_app.template.yaml index 6a2f2e3c..c74db900 100755 --- a/aws-observability/apps/ec2metrics/ec2_metrics_app.template.yaml +++ b/aws-observability/apps/ec2metrics/ec2_metrics_app.template.yaml @@ -1,6 +1,6 @@ AWSTemplateFormatVersion: '2010-09-09' Transform: 'AWS::Serverless-2016-10-31' -Description: "Version - v2.8.0: Template to setup the EC2 Metrics app with AWS and Sumo Logic resources for AWS Observability Solution." +Description: "Version - v2.9.0: Template to setup the EC2 Metrics app with AWS and Sumo Logic resources for AWS Observability Solution." Metadata: AWS::CloudFormation::Interface: diff --git a/aws-observability/apps/ecs/ecs_app.template.yaml b/aws-observability/apps/ecs/ecs_app.template.yaml index e4895728..8b4a8fe8 100755 --- a/aws-observability/apps/ecs/ecs_app.template.yaml +++ b/aws-observability/apps/ecs/ecs_app.template.yaml @@ -1,6 +1,6 @@ AWSTemplateFormatVersion: '2010-09-09' Transform: 'AWS::Serverless-2016-10-31' -Description: "Version - v2.8.0: Template to setup the ECS app with AWS and Sumo Logic resources for AWS Observability Solution." +Description: "Version - v2.9.0: Template to setup the ECS app with AWS and Sumo Logic resources for AWS Observability Solution." Metadata: 'AWS::CloudFormation::Interface': diff --git a/aws-observability/apps/elasticache/elasticache_app.template.yaml b/aws-observability/apps/elasticache/elasticache_app.template.yaml index f7295796..0f100e5e 100755 --- a/aws-observability/apps/elasticache/elasticache_app.template.yaml +++ b/aws-observability/apps/elasticache/elasticache_app.template.yaml @@ -1,6 +1,6 @@ AWSTemplateFormatVersion: '2010-09-09' Transform: 'AWS::Serverless-2016-10-31' -Description: "Version - v2.8.0: Template to setup the ElastiCache app with AWS and Sumo Logic resources for AWS Observability Solution." +Description: "Version - v2.9.0: Template to setup the ElastiCache app with AWS and Sumo Logic resources for AWS Observability Solution." Metadata: 'AWS::CloudFormation::Interface': diff --git a/aws-observability/apps/elb/elb_app.template.yaml b/aws-observability/apps/elb/elb_app.template.yaml index ef1a6b44..d01b1175 100755 --- a/aws-observability/apps/elb/elb_app.template.yaml +++ b/aws-observability/apps/elb/elb_app.template.yaml @@ -1,6 +1,6 @@ AWSTemplateFormatVersion: '2010-09-09' Transform: 'AWS::Serverless-2016-10-31' -Description: "Version - v2.8.0: Template to setup the ELB classic app with AWS and Sumo Logic resources for AWS Observability Solution." +Description: "Version - v2.9.0: Template to setup the ELB classic app with AWS and Sumo Logic resources for AWS Observability Solution." Metadata: 'AWS::CloudFormation::Interface': diff --git a/aws-observability/apps/hostmetricsfields/host_metrics_add_fields.template.yaml b/aws-observability/apps/hostmetricsfields/host_metrics_add_fields.template.yaml index 165a3612..a03b35b4 100644 --- a/aws-observability/apps/hostmetricsfields/host_metrics_add_fields.template.yaml +++ b/aws-observability/apps/hostmetricsfields/host_metrics_add_fields.template.yaml @@ -1,5 +1,5 @@ AWSTemplateFormatVersion: '2010-09-09' -Description: "Version - v2.8.0: Lambda Function to add fields to host metrics sources based on the available instances in all regions of the current AWS account." +Description: "Version - v2.9.0: Lambda Function to add fields to host metrics sources based on the available instances in all regions of the current AWS account." Metadata: 'AWS::CloudFormation::Interface': diff --git a/aws-observability/apps/lambda/lambda_app.template.yaml b/aws-observability/apps/lambda/lambda_app.template.yaml index 902ffead..96ab32e6 100755 --- a/aws-observability/apps/lambda/lambda_app.template.yaml +++ b/aws-observability/apps/lambda/lambda_app.template.yaml @@ -1,6 +1,6 @@ AWSTemplateFormatVersion: '2010-09-09' Transform: 'AWS::Serverless-2016-10-31' -Description: "Version - v2.8.0: Template to setup the Lambda app with AWS and Sumo Logic resources for AWS Observability Solution." +Description: "Version - v2.9.0: Template to setup the Lambda app with AWS and Sumo Logic resources for AWS Observability Solution." Metadata: 'AWS::CloudFormation::Interface': diff --git a/aws-observability/apps/nlb/nlb_app.template.yaml b/aws-observability/apps/nlb/nlb_app.template.yaml index 081426eb..ab90f01a 100755 --- a/aws-observability/apps/nlb/nlb_app.template.yaml +++ b/aws-observability/apps/nlb/nlb_app.template.yaml @@ -1,6 +1,6 @@ AWSTemplateFormatVersion: '2010-09-09' Transform: 'AWS::Serverless-2016-10-31' -Description: "Version - v2.8.0: Template to setup the NLB app with AWS and Sumo Logic resources for AWS Observability Solution." +Description: "Version - v2.9.0: Template to setup the NLB app with AWS and Sumo Logic resources for AWS Observability Solution." Metadata: 'AWS::CloudFormation::Interface': diff --git a/aws-observability/apps/permissionchecker/permissioncheck.nested.template.test.yaml b/aws-observability/apps/permissionchecker/permissioncheck.nested.template.test.yaml index 8cd84410..4eacfef6 100644 --- a/aws-observability/apps/permissionchecker/permissioncheck.nested.template.test.yaml +++ b/aws-observability/apps/permissionchecker/permissioncheck.nested.template.test.yaml @@ -1,5 +1,5 @@ AWSTemplateFormatVersion: '2010-09-09' -Description: "Version - v2.8.0: This CloudFormation template will check for the permission required to deploy the AWS Observability CF template. Based on various error received, please provide the specific permissions to Sumo Logic role or AWS IAM Role used to deploy the template." +Description: "Version - v2.9.0: This CloudFormation template will check for the permission required to deploy the AWS Observability CF template. Based on various error received, please provide the specific permissions to Sumo Logic role or AWS IAM Role used to deploy the template." Transform: 'AWS::Serverless-2016-10-31' Metadata: diff --git a/aws-observability/apps/permissionchecker/permissioncheck.nested.template.yaml b/aws-observability/apps/permissionchecker/permissioncheck.nested.template.yaml index b31ade30..ee17c024 100644 --- a/aws-observability/apps/permissionchecker/permissioncheck.nested.template.yaml +++ b/aws-observability/apps/permissionchecker/permissioncheck.nested.template.yaml @@ -1,5 +1,5 @@ AWSTemplateFormatVersion: '2010-09-09' -Description: "Version - v2.8.0: This CloudFormation template will check for the permission required to deploy the AWS Observability CF template. Based on various error received, please provide the specific permissions to Sumo Logic role or AWS IAM Role used to deploy the template." +Description: "Version - v2.9.0: This CloudFormation template will check for the permission required to deploy the AWS Observability CF template. Based on various error received, please provide the specific permissions to Sumo Logic role or AWS IAM Role used to deploy the template." Transform: 'AWS::Serverless-2016-10-31' Metadata: diff --git a/aws-observability/apps/permissionchecker/permissioncheck.template.test.yaml b/aws-observability/apps/permissionchecker/permissioncheck.template.test.yaml index 0b8a9b61..fae8e340 100644 --- a/aws-observability/apps/permissionchecker/permissioncheck.template.test.yaml +++ b/aws-observability/apps/permissionchecker/permissioncheck.template.test.yaml @@ -1,5 +1,5 @@ AWSTemplateFormatVersion: '2010-09-09' -Description: "Version - v2.8.0: Note: Before deploying this template, please select the appropriate region. This CloudFormation template will check for the permission required to deploy the AWS Observability CF template. Based on various error received, please provide the specific permissions to Sumo Logic role or AWS IAM Role used to deploy the template." +Description: "Version - v2.9.0: Note: Before deploying this template, please select the appropriate region. This CloudFormation template will check for the permission required to deploy the AWS Observability CF template. Based on various error received, please provide the specific permissions to Sumo Logic role or AWS IAM Role used to deploy the template." Transform: 'AWS::Serverless-2016-10-31' Metadata: @@ -60,7 +60,7 @@ Mappings: CommonData: NestedTemplate: BucketName: "sumologic-appdev-aws-sam-apps" - Version: "v2.8.0" + Version: "v2.9.0" Resources: diff --git a/aws-observability/apps/permissionchecker/permissioncheck.template.yaml b/aws-observability/apps/permissionchecker/permissioncheck.template.yaml index af3004d1..c9bb0fa8 100644 --- a/aws-observability/apps/permissionchecker/permissioncheck.template.yaml +++ b/aws-observability/apps/permissionchecker/permissioncheck.template.yaml @@ -1,5 +1,5 @@ AWSTemplateFormatVersion: '2010-09-09' -Description: "Version - v2.8.0. Note: Before deploying this template, please select the appropriate region. This CloudFormation template will check for the permission required to deploy the AWS Observability CF template. Based on various error received, please provide the specific permissions to Sumo Logic role or AWS IAM Role used to deploy the template." +Description: "Version - v2.9.0. Note: Before deploying this template, please select the appropriate region. This CloudFormation template will check for the permission required to deploy the AWS Observability CF template. Based on various error received, please provide the specific permissions to Sumo Logic role or AWS IAM Role used to deploy the template." Transform: 'AWS::Serverless-2016-10-31' Metadata: @@ -58,7 +58,7 @@ Mappings: CommonData: NestedTemplate: BucketName: "sumologic-appdev-aws-sam-apps" - Version: "v2.8.0" + Version: "v2.9.0" Resources: diff --git a/aws-observability/apps/rds/rds_app.template.yaml b/aws-observability/apps/rds/rds_app.template.yaml index 168b9ae9..2cddbafb 100755 --- a/aws-observability/apps/rds/rds_app.template.yaml +++ b/aws-observability/apps/rds/rds_app.template.yaml @@ -1,6 +1,6 @@ AWSTemplateFormatVersion: '2010-09-09' Transform: 'AWS::Serverless-2016-10-31' -Description: "Version - v2.8.0: Template to setup the RDS app with AWS and Sumo Logic resources for AWS Observability Solution." +Description: "Version - v2.9.0: Template to setup the RDS app with AWS and Sumo Logic resources for AWS Observability Solution." Metadata: 'AWS::CloudFormation::Interface': diff --git a/aws-observability/apps/rootcause/rootcauseexplorer.template.yaml b/aws-observability/apps/rootcause/rootcauseexplorer.template.yaml index 7a6b907c..ee5faa86 100755 --- a/aws-observability/apps/rootcause/rootcauseexplorer.template.yaml +++ b/aws-observability/apps/rootcause/rootcauseexplorer.template.yaml @@ -1,6 +1,6 @@ AWSTemplateFormatVersion: '2010-09-09' Transform: 'AWS::Serverless-2016-10-31' -Description: "Version - v2.8.0: Template to setup the Sumo Logic AWS Inventory Source and Root Cause Explorer app." +Description: "Version - v2.9.0: Template to setup the Sumo Logic AWS Inventory Source and Root Cause Explorer app." Metadata: 'AWS::CloudFormation::Interface': diff --git a/aws-observability/apps/sns/sns_app.template.yaml b/aws-observability/apps/sns/sns_app.template.yaml index 6287b5ec..12f07d60 100755 --- a/aws-observability/apps/sns/sns_app.template.yaml +++ b/aws-observability/apps/sns/sns_app.template.yaml @@ -1,6 +1,6 @@ AWSTemplateFormatVersion: '2010-09-09' Transform: 'AWS::Serverless-2016-10-31' -Description: "Version - v2.8.0: Template to setup the SNS app with AWS and Sumo Logic resources for AWS Observability Solution." +Description: "Version - v2.9.0: Template to setup the SNS app with AWS and Sumo Logic resources for AWS Observability Solution." Metadata: 'AWS::CloudFormation::Interface': diff --git a/aws-observability/apps/sqs/sqs_app.template.yaml b/aws-observability/apps/sqs/sqs_app.template.yaml index f80bee56..7bb8d940 100755 --- a/aws-observability/apps/sqs/sqs_app.template.yaml +++ b/aws-observability/apps/sqs/sqs_app.template.yaml @@ -1,6 +1,6 @@ AWSTemplateFormatVersion: '2010-09-09' Transform: 'AWS::Serverless-2016-10-31' -Description: "Version - v2.8.0: Template to setup the SQS app with AWS and Sumo Logic resources for AWS Observability Solution." +Description: "Version - v2.9.0: Template to setup the SQS app with AWS and Sumo Logic resources for AWS Observability Solution." Metadata: 'AWS::CloudFormation::Interface': From d6a180899eb5581dbc762591171e83bc8f547fac Mon Sep 17 00:00:00 2001 From: Akhil Dangore Date: Tue, 11 Jun 2024 12:50:38 +0530 Subject: [PATCH 4/4] Updated version in master template --- .../templates/sumologic_observability.master.template.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/aws-observability/templates/sumologic_observability.master.template.yaml b/aws-observability/templates/sumologic_observability.master.template.yaml index 6aef785e..ca4b1deb 100644 --- a/aws-observability/templates/sumologic_observability.master.template.yaml +++ b/aws-observability/templates/sumologic_observability.master.template.yaml @@ -1,5 +1,5 @@ AWSTemplateFormatVersion: '2010-09-09' -Description: "Version - v2.8.0. Note: Before deploying this template, please select the appropriate region. This CloudFormation template will automate the setup of the AWS Observability Solution. For more information on each parameter, please see the AWS Observability Setup Guide: https://help.sumologic.com/Observability_Solution/AWS_Observability_Solution/01_Deploy_and_Use_AWS_Observability/05_Deploy_AWS_Observability" +Description: "Version - v2.9.0. Note: Before deploying this template, please select the appropriate region. This CloudFormation template will automate the setup of the AWS Observability Solution. For more information on each parameter, please see the AWS Observability Setup Guide: https://help.sumologic.com/Observability_Solution/AWS_Observability_Solution/01_Deploy_and_Use_AWS_Observability/05_Deploy_AWS_Observability" Metadata: 'AWS::CloudFormation::Interface':