From 1c997b30b585d90e64ad66eeae844439852dcd2f Mon Sep 17 00:00:00 2001 From: Tom Laermans Date: Sat, 10 Jul 2010 11:37:11 +0000 Subject: [PATCH] split fan discovery into include_dir git-svn-id: http://www.observium.org/svn/observer/trunk@1327 61d68cd4-352d-0410-923a-c4978735b2b8 --- includes/discovery/fanspeeds.inc.php | 97 +------------------ includes/discovery/fanspeeds/areca.inc.php | 28 ++++++ .../discovery/fanspeeds/lmsensors.inc.php | 32 ++++++ .../discovery/fanspeeds/supermicro.inc.php | 47 +++++++++ ...sors-hrdevice.inc.php => hrdevice.inc.php} | 0 .../{processors-ios.inc.php => ios.inc.php} | 0 ...sors-ironware.inc.php => ironware.inc.php} | 0 ...processors-junos.inc.php => junos.inc.php} | 0 ...ocessors-junose.inc.php => junose.inc.php} | 0 includes/discovery/temperatures.inc.php | 5 - 10 files changed, 108 insertions(+), 101 deletions(-) create mode 100644 includes/discovery/fanspeeds/areca.inc.php create mode 100644 includes/discovery/fanspeeds/lmsensors.inc.php create mode 100644 includes/discovery/fanspeeds/supermicro.inc.php rename includes/discovery/processors/{processors-hrdevice.inc.php => hrdevice.inc.php} (100%) rename includes/discovery/processors/{processors-ios.inc.php => ios.inc.php} (100%) rename includes/discovery/processors/{processors-ironware.inc.php => ironware.inc.php} (100%) rename includes/discovery/processors/{processors-junos.inc.php => junos.inc.php} (100%) rename includes/discovery/processors/{processors-junose.inc.php => junose.inc.php} (100%) diff --git a/includes/discovery/fanspeeds.inc.php b/includes/discovery/fanspeeds.inc.php index 8aff8f19ef..4dade209bc 100644 --- a/includes/discovery/fanspeeds.inc.php +++ b/includes/discovery/fanspeeds.inc.php @@ -1,105 +1,10 @@ '0' && $current < '500') { - discover_fan($valid_fan,$device, $oid, $index, $type, $descr, $precision, NULL, NULL, $current); - } - } - } -} - -## Areca Fanspeeds -if ($device['os'] == "areca") -{ - $oids = snmp_walk($device, "1.3.6.1.4.1.18928.1.2.2.1.9.1.2", "-OsqnU", ""); - if ($debug) { echo($oids."\n"); } - if ($oids) echo("Areca "); - $precision = 1; - $type = "areca"; - foreach(explode("\n", $oids) as $data) - { - $data = trim($data); - if ($data) - { - list($oid,$descr) = explode(" ", $data,2); - $split_oid = explode('.',$oid); - $index = $split_oid[count($split_oid)-1]; - $oid = "1.3.6.1.4.1.18928.1.2.2.1.9.1.3." . $index; - $current = snmp_get($device, $oid, "-Oqv", "") / $precision; - discover_fan($valid_fan,$device, $oid, $index, $type, trim($descr,'"'), $precision, NULL, NULL, $current); - } - } -} - -## Supermicro Fanspeeds -if ($device['os'] == "linux") -{ - $oids = snmp_walk($device, "1.3.6.1.4.1.10876.2.1.1.1.1.3", "-OsqnU", "SUPERMICRO-HEALTH-MIB"); - if ($debug) { echo($oids."\n"); } - $oids = trim($oids); - if ($oids) echo("Supermicro "); - $type = "supermicro"; - foreach(explode("\n", $oids) as $data) - { - $data = trim($data); - if ($data) - { - list($oid,$kind) = explode(" ", $data); - $split_oid = explode('.',$oid); - $index = $split_oid[count($split_oid)-1]; - if ($kind == 0) - { - $fan_oid = "1.3.6.1.4.1.10876.2.1.1.1.1.4.$index"; - $descr_oid = "1.3.6.1.4.1.10876.2.1.1.1.1.2.$index"; - $limit_oid = "1.3.6.1.4.1.10876.2.1.1.1.1.6.$index"; - $precision_oid = "1.3.6.1.4.1.10876.2.1.1.1.1.9.$index"; - $monitor_oid = "1.3.6.1.4.1.10876.2.1.1.1.1.10.$index"; - $descr = snmp_get($device, $descr_oid, "-Oqv", "SUPERMICRO-HEALTH-MIB"); - $current = snmp_get($device, $fan_oid, "-Oqv", "SUPERMICRO-HEALTH-MIB"); - $limit = snmp_get($device, $limit_oid, "-Oqv", "SUPERMICRO-HEALTH-MIB"); -# $precision = snmp_get($device, $precision_oid, "-Oqv", "SUPERMICRO-HEALTH-MIB"); -# This returns an incorrect precision. At least using the raw value... I think. -TL - $precision = 1; - $monitor = snmp_get($device, $monitor_oid, "-Oqv", "SUPERMICRO-HEALTH-MIB"); - $descr = str_replace(' Fan Speed','',$descr); - $descr = str_replace(' Speed','',$descr); - - if ($monitor == 'true') - { - echo discover_fan($valid_fan,$device, $fan_oid, $index, $type, $descr, $precision, $limit, NULL, $current); - } - } - } - } -} +include_dir("includes/discovery/fanspeeds"); ## Delete removed sensors diff --git a/includes/discovery/fanspeeds/areca.inc.php b/includes/discovery/fanspeeds/areca.inc.php new file mode 100644 index 0000000000..29bc8ad5b3 --- /dev/null +++ b/includes/discovery/fanspeeds/areca.inc.php @@ -0,0 +1,28 @@ + diff --git a/includes/discovery/fanspeeds/lmsensors.inc.php b/includes/discovery/fanspeeds/lmsensors.inc.php new file mode 100644 index 0000000000..d02144d55a --- /dev/null +++ b/includes/discovery/fanspeeds/lmsensors.inc.php @@ -0,0 +1,32 @@ + '0' && $current < '500') { + discover_fan($valid_fan,$device, $oid, $index, $type, $descr, $precision, NULL, NULL, $current); + } + } + } +} + +?> \ No newline at end of file diff --git a/includes/discovery/fanspeeds/supermicro.inc.php b/includes/discovery/fanspeeds/supermicro.inc.php new file mode 100644 index 0000000000..95bb00f9da --- /dev/null +++ b/includes/discovery/fanspeeds/supermicro.inc.php @@ -0,0 +1,47 @@ + diff --git a/includes/discovery/processors/processors-hrdevice.inc.php b/includes/discovery/processors/hrdevice.inc.php similarity index 100% rename from includes/discovery/processors/processors-hrdevice.inc.php rename to includes/discovery/processors/hrdevice.inc.php diff --git a/includes/discovery/processors/processors-ios.inc.php b/includes/discovery/processors/ios.inc.php similarity index 100% rename from includes/discovery/processors/processors-ios.inc.php rename to includes/discovery/processors/ios.inc.php diff --git a/includes/discovery/processors/processors-ironware.inc.php b/includes/discovery/processors/ironware.inc.php similarity index 100% rename from includes/discovery/processors/processors-ironware.inc.php rename to includes/discovery/processors/ironware.inc.php diff --git a/includes/discovery/processors/processors-junos.inc.php b/includes/discovery/processors/junos.inc.php similarity index 100% rename from includes/discovery/processors/processors-junos.inc.php rename to includes/discovery/processors/junos.inc.php diff --git a/includes/discovery/processors/processors-junose.inc.php b/includes/discovery/processors/junose.inc.php similarity index 100% rename from includes/discovery/processors/processors-junose.inc.php rename to includes/discovery/processors/junose.inc.php diff --git a/includes/discovery/temperatures.inc.php b/includes/discovery/temperatures.inc.php index 4859605070..394a739e36 100755 --- a/includes/discovery/temperatures.inc.php +++ b/includes/discovery/temperatures.inc.php @@ -1,9 +1,4 @@