mirror/librenms-librenms
1
0
Fork 0
mirror of https://github.com/librenms/librenms.git synced 2024-10-07 16:52:45 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Advanced state sensors (#9881)

Browse Source 
* refactor: advanced sensor states

mark create_state_index($state_name) as E_USER_DEPRECATED?

* fix: minor corrections

* fix: mib has partialSync(9) and incompatibleVersion(8)

* fix: corrected netagent2upsstate - Sleeping(5)

* fix: NetAgent2 upsThreePhaseUPSStatusInverterOperating correction

* refactor: array() be gone

* Refactoring includes/discovery/sensors/state/extendair.inc.php with arrays
And tidying up array formatting in other files

* fix: minor typo

* standardising array item names

removed redundant "if ($state_index_id !== null) {"

* workaround: procurve & serverscheck

a sensor is causing create_state_index($state) to return null.
The updated code doesn't allow for this and thus a hybrid is being used.

* standardised naming of state info. Caused a typo $state_name instead of $status_name
$state_name is the standard

* converted compas to square arrays

* Converted APC states using preg_match to new create_state_index() call

* Update boss.inc.php
This commit is contained in:
KodApa85
2019-03-04 17:31:17 +00:00
committed by Tony Murray
parent 09caced7ef
commit 7f104d4fd9
166 changed files with 1608 additions and 3418 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
includes/discovery/sensors/state/serveriron.inc.php
View File

@@ -9,7 +9,7 @@ for ($i=1; $i != 3; $i++) {
$power_oid = '.1.3.6.1.4.1.1991.1.1.1.2.1.1.3.'.$i;
$power_status = snmp_get($device, $power_oid, '-Oqv');
if (!empty($power_status)) {
discover_sensor($valid['sensor'], 'state', $device, $power_oid, 'powerstatus'.$i, 'snmp', 'Power Supply '.$i.' Status', '1', '1', '1', null, null, '3', $power_status);
discover_sensor($valid['sensor'], 'state', $device, $power_oid, 'powerstatus'.$i, 'snmp', 'Power Supply '.$i.' Status', 1, 1, '1', null, null, '3', $power_status);
}
}
@@ -18,6 +18,6 @@ for ($i=1; $i != 7; $i++) {
$fan_oid = '.1.3.6.1.4.1.1991.1.1.1.3.1.1.3.'.$i;
$fan_status = snmp_get($device, $fan_oid, '-Oqv');
if (!empty($fan_status)) {
discover_sensor($valid['sensor'], 'state', $device, $fan_oid, 'fanstatus'.$i, 'snmp', 'Fan '.$i.' Status', '1', '1', '1', null, null, '3', $fan_status);
discover_sensor($valid['sensor'], 'state', $device, $fan_oid, 'fanstatus'.$i, 'snmp', 'Fan '.$i.' Status', 1, 1, '1', null, null, '3', $fan_status);
}
}