Skip to content

Commit 77244c1

Browse files
dagbdagblaf
dagbdagb
and
laf
authored
Added counter for upsAlarmsPresent for rfc1628 devices (librenms#18466)
* Added counter for upsAlarmsPresent - 1.3.6.1.2.1.33.1.6.1 * cleanup according to CI * Updated test data --------- Co-authored-by: Neil Lathwood <[email protected]>
1 parent ae5be9e commit 77244c1

File tree

6 files changed

+157
-0
lines changed

6 files changed

+157
-0
lines changed

‎includes/discovery/sensors/count/rfc1628.inc.php‎

Lines changed: 32 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,32 @@
1+
<?php
2+
3+
/*
4+
*
5+
* @link https://www.librenms.org
6+
*
7+
* @author [email protected]
8+
*/
9+
10+
echo 'RFC1628 ';
11+
12+
$ups_alarms_present = SnmpQuery::get('UPS-MIB::upsAlarmsPresent.0')->value();
13+
if (is_numeric($ups_alarms_present)) {
14+
$ups_alarms_present_oid = '.1.3.6.1.2.1.33.1.6.1.0';
15+
16+
discover_sensor(
17+
null,
18+
'count',
19+
$device,
20+
$ups_alarms_present_oid,
21+
'0',
22+
'rfc1628',
23+
'UPS Alarms',
24+
1,
25+
1,
26+
null,
27+
null,
28+
null,
29+
null,
30+
$ups_alarms_present
31+
);
32+
}

‎tests/data/eaton-mgeups_9pxle.json‎

Lines changed: 25 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -458,6 +458,31 @@
458458
"rrd_type": "GAUGE",
459459
"state_name": null
460460
},
461+
{
462+
"sensor_deleted": 0,
463+
"sensor_class": "count",
464+
"poller_type": "snmp",
465+
"sensor_oid": ".1.3.6.1.2.1.33.1.6.1.0",
466+
"sensor_index": "0",
467+
"sensor_type": "rfc1628",
468+
"sensor_descr": "UPS Alarms",
469+
"group": null,
470+
"sensor_divisor": 1,
471+
"sensor_multiplier": 1,
472+
"sensor_current": 0,
473+
"sensor_limit": null,
474+
"sensor_limit_warn": null,
475+
"sensor_limit_low": null,
476+
"sensor_limit_low_warn": null,
477+
"sensor_alert": 1,
478+
"sensor_custom": "No",
479+
"entPhysicalIndex": null,
480+
"entPhysicalIndex_measured": null,
481+
"sensor_prev": null,
482+
"user_func": null,
483+
"rrd_type": "GAUGE",
484+
"state_name": null
485+
},
461486
{
462487
"sensor_deleted": 0,
463488
"sensor_class": "current",

‎tests/data/eatonupsm2_9px+empg2.json‎

Lines changed: 25 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -858,6 +858,31 @@
858858
"rrd_type": "GAUGE",
859859
"state_name": null
860860
},
861+
{
862+
"sensor_deleted": 0,
863+
"sensor_class": "count",
864+
"poller_type": "snmp",
865+
"sensor_oid": ".1.3.6.1.2.1.33.1.6.1.0",
866+
"sensor_index": "0",
867+
"sensor_type": "rfc1628",
868+
"sensor_descr": "UPS Alarms",
869+
"group": null,
870+
"sensor_divisor": 1,
871+
"sensor_multiplier": 1,
872+
"sensor_current": 0,
873+
"sensor_limit": null,
874+
"sensor_limit_warn": null,
875+
"sensor_limit_low": null,
876+
"sensor_limit_low_warn": null,
877+
"sensor_alert": 1,
878+
"sensor_custom": "No",
879+
"entPhysicalIndex": null,
880+
"entPhysicalIndex_measured": null,
881+
"sensor_prev": null,
882+
"user_func": null,
883+
"rrd_type": "GAUGE",
884+
"state_name": null
885+
},
861886
{
862887
"sensor_deleted": 0,
863888
"sensor_class": "current",

‎tests/data/istars.json‎

Lines changed: 25 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -458,6 +458,31 @@
458458
"rrd_type": "GAUGE",
459459
"state_name": null
460460
},
461+
{
462+
"sensor_deleted": 0,
463+
"sensor_class": "count",
464+
"poller_type": "snmp",
465+
"sensor_oid": ".1.3.6.1.2.1.33.1.6.1.0",
466+
"sensor_index": "0",
467+
"sensor_type": "rfc1628",
468+
"sensor_descr": "UPS Alarms",
469+
"group": null,
470+
"sensor_divisor": 1,
471+
"sensor_multiplier": 1,
472+
"sensor_current": 0,
473+
"sensor_limit": null,
474+
"sensor_limit_warn": null,
475+
"sensor_limit_low": null,
476+
"sensor_limit_low_warn": null,
477+
"sensor_alert": 1,
478+
"sensor_custom": "No",
479+
"entPhysicalIndex": null,
480+
"entPhysicalIndex_measured": null,
481+
"sensor_prev": null,
482+
"user_func": null,
483+
"rrd_type": "GAUGE",
484+
"state_name": null
485+
},
461486
{
462487
"sensor_deleted": 0,
463488
"sensor_class": "current",

‎tests/data/marathonups.json‎

Lines changed: 25 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -476,6 +476,31 @@
476476
"rrd_type": "GAUGE",
477477
"state_name": null
478478
},
479+
{
480+
"sensor_deleted": 0,
481+
"sensor_class": "count",
482+
"poller_type": "snmp",
483+
"sensor_oid": ".1.3.6.1.2.1.33.1.6.1.0",
484+
"sensor_index": "0",
485+
"sensor_type": "rfc1628",
486+
"sensor_descr": "UPS Alarms",
487+
"group": null,
488+
"sensor_divisor": 1,
489+
"sensor_multiplier": 1,
490+
"sensor_current": 0,
491+
"sensor_limit": null,
492+
"sensor_limit_warn": null,
493+
"sensor_limit_low": null,
494+
"sensor_limit_low_warn": null,
495+
"sensor_alert": 1,
496+
"sensor_custom": "No",
497+
"entPhysicalIndex": null,
498+
"entPhysicalIndex_measured": null,
499+
"sensor_prev": null,
500+
"user_func": null,
501+
"rrd_type": "GAUGE",
502+
"state_name": null
503+
},
479504
{
480505
"sensor_deleted": 0,
481506
"sensor_class": "frequency",

‎tests/data/poweralert_2.json‎

Lines changed: 25 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -483,6 +483,31 @@
483483
"rrd_type": "GAUGE",
484484
"state_name": null
485485
},
486+
{
487+
"sensor_deleted": 0,
488+
"sensor_class": "count",
489+
"poller_type": "snmp",
490+
"sensor_oid": ".1.3.6.1.2.1.33.1.6.1.0",
491+
"sensor_index": "0",
492+
"sensor_type": "rfc1628",
493+
"sensor_descr": "UPS Alarms",
494+
"group": null,
495+
"sensor_divisor": 1,
496+
"sensor_multiplier": 1,
497+
"sensor_current": 2,
498+
"sensor_limit": null,
499+
"sensor_limit_warn": null,
500+
"sensor_limit_low": null,
501+
"sensor_limit_low_warn": null,
502+
"sensor_alert": 1,
503+
"sensor_custom": "No",
504+
"entPhysicalIndex": null,
505+
"entPhysicalIndex_measured": null,
506+
"sensor_prev": null,
507+
"user_func": null,
508+
"rrd_type": "GAUGE",
509+
"state_name": null
510+
},
486511
{
487512
"sensor_deleted": 0,
488513
"sensor_class": "current",

0 commit comments

Comments
 (0)