Skip to content

Commit 42b5b38

Browse files
committed
Fix wrong metric in Prometheus exporter
1 parent bd00489 commit 42b5b38

File tree

1 file changed

+25
-7
lines changed

1 file changed

+25
-7
lines changed

src/itnovum/openITCOCKPIT/Monitoring/PrometheusExporter/PrometheusExporter.php

Lines changed: 25 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -219,7 +219,7 @@ public function getMetrics() {
219219
'services_total',
220220
'Total number of services'
221221
);
222-
$gauge->set($stats['HIGHCMDBUF'] ?? 0);
222+
$gauge->set($stats['NUMSERVICES'] ?? 0);
223223

224224
$gauge = $registry->registerGauge(
225225
'naemon',
@@ -316,10 +316,10 @@ public function getMetrics() {
316316
$gauge = $registry->registerGauge(
317317
'naemon',
318318
'active_host_check_last_' . strtolower($k) . '_minutes_total',
319-
'Number of total active host checks occurring in last ' . $k . ' minutes'
319+
'Number of total active host checks in last ' . $k . ' minutes'
320320
);
321321

322-
$v = $stats['NUMACTHSTCHECKS' . $k . 'M'] ?? 0;
322+
$v = $stats['NUMHSTACTCHK' . $k . 'M'] ?? 0;
323323
$gauge->set($v);
324324

325325
$gauge = $registry->registerGauge(
@@ -360,20 +360,29 @@ public function getMetrics() {
360360

361361
$gauge = $registry->registerGauge(
362362
'naemon',
363-
'passive_host_check_last_' . strtolower($k) . '_minutes_total',
363+
'passive_host_check_occuring_last_' . strtolower($k) . '_minutes_total',
364364
'Number of passive host checks occurring in last ' . $k . ' minutes'
365365
);
366366

367367
$v = $stats['NUMPSVHSTCHECKS' . $k . 'M'] ?? 0;
368368
$gauge->set($v);
369369

370+
$gauge = $registry->registerGauge(
371+
'naemon',
372+
'passive_host_check_last_' . strtolower($k) . '_minutes_total',
373+
'Number of hosts passively checked in last ' . $k . ' minutes'
374+
);
375+
376+
$v = $stats['NUMHSTPSVCHK' . $k . 'M'] ?? 0;
377+
$gauge->set($v);
378+
370379
$gauge = $registry->registerGauge(
371380
'naemon',
372381
'active_service_check_last_' . strtolower($k) . '_minutes_total',
373-
'Number of total active service checks occurring in last ' . $k . ' minutes'
382+
'Number of total active service checks in last ' . $k . ' minutes'
374383
);
375384

376-
$v = $stats['NUMACTSVCCHECKS' . $k . 'M'] ?? 0;
385+
$v = $stats['NUMSVCACTCHK' . $k . 'M'] ?? 0;
377386
$gauge->set($v);
378387

379388
$gauge = $registry->registerGauge(
@@ -405,13 +414,22 @@ public function getMetrics() {
405414

406415
$gauge = $registry->registerGauge(
407416
'naemon',
408-
'passive_service_check_last_' . strtolower($k) . '_minutes_total',
417+
'passive_service_check_occurring_last_' . strtolower($k) . '_minutes_total',
409418
'Number of passive service checks occurring in last ' . $k . ' minutes'
410419
);
411420

412421
$v = $stats['NUMPSVSVCCHECKS' . $k . 'M'] ?? 0;
413422
$gauge->set($v);
414423

424+
$gauge = $registry->registerGauge(
425+
'naemon',
426+
'passive_service_check_last_' . strtolower($k) . '_minutes_total',
427+
'Number of services passively checked in last ' . $k . ' minutes'
428+
);
429+
430+
$v = $stats['NUMSVCPSVCHK' . $k . 'M'] ?? 0;
431+
$gauge->set($v);
432+
415433
$gauge = $registry->registerGauge(
416434
'naemon',
417435
'external_commands_processed_last_' . strtolower($k) . '_minutes_total',

0 commit comments

Comments
 (0)