Adding custom namespace metrics support in cf yamls

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

@@ -119,6 +119,17 @@ Parameters:
     Type: String
     Description: "Provide the Namespace with which Source need to be created."
     Default: ''
+  CreateCustomMetricsSource:
+    Type: String
+    Description: "Select Yes if you would like to create the Metric Source."
+    Default: 'No'
+    AllowedValues:
+      - 'Yes'
+      - 'No'
+  CustomMetricsSourceNamespace:
+    Type: String
+    Description: "Provide the Namespace with which Source need to be created."
+    Default: ''
 
 Mappings:
   # Update the Namespaces mapping whenever CF starts supporting More Namespaces
@@ -155,6 +166,7 @@ Conditions:
   install_third_cw_source: !Equals [!Ref CreateThirdMetricsSource, 'Yes']
   install_fourth_cw_source: !Equals [!Ref CreateFourthMetricsSource, 'Yes']
   install_fifth_cw_source: !Equals [!Ref CreateFifthMetricsSource, 'Yes']
+  install_custom_cw_source: !Equals [!Ref CreateCustomMetricsSource, 'Yes']
 
 Resources:
 
@@ -260,5 +272,26 @@ Resources:
       SumoAccessKey: !Ref SumoLogicAccessKey
       SumoDeployment: !Ref SumoLogicDeployment
       RoleArn: !Ref SumoLogicSourceRole
+      Fields:
+        account: !Ref AccountAlias
+
+  CustomCloudwatchMetricsSource:
+    Type: Custom::AWSSource
+    Condition: install_custom_cw_source
+    Properties:
+      ServiceToken: !Ref LambdaARN
+      Region: !Ref "AWS::Region"
+      RemoveOnDeleteStack: !Ref RemoveSumoLogicResourcesOnDeleteStack
+      SourceType: AwsCloudWatch
+      Namespaces: !Split [ "," , !Sub "${CustomMetricsSourceNamespace}" ]
+      SourceName: !Sub "${CloudWatchMetricsSourceName}-CustomMetrics"
+      ScanInterval: "300000"
+      SourceCategory: !Ref CloudWatchMetricSourceCategory
+      AWSTagFilters: !Ref MetricsSourceAWSTagFilters
+      CollectorId: !Ref SumoLogicCollectorId
+      SumoAccessID: !Ref SumoLogicAccessID
+      SumoAccessKey: !Ref SumoLogicAccessKey
+      SumoDeployment: !Ref SumoLogicDeployment
+      RoleArn: !Ref SumoLogicSourceRole
       Fields:
         account: !Ref AccountAlias

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

@@ -1087,6 +1087,7 @@ Resources:
 
           def lambda_handler(event, context):
               unique_namespaces = set(["AWS/AutoScaling"])
+              custom_namespace = set()
 
               response_value = {}
               for value in default:
@@ -1097,12 +1098,17 @@ Resources:
               if namespaces:
                   namespace_list = namespaces.split(",")
                   for namespace in namespace_list:
-                      name = namespace.split("/")[1]
-                      response_value[name] = "Yes"
-                      if name not in cw_metrics_specific:
-                          unique_namespaces.add(namespace.replace(" ", ""))
+                      if namespace.strip().startswith("AWS/"):
+                          name = namespace.split("/")[1]
+                          response_value[name] = "Yes"
+                          if name not in cw_metrics_specific:
+                              unique_namespaces.add(namespace.replace(" ", ""))
+                      else:
+                          custom_namespace.add(namespace.replace(" ", ""))
 
               response_value["namespaces"] = ", ".join(unique_namespaces)
+              response_value["createCustom"] = "No" if len(custom_namespace) == 0 else "Yes"
+              response_value["customNamespaces"] = ", ".join(custom_namespace)
               LOGGER.info("Response is {}".format(response_value))
               cfnresponse.send(event, context, cfnresponse.SUCCESS, response_value, "NamespaceSplitting")
       Handler: index.lambda_handler
@@ -1153,6 +1159,8 @@ Resources:
         FourthMetricsSourceNamespace: "Lambda"
         CreateFifthMetricsSource: !GetAtt Primerinvoke.RDS
         FifthMetricsSourceNamespace: "RDS"
+        CreateCustomMetricsSource: !GetAtt Primerinvoke.createCustom
+        CustomMetricsSourceNamespace: !GetAtt Primerinvoke.customNamespaces
 
   CloudWatchMetricsSecondStack:
     Type: AWS::CloudFormation::Stack

aws-observability/templates/sumologic_observability.master.template.yaml

@@ -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