Complete removal of Monasca metrics

Author: markgoddard

os_capacity/commands/commands.py

@@ -17,7 +17,6 @@
 
 from cliff.lister import Lister
 
-from os_capacity.data import metrics
 from os_capacity import prometheus
 from os_capacity import utils
 
@@ -55,32 +54,6 @@ class ListResourcesGroups(Lister):
 
     def take_action(self, parsed_args):
         groups = utils.group_providers_by_type_with_capacity(self.app)
-        groups = list(groups)  # convert iterator
-
-        metrics_to_send = []
-        for group in groups:
-            flavors = group[4].replace(", ", "-")
-            if not flavors:
-                # skip empty hosts
-                continue
-            resources = group[0]
-            total = group[1]
-            used = group[2]
-            free = group[3]
-            metrics_to_send.append(metrics.Metric(
-                name="resources.total", value=total,
-                value_meta={"flavor_resources": resources},
-                dimensions={"flavor": flavors}))
-            metrics_to_send.append(metrics.Metric(
-                name="resources.used", value=used,
-                value_meta={"flavor_resources": resources},
-                dimensions={"flavor": flavors}))
-            metrics_to_send.append(metrics.Metric(
-                name="resources.free", value=free,
-                value_meta={"flavor_resources": resources},
-                dimensions={"flavor": flavors}))
-        metrics.send_metrics(self.app.monitoring_client, metrics_to_send)
-
         return (
             ('Resource Class Groups', 'Total', 'Used', 'Free', 'Flavors'),
             groups)

os_capacity/data/metrics.py

@@ -17,7 +17,6 @@
 import os
 
 from os_capacity.data import flavors
-from os_capacity.data import metrics
 from os_capacity.data import resource_provider
 from os_capacity.data import server as server_data
 from os_capacity.data import users
@@ -203,7 +202,6 @@ def get_key(allocation):
     all_users = users.get_all(app.identity_client)
     all_projects = users.get_all_projects(app.identity_client)
 
-    metrics_to_send = []
     summary_tuples = []
     for key, group in grouped_allocations.items():
         grouped_usage = collections.defaultdict(int)
@@ -249,21 +247,7 @@ def get_key(allocation):
             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
     summary_tuples.sort(key=lambda x: x[1], reverse=True)
 
-    if metrics_to_send:
-        metrics.send_metrics(app.monitoring_client, metrics_to_send)
-
     return summary_tuples