Merge pull request #1 from stackhpc/bugfix/invalid_chars_in_dimension

Send flavor resources as value metadata

Author: JohnGarbutt

cron/example.sh

@@ -407,7 +407,7 @@
               "error": "",
               "group": true,
               "hide": false,
-              "metric": "os_capacity.usage.count",
+              "metric": "os_capacity.usage.user.count",
               "period": "300",
               "refId": "A"
             }
@@ -502,7 +502,7 @@
               ],
               "error": "",
               "group": true,
-              "metric": "os_capacity.usage.days.count",
+              "metric": "os_capacity.usage.user.days.count",
               "period": "300",
               "refId": "A"
             }

cron/grafana_dashboard.json

@@ -59,13 +59,16 @@ def take_action(self, parsed_args):
             free = group[3]
             metrics_to_send.append(metrics.Metric(
                 name="resources.total", value=total,
-                dimensions={"flavor": flavors, "resources": resources}))
+                value_meta={"flavor_resources": resources},
+                dimensions={"flavor": flavors}))
             metrics_to_send.append(metrics.Metric(
                 name="resources.used", value=used,
-                dimensions={"flavor": flavors, "resources": resources}))
+                value_meta={"flavor_resources": resources},
+                dimensions={"flavor": flavors}))
             metrics_to_send.append(metrics.Metric(
                 name="resources.free", value=free,
-                dimensions={"flavor": flavors, "resources": resources}))
+                value_meta={"flavor_resources": resources},
+                dimensions={"flavor": flavors}))
         metrics.send_metrics(self.app.monitoring_client, metrics_to_send)
 
         return (

os_capacity/commands/commands.py

@@ -17,7 +17,7 @@
 import time
 
 Metric = collections.namedtuple(
-    "Metric", ("name", "value", "dimensions"))
+    "Metric", ("name", "value", "value_meta", "dimensions"))
 
 SEND_METRICS = 'OS_CAPACITY_SEND_METRICS' in os.environ
 
@@ -33,7 +33,7 @@ def send_metrics(monitoring_client, metrics):
             "name": "os_capacity.%s" % metric.name,
             "value": float(metric.value),
             "timestamp": timestamp,
-            "value_meta": None,
+            "value_meta": metric.value_meta,
             "dimensions": metric.dimensions,
         })
     response = monitoring_client.post("/metrics", json=formatted_metrics)

os_capacity/data/metrics.py

@@ -241,16 +241,18 @@ def get_key(allocation):
 
             if key_name:
                 dimensions[name_key] = key_name
-            dimensions['usage_summary'] = usage
-            dimensions['version'] = 2.0
+            value_meta = {'usage_summary': usage}
+            dimensions['version'] = '2.0'
 
             metrics_to_send.append(metrics.Metric(
                 name="usage.%s.count" % group_by,
                 value=grouped_usage['Count'],
+                value_meta=value_meta,
                 dimensions=dimensions))
             metrics_to_send.append(metrics.Metric(
                 name="usage.%s.days.count" % group_by,
                 value=grouped_usage_days['Count'],
+                value_meta=value_meta,
                 dimensions=dimensions))
 
     # Sort my largest current usage first