wipp

scality · May 10, 2024 · 0b0d1b6 · 0b0d1b6
1 parent ed6b3c1
commit 0b0d1b6
Showing 1 changed file with 9 additions and 2 deletions.
diff --git a/utils/monitoring.js b/utils/monitoring.js
@@ -1,5 +1,5 @@
 const { errors } = require('arsenal');
-const promClient = require('prom-client');
+const promClient, { Registry } = require('prom-client');
 
 const aggregatorRegistry = new promClient.AggregatorRegistry();
 const { collectDefaultMetrics } = promClient;
@@ -70,7 +70,14 @@ async function metricsHandler(req, res) {
     }
 
     try {
-        const promMetrics = await aggregatorRegistry.clusterMetrics();
+        // const [registerMetrics, clusterMetrics] = await Promise.all([
+        //     promClient.register.metrics(),
+        //     aggregatorRegistry.clusterMetrics(),
+        // ]);
+        // const promMetrics = `${registerMetrics}\n${clusterMetrics}`;
+        const promResgisties = Registry.merge([promClient.register, aggregatorRegistry]);
+        const promMetrics = await promResgisties.metrics();
+        console.log(`prom metrics ${promMetrics}`);
         const contentLen = Buffer.byteLength(promMetrics, 'utf8');
         return res.writeHead(200, {
             'content-length': contentLen,