Sumo 251683: Added support for AWS tag filters CF

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.10.0: Template to setup the ALB app with AWS and Sumo Logic resources for AWS Observability Solution."
+Description: "Version - v2.11.0: Template to setup the ALB app with AWS and Sumo Logic resources for AWS Observability Solution."
 
 Metadata:
   'AWS::CloudFormation::Interface':

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.10.0: Template to setup the API Gateway app with AWS and Sumo Logic resources for AWS Observability Solution."
+Description: "Version - v2.11.0: Template to setup the API Gateway app with AWS and Sumo Logic resources for AWS Observability Solution."
 
 Metadata:
   'AWS::CloudFormation::Interface':

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.10.0: Template to setup Auto Enable ALB Access Logging and Lambda Auto Subscribe Log Groups for AWS Observability Solution."
+Description: "Version - v2.11.0: Template to setup Auto Enable ALB Access Logging and Lambda Auto Subscribe Log Groups for AWS Observability Solution."
 
 Parameters:
   SumoLogicResourceRemoveOnDeleteStack:

aws-observability/apps/cloudwatchmetrics/cloudwatchmetrics.template.yaml

@@ -1,6 +1,6 @@
 AWSTemplateFormatVersion: '2010-09-09'
 Transform: 'AWS::Serverless-2016-10-31'
-Description: "Version - v2.10.0: Template to Setup Sumo Logic CloudWatch Metric Source. The template setup CW Metrics Sources for Namespaces."
+Description: "Version - v2.11.0: Template to Setup Sumo Logic CloudWatch Metric Source. The template setup CW Metrics Sources for Namespaces."
 
 Parameters:
   SumoLogicDeployment:
@@ -55,6 +55,11 @@ Parameters:
     Description: "Provide a Source Category for CloudWatch Metrics Source"
     Default: ""
 
+  MetricsSourceAWSTagFilters:
+    Type: String
+    Description: "Provide JSON format of the namespaces with it's tags values for Metrics Source."
+    Default: ""
+
   CreateFirstMetricsSource:
     Type: String
     Description: "Select Yes if you would like to create the Metric Source."
@@ -165,6 +170,7 @@ Resources:
       SourceName: !Sub "${CloudWatchMetricsSourceName}-${FirstMetricsSourceNamespace}"
       ScanInterval: !FindInMap [Namespaces, !Ref FirstMetricsSourceNamespace, ScanInterval]
       SourceCategory: !Ref CloudWatchMetricSourceCategory
+      AWSTagFilters: !Ref MetricsSourceAWSTagFilters
       CollectorId: !Ref SumoLogicCollectorId
       SumoAccessID: !Ref SumoLogicAccessID
       SumoAccessKey: !Ref SumoLogicAccessKey
@@ -185,6 +191,7 @@ Resources:
       SourceName: !Sub "${CloudWatchMetricsSourceName}-${SecondMetricsSourceNamespace}"
       ScanInterval: !FindInMap [Namespaces, !Ref SecondMetricsSourceNamespace, ScanInterval]
       SourceCategory: !Ref CloudWatchMetricSourceCategory
+      AWSTagFilters: !Ref MetricsSourceAWSTagFilters
       CollectorId: !Ref SumoLogicCollectorId
       SumoAccessID: !Ref SumoLogicAccessID
       SumoAccessKey: !Ref SumoLogicAccessKey
@@ -205,6 +212,7 @@ Resources:
       SourceName: !Sub "${CloudWatchMetricsSourceName}-${ThirdMetricsSourceNamespace}"
       ScanInterval: !FindInMap [Namespaces, !Ref ThirdMetricsSourceNamespace, ScanInterval]
       SourceCategory: !Ref CloudWatchMetricSourceCategory
+      AWSTagFilters: !Ref MetricsSourceAWSTagFilters
       CollectorId: !Ref SumoLogicCollectorId
       SumoAccessID: !Ref SumoLogicAccessID
       SumoAccessKey: !Ref SumoLogicAccessKey
@@ -225,6 +233,7 @@ Resources:
       SourceName: !Sub "${CloudWatchMetricsSourceName}-${FourthMetricsSourceNamespace}"
       ScanInterval: !FindInMap [Namespaces, !Ref FourthMetricsSourceNamespace, ScanInterval]
       SourceCategory: !Ref CloudWatchMetricSourceCategory
+      AWSTagFilters: !Ref MetricsSourceAWSTagFilters
       CollectorId: !Ref SumoLogicCollectorId
       SumoAccessID: !Ref SumoLogicAccessID
       SumoAccessKey: !Ref SumoLogicAccessKey
@@ -245,6 +254,7 @@ Resources:
       SourceName: !Sub "${CloudWatchMetricsSourceName}-${FifthMetricsSourceNamespace}"
       ScanInterval: !FindInMap [Namespaces, !Ref FifthMetricsSourceNamespace, ScanInterval]
       SourceCategory: !Ref CloudWatchMetricSourceCategory
