Add os-capacity prometheus

Author: JohnGarbutt

README.rst

@@ -135,23 +135,8 @@ See the online help for more details:
       complete       print bash completion command
       flavor list    List all the flavors.
       help           print detailed help for another command
+      prometheus  To be run as node exporter textfile collector
       resources all  List all resource providers, with their resources and servers.
       resources group  Lists counts of resource providers with similar inventories.
       usages all     List all current resource usages.
       usages group   Group usage by specified key (by user or project).
-
-Submitting Metrics to Monasca
------------------------------
-
-There is now an experimental mode where metrics can be written into Monasca
-for the calls "resources group" and "usages group user". To enable this
-feature you must set::
-
-    export OS_CAPACITY_SEND_METRICS=1
-
-To later disable the feature you must unset the environment variable::
-
-    unset OS_CAPACITY_SEND_METRICS
-
-For an example of using this with cron, please see the example script in
-``cron/example.sh``.

os_capacity/commands/commands.py

@@ -19,6 +19,15 @@
 
 from os_capacity.data import metrics
 from os_capacity import utils
+from os_capacity.data import candidates
+
+
+class PrometheusAll(Lister):
+    """To be run as node exporter textfile collector."""
+    def take_action(self, parsed_args):
+        candidates.print_exporter_data(self.app)
+        # TODO(johngarbutt) a total hack!
+        return (('fake'), [])
 
 
 class FlavorList(Lister):

os_capacity/data/candidates.py

@@ -6,12 +6,12 @@
 import openstack
 
 
-def get_capacity_per_flavor(conn, flavors):
+def get_capacity_per_flavor(placement_client, flavors):
     capacity_per_flavor = {}
 
     for flavor in flavors:
         resources, traits = get_placement_request(flavor)
-        max_per_host = get_max_per_host(conn, resources, traits)
+        max_per_host = get_max_per_host(placement_client, resources, traits)
         capacity_per_flavor[flavor.name] = max_per_host
 
     return capacity_per_flavor
@@ -27,20 +27,22 @@ def get_placement_request(flavor):
         if "resources:" == key[:10]:
             count = int(value)
             resources[key[10:]] = count
+        if "hw:cpu_policy" == key and value == "dedicated":
+            resources["PCPU"] = flavor.vcpus
     if "PCPU" not in resources.keys() and "VCPU" not in resources.keys():
         resources["VCPU"] = flavor.vcpus
     return resources, required_traits
 
 
-def get_max_per_host(conn, resources, required_traits):
+def get_max_per_host(placement_client, resources, required_traits):
     resource_str = ",".join(
         [key + ":" + str(value) for key, value in resources.items() if value]
     )
     required_str = ",".join(required_traits)
     # TODO(johngarbut): remove disabled!
     forbidden_str = "COMPUTE_STATUS_DISABLED"
 
-    response = conn.placement.get(
+    response = placement_client.get(
         "/allocation_candidates",
         params={"resources": resource_str, "required": required_str},
         headers={"OpenStack-API-Version": "placement 1.29"},
@@ -63,11 +65,9 @@ def get_max_per_host(conn, resources, required_traits):
     return count_per_rp
 
 
-def main():
-    conn = openstack.connect()
-
-    flavors = list(conn.compute.flavors())
-    capacity_per_flavor = get_capacity_per_flavor(conn, flavors)
+def print_exporter_data(app):
+    flavors = list(app.compute_client.flavors())
+    capacity_per_flavor = get_capacity_per_flavor(app.placement_client, flavors)
 
     # total capacity per flavor
     flavor_names = sorted([f.name for f in flavors])
@@ -77,17 +77,16 @@ def main():
         print(f'openstack_total_capacity_per_flavor{{flavor="{flavor_name}"}} {total}')
 
     # capacity per host
-    raw_rps = list(conn.placement.resource_providers())
+    raw_rps = list(app.placement_client.resource_providers())
     resource_providers = {rp.name: rp.id for rp in raw_rps}
     hostnames = sorted(resource_providers.keys())
     for hostname in hostnames:
         rp_id = resource_providers[hostname]
         for flavor_name in flavor_names:
             all_counts = capacity_per_flavor.get(flavor_name, {})
             our_count = all_counts.get(rp_id, 0)
+            if our_count == 0:
+                continue
             print(
                 f'openstack_capacity_by_hostname{{hypervisor="{hostname}",flavor="{flavor_name}"}} {our_count}'
             )
-
-
-main()

os_capacity/shell.py

@@ -18,6 +18,7 @@
 from cliff.commandmanager import CommandManager
 import os_client_config
 
+import openstack
 
 def get_cloud_config():
     # TODO(johngarbutt) consider passing in argument parser
@@ -41,11 +42,11 @@ def __init__(self):
     def initialize_app(self, argv):
         self.LOG.debug('initialize_app')
 
-        config = os_client_config.get_config()
-        self.compute_client = config.get_session_client("compute")
-        self.placement_client = config.get_session_client("placement")
-        self.monitoring_client = config.get_session_client("monitoring")
-        self.identity_client = config.get_session_client("identity")
+        conn = openstack.openstack.connect()
+        self.connection = conn
+        self.compute_client = conn.compute
+        self.placement_client = conn.placement
+        self.identity_client = conn.identity
 
         self.LOG.debug('setup Keystone API REST clients')
 

setup.py

@@ -57,6 +57,7 @@
             '.commands:ListResourcesGroups',
             'usages_all = os_capacity.commands.commands:ListUsagesAll',
             'usages_group = os_capacity.commands.commands:ListUsagesGroup',
+            'prometheus = os_capacity.commands.commands:PrometheusAll',
         ],
     },
 )