cloudwatch - additional dimensions should be a separate metric send

jantman · Oct 1, 2017 · 19d136f · 19d136f
1 parent 5ac5c43
commit 19d136f
Showing 1 changed file with 12 additions and 8 deletions.
diff --git a/src/diamond/handler/cloudwatch.py b/src/diamond/handler/cloudwatch.py
@@ -45,7 +45,7 @@
 name = Uptime
 namespace = Diamond
 unit = None
-[[[[additional_dimensions]]]]
+[[[[collect_with_dimensions]]]]
 Hostname = foo
 
 """
@@ -102,7 +102,7 @@ def __init__(self, config=None):
         self.valid_config = ('region', 'collector', 'metric', 'namespace',
                              'name', 'unit', 'collect_by_instance',
                              'collect_without_dimension',
-                             'additional_dimensions')
+                             'collect_with_dimensions')
 
         self.rules = []
         for key_name, section in self.config.items():
@@ -134,7 +134,7 @@ def get_default_rule_config(self):
             'unit': 'None',
             'collect_by_instance': True,
             'collect_without_dimension': False,
-            'additional_dimensions': {}
+            'collect_with_dimensions': {}
         })
         return config
 
@@ -153,8 +153,8 @@ def get_default_config_help(self):
             'collector': 'Diamond collector name',
             'collect_by_instance': 'Send metric with InstanceId dimension',
             'collect_without_dimension': 'Send metric with no dimension',
-            'additional_dimensions': 'Name/Value additional dimensions to '
-                                     'send with metric'
+            'collect_with_dimensions': 'Name/Value additional dimensions to '
+                                       'send metric with'
         })
 
         return config
@@ -174,7 +174,7 @@ def get_default_config(self):
             'unit': 'None',
             'collect_by_instance': True,
             'collect_without_dimension': False,
-            'additional_dimensions': {}
+            'collect_with_dimensions': {}
         })
 
         return config
@@ -242,15 +242,19 @@ def process(self, metric):
                         metric,
                         {})
 
+                if len(rule['collect_with_dimensions']) > 0:
+                    self.send_metrics_to_cloudwatch(
+                        rule,
+                        metric,
+                        rule['collect_with_dimensions'])
+
     def send_metrics_to_cloudwatch(self, rule, metric, dimensions):
         """
           Send metrics to CloudWatch for the given dimensions
         """
 
         timestamp = datetime.datetime.utcfromtimestamp(metric.timestamp)
 
-        dimensions.update(rule['additional_dimensions'])
-
         self.log.debug(
             "CloudWatch: Attempting to publish metric: %s to %s "
             "with value (%s) for dimensions %s @%s",