- Autodated namespace for AlarmSets for ASG

waterbear-cloud · Nov 12, 2021 · 9b794e9 · 9b794e9
1 parent 9e7bbf8
commit 9b794e9
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 3 deletions.
diff --git a/src/paco/cftemplates/cw_alarms.py b/src/paco/cftemplates/cw_alarms.py
@@ -299,7 +299,11 @@ def add_alarms(self, alarms):
                     alarm_export_dict['Namespace'] = "Paco/" + prefixed_log_group_name
                 else:
                     # if not supplied default to the Namespace for the Resource type
-                    alarm_export_dict['Namespace'] = vocabulary.cloudwatch[resource.type]['namespace']
+                    if 'namespace_by_metric_name' in vocabulary.cloudwatch[resource.type].keys() and alarm.metric_name in vocabulary.cloudwatch[resource.type]['namespace_by_metric_name'].keys():
+                        alarm_export_dict['Namespace'] = vocabulary.cloudwatch[resource.type]['namespace_by_metric_name'][alarm.metric_name]
+                    else:
+                        alarm_export_dict['Namespace'] = vocabulary.cloudwatch[resource.type]['namespace']
+
             else:
                 # Use the Namespace as directly supplied
                 alarm_export_dict['Namespace'] = alarm.namespace

diff --git a/...paco/cookiecutters/managedwebappcicd/{{cookiecutter.project_name}}/monitor/AlarmSets.yaml b/...paco/cookiecutters/managedwebappcicd/{{cookiecutter.project_name}}/monitor/AlarmSets.yaml
@@ -62,7 +62,6 @@ ASG:
       classification: health
       severity: critical
       metric_name: "StatusCheckFailed"
-      namespace: AWS/EC2
       period: 60
       evaluation_periods: 5
       statistic: Maximum
@@ -73,7 +72,6 @@ ASG:
       classification: performance
       severity: critical
       metric_name: "CPUUtilization"
-      namespace: AWS/EC2
       period: 60
       evaluation_periods: 30
       threshold: 90