From 2fe97b4a7d36a78f5a79bcb9bff4e2e6648f0569 Mon Sep 17 00:00:00 2001 From: Rosiak Date: Sat, 12 Mar 2016 22:55:36 +0100 Subject: [PATCH] Convert old drac state disco to new --- .../discovery/sensors/states/drac.inc.php | 53 +++++++++++++------ 1 file changed, 38 insertions(+), 15 deletions(-) diff --git a/includes/discovery/sensors/states/drac.inc.php b/includes/discovery/sensors/states/drac.inc.php index 5e4c5eba8b..bbb96d2756 100644 --- a/includes/discovery/sensors/states/drac.inc.php +++ b/includes/discovery/sensors/states/drac.inc.php @@ -1,10 +1,8 @@ - * + * Copyright (c) 2016 Søren Friis Rosiak * 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 @@ -12,18 +10,43 @@ * the source code distribution for details. */ -if ($device['os'] == "drac") { - $oids = snmp_walk($device, "virtualDiskNumber", "-Oesqn", "IDRAC-MIB-SMIv2"); - $main_oid = ".1.3.6.1.4.1.674.10892.5.5.1.20.140.1.1."; - d_echo($oids."\n"); - $oids = trim($oids); - if ($oids) { - echo "Dell iDRAC"; - foreach (explode("\n", $oids) as $data) { - list($oid,) = explode(" ", $data, 2); - $state_oid = "4.1"; - $state_current = snmp_get($device, $main_oid.$state_oid, "-Oevq"); - discover_sensor($valid['sensor'], 'state', $device, $main_oid.$state_oid, "virtualDiskState.$state_oid", 'drac', 'Raid State', '1', '1', NULL, NULL, NULL, NULL, $state_current); +if ($device['os'] == 'drac') { + + $temp = snmpwalk_cache_multi_oid($device, 'virtualDiskTable', array(), 'IDRAC-MIB-SMIv2'); + $cur_oid = '.1.3.6.1.4.1.674.10892.5.5.1.20.140.1.1.4.'; + + if (is_array($temp)) { + //Create State Index + $state_name = 'virtualDiskState'; + $state_index_id = create_state_index($state_name); + + //Create State Translation + if ($state_index_id !== null) { + $states = array( + array($state_index_id,'unknown',0,1,3) , + array($state_index_id,'online',0,2,0) , + array($state_index_id,'failed',0,3,2) , + array($state_index_id,'degraded',0,4,1) + ); + 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) { + $descr = $temp[$index]['virtualDiskName']; + //Discover Sensors + discover_sensor($valid['sensor'], 'state', $device, $cur_oid.$index, $index, $state_name, $descr, '1', '1', null, null, null, null, $temp[$index]['virtualDiskState'], 'snmp', $index); + + //Create Sensor To State Index + create_sensor_to_state_index($device, $state_name, $index); } } }