+      AWSTagFilters: !Ref MetricsSourceAWSTagFilters
       CollectorId: !Ref SumoLogicCollectorId
       SumoAccessID: !Ref SumoLogicAccessID
       SumoAccessKey: !Ref SumoLogicAccessKey

aws-observability/apps/common/resources.template.yaml

@@ -1,6 +1,6 @@
 AWSTemplateFormatVersion: '2010-09-09'
 Transform: 'AWS::Serverless-2016-10-31'
-Description: "Version - v2.10.0: Template to Setup Sumo Logic Sources and supporting AWS Resources for CloudTrail, ALB, Lambda CloudWatch Logs and CloudWatch Metrics."
+Description: "Version - v2.11.0: Template to Setup Sumo Logic Sources and supporting AWS Resources for CloudTrail, ALB, Lambda CloudWatch Logs and CloudWatch Metrics."
 
 Parameters:
   SumoLogicDeployment:
@@ -99,6 +99,10 @@ Parameters:
     Type: String
     Description: "Provide a source Category for the CloudWatch Metrics Source."
     Default: ""
+  MetricsSourceAWSTagFilters:
+    Type: String
+    Description: "Provide JSON format of the namespaces with it's tags values for Metrics Source."
+    Default: ""
 
   CreateKinesisFirehoseMetricsSource:
     Type: String
@@ -487,7 +491,7 @@ Resources:
       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:
@@ -1138,6 +1142,7 @@ Resources:
         SumoLogicSourceRole: !GetAtt SumoLogicSourceRole.Arn
         CloudWatchMetricsSourceName: !Ref CloudWatchMetricsSourceName
         CloudWatchMetricSourceCategory: !Ref CloudWatchMetricSourceCategory
+        MetricsSourceAWSTagFilters: !Ref MetricsSourceAWSTagFilters
         CreateFirstMetricsSource: !GetAtt Primerinvoke.ApplicationELB
         FirstMetricsSourceNamespace: "ApplicationELB"
         CreateSecondMetricsSource: !GetAtt Primerinvoke.ApiGateway
@@ -1165,6 +1170,7 @@ Resources:
         SumoLogicSourceRole: !GetAtt SumoLogicSourceRole.Arn
         CloudWatchMetricsSourceName: !Ref CloudWatchMetricsSourceName
         CloudWatchMetricSourceCategory: !Ref CloudWatchMetricSourceCategory
+        MetricsSourceAWSTagFilters: !Ref MetricsSourceAWSTagFilters
         CreateFirstMetricsSource: !GetAtt Primerinvoke.ECS
         FirstMetricsSourceNamespace: "ECS"
         CreateSecondMetricsSource: !GetAtt Primerinvoke.ElastiCache
@@ -1193,6 +1199,7 @@ Resources:
         SumoLogicSourceRole: !GetAtt SumoLogicSourceRole.Arn
         CloudWatchMetricsSourceName: !Ref CloudWatchMetricsSourceName
         CloudWatchMetricSourceCategory: !Ref CloudWatchMetricSourceCategory
+        MetricsSourceAWSTagFilters: !Ref MetricsSourceAWSTagFilters
         CreateFirstMetricsSource: !GetAtt Primerinvoke.SQS
         FirstMetricsSourceNamespace: "SQS"
         CreateSecondMetricsSource: !GetAtt Primerinvoke.SNS
@@ -1231,6 +1238,7 @@ Resources:
       SourceName: !Ref KinesisFirehoseMetricsSourceName
       RemoveOnDeleteStack: !Ref RemoveSumoLogicResourcesOnDeleteStack
       SourceCategory: !Ref KinesisFirehoseMetricSourceCategory
+      AWSTagFilters: !Ref MetricsSourceAWSTagFilters
       CollectorId: !GetAtt SumoLogicHostedCollector.COLLECTOR_ID
       SumoAccessID: !Ref SumoLogicAccessID
       SumoAccessKey: !Ref SumoLogicAccessKey

aws-observability/apps/controltower/controltower.template.yaml

@@ -1,6 +1,6 @@
 AWSTemplateFormatVersion: '2010-09-09'
 Transform: AWS::Serverless-2016-10-31
-Description: "Version - v2.10.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.11.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:

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.10.0: Template to setup the DynamoDB app with AWS and Sumo Logic resources for AWS Observability Solution."
+Description: "Version - v2.11.0: Template to setup the DynamoDB app with AWS and Sumo Logic resources for AWS Observability Solution."
 
 Metadata:
   'AWS::CloudFormation::Interface':

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.10.0: Template to setup the EC2 Metrics app with AWS and Sumo Logic resources for AWS Observability Solution."
+Description: "Version - v2.11.0: Template to setup the EC2 Metrics app with AWS and Sumo Logic resources for AWS Observability Solution."
 
 Metadata:
   AWS::CloudFormation::Interface:

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.10.0: Template to setup the ECS app with AWS and Sumo Logic resources for AWS Observability Solution."
+Description: "Version - v2.11.0: Template to setup the ECS app with AWS and Sumo Logic resources for AWS Observability Solution."
 
 Metadata:
   'AWS::CloudFormation::Interface':

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.10.0: Template to setup the ElastiCache app with AWS and Sumo Logic resources for AWS Observability Solution."
+Description: "Version - v2.11.0: Template to setup the ElastiCache app with AWS and Sumo Logic resources for AWS Observability Solution."
 
 Metadata:
   'AWS::CloudFormation::Interface':

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.10.0: Template to setup the ELB classic app with AWS and Sumo Logic resources for AWS Observability Solution."
+Description: "Version - v2.11.0: Template to setup the ELB classic app with AWS and Sumo Logic resources for AWS Observability Solution."
 
 Metadata:
   'AWS::CloudFormation::Interface':

