re-implement

Author: frct1

src/collectors/instances_per_hypervisor.py

@@ -1,18 +1,47 @@
 from prometheus_client.core import GaugeMetricFamily, REGISTRY
 from prometheus_client.registry import Collector
-import random
+import time
+import logging
 from util import instances_per_hypervisor
+import openstack
+
+logger = logging.getLogger(__name__)
 
 class InstancesPerHypervisorCollector(Collector):
-    cloud = None
-    def __init__(self, cloud):
-        self.cloud = cloud
+    def __init__(self, cloud_name):
+        super().__init__()
+        self.cloud_name = cloud_name
+        self.metrics = []
+        self.last_update = 0
+        self.cache_time = 60
+
+    def _fetch_metrics(self):
+        try:
+            new_metrics = instances_per_hypervisor.export_metrics(self.cloud_name)
+            self.metrics = new_metrics
+            self.last_update = time.time()
+            logger.info(f"Updated metrics with {len(new_metrics)} hypervisors")
+            
+        except Exception as e:
+            logger.error(f"Error updating metrics: {str(e)}")
+            raise
 
     def collect(self):
-        instances_per_hypervisor_gauge = GaugeMetricFamily('openstack_peepo_exporter_instances_per_hypervisor', 'Number of instances per hypervisor', labels=['hypervisor_name', 'hypervisor_id'])
-        metrics = instances_per_hypervisor.export_metrics(self.cloud)
-        print(f"data: {metrics}")
-        for metric in metrics:
-            instances_per_hypervisor_gauge.add_metric([metric['hypervisor_name'], metric['hypervisor_id']], metric['instance_count'])
-        yield instances_per_hypervisor_gauge
+        if time.time() - self.last_update > self.cache_time:
+            self._fetch_metrics()
+        
+        gauge = GaugeMetricFamily(
+            'openstack_peepo_exporter_instances_per_hypervisor',
+            'Number of instances per hypervisor',
+            labels=['hypervisor_name', 'hypervisor_id']
+        )
+
+        for metric in self.metrics:
+            gauge.add_metric(
+                [metric['hypervisor_name'], metric['hypervisor_id']],
+                metric['instance_count']
+            )
+        
+        yield gauge
+
 

src/main.py

@@ -1,33 +1,39 @@
-from prometheus_client import generate_latest, CollectorRegistry, CONTENT_TYPE_LATEST
+from prometheus_client import generate_latest, CollectorRegistry, CONTENT_TYPE_LATEST, start_http_server, REGISTRY
+import argparse, uvicorn, time, logging
 from collectors.instances_per_hypervisor import InstancesPerHypervisorCollector
-from fastapi import FastAPI, Response
-import argparse, uvicorn
 
-def create_app(cloud_name: str):
-    registry = CollectorRegistry()
-    registry.register(InstancesPerHypervisorCollector(cloud_name))
-    
-    app = FastAPI(debug=True, redirect_slashes=False)
-    
-    @app.get("/metrics")
-    async def metrics(response: Response):
-        response.headers['Content-Type'] = CONTENT_TYPE_LATEST
-        data = generate_latest(registry)
-        return Response(content=data.decode('utf-8'), media_type=CONTENT_TYPE_LATEST)
-    
-    return app
+# Configure logging
+logging.basicConfig(
+    level=logging.INFO,
+    format='%(asctime)s - %(name)s - %(levelname)s - %(message)s'
+)
+logger = logging.getLogger(__name__)
 
 if __name__ == "__main__":
-    parser = argparse.ArgumentParser(
-        description="Export metrics for a given cloud."
-    )
-    parser.add_argument(
-        "--cloud", required=True, help="The name of the cloud."
-    )
-    args = parser.parse_args()
-    
-    # Create the app with the provided cloud name
-    app = create_app(args.cloud)
-    
-    uvicorn.run(app, host="0.0.0.0", port=8000)
+    try:
+        parser = argparse.ArgumentParser(
+            description="Export metrics for a given cloud."
+        )
+        parser.add_argument(
+            "--cloud", required=True, help="The name of the cloud."
+        )
+        args = parser.parse_args()
+        
+        # Register the collector
+        registry = CollectorRegistry()
+        registry.register(InstancesPerHypervisorCollector(args.cloud))
+        
+        # Start the metrics server
+        start_http_server(8000, registry=registry)
+        logger.info("Exporter running at http://localhost:8000")
+        
+        # Keep the main thread alive
+        try:
+            while True:
+                time.sleep(1)
+        except KeyboardInterrupt:
+            logger.info("\nShutting down...")
+    except Exception as e:
+        logger.error(f"Failed to start exporter: {str(e)}")
+        raise
 

src/util/instances_per_hypervisor.py

@@ -1,19 +1,16 @@
 import openstack
 
 def export_metrics(cloud_name: str):
-
-    # Initialize connection (assumes clouds.yaml is configured)
+    print(f"exporting metrics for {cloud_name}")
     conn = openstack.connect(cloud=cloud_name)
 
-    # Dictionary to store instance counts per hypervisor
     instance_counts = []
 
-    # Iterate over all resource providers
     for rp in conn.placement.resource_providers():
+        print(f"rp: {rp}")
         hypervisor_id = rp.id
         hypervisor_name = rp.name
 
-        # Get allocations for this resource provider
         allocations = conn.placement.get(f'/resource_providers/{rp.id}/allocations').json()
         instance_count = len(allocations.get('allocations', {}))
         data = {
@@ -25,6 +22,5 @@ def export_metrics(cloud_name: str):
 
         print(f"Hypervisor: {hypervisor_name}, Instances: {instance_count}")
 
-    # Return the dictionary containing hypervisor instance counts
     return instance_counts