From a8800748380f980fdb76a954f9737f9e9c6344e0 Mon Sep 17 00:00:00 2001 From: Rosiak Date: Wed, 2 Mar 2016 19:06:43 +0100 Subject: [PATCH 1/4] Basic Ironware PSU State Disco --- .../discovery/sensors/states/ironware.inc.php | 51 +++++++++++++++++++ 1 file changed, 51 insertions(+) create mode 100644 includes/discovery/sensors/states/ironware.inc.php diff --git a/includes/discovery/sensors/states/ironware.inc.php b/includes/discovery/sensors/states/ironware.inc.php new file mode 100644 index 000000000..f16c71a71 --- /dev/null +++ b/includes/discovery/sensors/states/ironware.inc.php @@ -0,0 +1,51 @@ + + * This program is free software: you can redistribute it and/or modify it + * under the terms of the GNU General Public License as published by the + * Free Software Foundation, either version 3 of the License, or (at your + * option) any later version. Please see LICENSE.txt at the top level of + * the source code distribution for details. + */ + +if ($device['os'] == 'ironware') { + + $temp = snmpwalk_cache_multi_oid($device, 'snChasPwrSupplyTable', array(), 'FOUNDRY-SN-AGENT-MIB'); + $cur_oid = '.1.3.6.1.4.1.1991.1.1.1.2.2.1.4.1.'; + + if (is_array($temp)) { + //Create State Index + $state_name = 'snChasPwrSupplyOperStatus'; + $state_index_id = create_state_index($state_name); + + //Create State Translation + if ($state_index_id) { + $states = array( + array($state_index_id,'other',0,1,3) , + array($state_index_id,'normal',0,2,0) , + array($state_index_id,'failure',0,3,2) + ); + foreach($states as $value){ + $insert = array( + 'state_index_id' => $value[0], + 'state_descr' => $value[1], + 'state_draw_graph' => $value[2], + 'state_value' => $value[3], + 'state_generic_value' => $value[4] + ); + dbInsert($insert, 'state_translations'); + } + } + + foreach ($temp as $index => $entry) { + //Discover Sensors + $descr = $temp[$index]['snChasPwrSupplyDescription']; + discover_sensor($valid['sensor'], 'state', $device, $cur_oid.$index, $index, $state_name, $descr, '1', '1', null, null, null, null, $temp[$index]['snChasPwrSupplyOperStatus'], 'snmp', $index); + + //Create Sensor To State Index + create_sensor_to_state_index($device, $state_name, $index); + } + } +} From add8f9503a67a030dafe56b5bc7cdd967682b728 Mon Sep 17 00:00:00 2001 From: Rosiak Date: Thu, 3 Mar 2016 19:42:11 +0100 Subject: [PATCH 2/4] if descr empty, then fill in --- includes/discovery/sensors/states/ironware.inc.php | 3 +++ 1 file changed, 3 insertions(+) diff --git a/includes/discovery/sensors/states/ironware.inc.php b/includes/discovery/sensors/states/ironware.inc.php index f16c71a71..02d89a892 100644 --- a/includes/discovery/sensors/states/ironware.inc.php +++ b/includes/discovery/sensors/states/ironware.inc.php @@ -42,6 +42,9 @@ if ($device['os'] == 'ironware') { foreach ($temp as $index => $entry) { //Discover Sensors $descr = $temp[$index]['snChasPwrSupplyDescription']; + if (empty($descr)) { + $descr = "Power Supply" . $index; + } discover_sensor($valid['sensor'], 'state', $device, $cur_oid.$index, $index, $state_name, $descr, '1', '1', null, null, null, null, $temp[$index]['snChasPwrSupplyOperStatus'], 'snmp', $index); //Create Sensor To State Index From 7e851ad9997d256c860579237b51360d3089568c Mon Sep 17 00:00:00 2001 From: Rosiak Date: Thu, 3 Mar 2016 19:45:51 +0100 Subject: [PATCH 3/4] add space --- includes/discovery/sensors/states/ironware.inc.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/includes/discovery/sensors/states/ironware.inc.php b/includes/discovery/sensors/states/ironware.inc.php index 02d89a892..6cf7f7ad2 100644 --- a/includes/discovery/sensors/states/ironware.inc.php +++ b/includes/discovery/sensors/states/ironware.inc.php @@ -43,7 +43,7 @@ if ($device['os'] == 'ironware') { //Discover Sensors $descr = $temp[$index]['snChasPwrSupplyDescription']; if (empty($descr)) { - $descr = "Power Supply" . $index; + $descr = "Power Supply " . $index; } discover_sensor($valid['sensor'], 'state', $device, $cur_oid.$index, $index, $state_name, $descr, '1', '1', null, null, null, null, $temp[$index]['snChasPwrSupplyOperStatus'], 'snmp', $index); From 5a4334daa507cdfe1ca8e6987a99592ae8562d3c Mon Sep 17 00:00:00 2001 From: Rosiak Date: Fri, 4 Mar 2016 06:49:04 +0100 Subject: [PATCH 4/4] Small fix --- includes/discovery/sensors/states/ironware.inc.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/includes/discovery/sensors/states/ironware.inc.php b/includes/discovery/sensors/states/ironware.inc.php index 6cf7f7ad2..1b88b0255 100644 --- a/includes/discovery/sensors/states/ironware.inc.php +++ b/includes/discovery/sensors/states/ironware.inc.php @@ -13,7 +13,7 @@ if ($device['os'] == 'ironware') { $temp = snmpwalk_cache_multi_oid($device, 'snChasPwrSupplyTable', array(), 'FOUNDRY-SN-AGENT-MIB'); - $cur_oid = '.1.3.6.1.4.1.1991.1.1.1.2.2.1.4.1.'; + $cur_oid = '.1.3.6.1.4.1.1991.1.1.1.2.1.1.3.'; if (is_array($temp)) { //Create State Index @@ -21,7 +21,7 @@ if ($device['os'] == 'ironware') { $state_index_id = create_state_index($state_name); //Create State Translation - if ($state_index_id) { + if ($state_index_id !== null) { $states = array( array($state_index_id,'other',0,1,3) , array($state_index_id,'normal',0,2,0) ,