aws-observability/apps/hostmetricsfields/host_metrics_add_fields.template.yaml

@@ -1,5 +1,5 @@
 AWSTemplateFormatVersion: '2010-09-09'
-Description: "Version - v2.10.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.11.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':

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.10.0: Template to setup the Lambda app with AWS and Sumo Logic resources for AWS Observability Solution."
+Description: "Version - v2.11.0: Template to setup the Lambda app with AWS and Sumo Logic resources for AWS Observability Solution."
 
 Metadata:
   'AWS::CloudFormation::Interface':

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.10.0: Template to setup the NLB app with AWS and Sumo Logic resources for AWS Observability Solution."
+Description: "Version - v2.11.0: Template to setup the NLB app with AWS and Sumo Logic resources for AWS Observability Solution."
 
 Metadata:
   'AWS::CloudFormation::Interface':

aws-observability/apps/permissionchecker/permissioncheck.nested.template.test.yaml

@@ -1,5 +1,5 @@
 AWSTemplateFormatVersion: '2010-09-09'
-Description: "Version - v2.10.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.11.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:

aws-observability/apps/permissionchecker/permissioncheck.nested.template.yaml

@@ -1,5 +1,5 @@
 AWSTemplateFormatVersion: '2010-09-09'
-Description: "Version - v2.10.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.11.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:

aws-observability/apps/permissionchecker/permissioncheck.template.test.yaml

@@ -1,5 +1,5 @@
 AWSTemplateFormatVersion: '2010-09-09'
-Description: "Version - v2.10.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.11.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:

aws-observability/apps/permissionchecker/permissioncheck.template.yaml

@@ -1,5 +1,5 @@
 AWSTemplateFormatVersion: '2010-09-09'
-Description: "Version - v2.10.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.11.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:

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.10.0: Template to setup the RDS app with AWS and Sumo Logic resources for AWS Observability Solution."
+Description: "Version - v2.11.0: Template to setup the RDS app with AWS and Sumo Logic resources for AWS Observability Solution."
 
 Metadata:
   'AWS::CloudFormation::Interface':

aws-observability/apps/rootcause/rootcauseexplorer.template.yaml

@@ -1,6 +1,6 @@
 AWSTemplateFormatVersion: '2010-09-09'
 Transform: 'AWS::Serverless-2016-10-31'
-Description: "Version - v2.10.0: Template to setup the Sumo Logic AWS Inventory Source and Root Cause Explorer app."
+Description: "Version - v2.11.0: Template to setup the Sumo Logic AWS Inventory Source and Root Cause Explorer app."
 
 Metadata:
   'AWS::CloudFormation::Interface':

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.10.0: Template to setup the SNS app with AWS and Sumo Logic resources for AWS Observability Solution."
+Description: "Version - v2.11.0: Template to setup the SNS app with AWS and Sumo Logic resources for AWS Observability Solution."
 
 Metadata:
   'AWS::CloudFormation::Interface':

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.10.0: Template to setup the SQS app with AWS and Sumo Logic resources for AWS Observability Solution."
+Description: "Version - v2.11.0: Template to setup the SQS app with AWS and Sumo Logic resources for AWS Observability Solution."
 
 Metadata:
   'AWS::CloudFormation::Interface':

aws-observability/scripts/JsonToS3.sh

@@ -5,7 +5,7 @@ echo "Start S3 upload Script....."
 export AWS_PROFILE="prod"
 
 export bucket_name=sumologic-appdev-aws-sam-apps
-export version=v2.10.0
+export version=v2.11.0
 export match_case="App"
 
 if [[ ${AWS_PROFILE} == 'default' ]]

aws-observability/scripts/YamlToS3.sh

@@ -50,7 +50,7 @@ fi
 # Upload all templates to sumologic-appdev-aws-sam-apps bucket with version information.
 if [[ ${AWS_PROFILE} == 'default' ]]
 then
-    export version=v2.10.0
+    export version=v2.11.0
 
     aws s3 cp apps/ s3://${bucket_name}/aws-observability-versions/${version}/ --recursive --include "*.template.yaml" --exclude '*.zip' --exclude '*.sh' --exclude 'apps/*/test/*' --exclude '*/test/*' --acl public-read --profile ${AWS_PROFILE}