From 6fdf9159d5299ec5ca63ddae5cda497b2f6e4044 Mon Sep 17 00:00:00 2001 From: Tom Laermans Date: Thu, 21 Apr 2011 10:39:42 +0000 Subject: [PATCH] fix frequency discovery git-svn-id: http://www.observium.org/svn/observer/trunk@2123 61d68cd4-352d-0410-923a-c4978735b2b8 --- includes/discovery/frequencies.inc.php | 4 ++-- includes/discovery/frequencies/apc.inc.php | 8 ++++---- includes/discovery/frequencies/ipoman.inc.php | 2 +- includes/discovery/frequencies/mgeups.inc.php | 4 ++-- includes/discovery/frequencies/netvision.inc.php | 4 ++-- includes/discovery/frequencies/rfc1628.inc.php | 6 +++--- includes/discovery/frequencies/xups.inc.php | 6 +++--- 7 files changed, 17 insertions(+), 17 deletions(-) diff --git a/includes/discovery/frequencies.inc.php b/includes/discovery/frequencies.inc.php index 0e3363e83..fd409d625 100644 --- a/includes/discovery/frequencies.inc.php +++ b/includes/discovery/frequencies.inc.php @@ -3,9 +3,9 @@ echo("Frequencies: "); include_dir("includes/discovery/frequencies"); -if ($debug) { print_r($valid['freq']); } +if ($debug) { print_r($valid['frequency']); } -check_valid_sensors($device, 'freq', $valid_sensor); +check_valid_sensors($device, 'frequency', $valid_sensor); echo("\n"); diff --git a/includes/discovery/frequencies/apc.inc.php b/includes/discovery/frequencies/apc.inc.php index 71a25b257..3a0e53efa 100644 --- a/includes/discovery/frequencies/apc.inc.php +++ b/includes/discovery/frequencies/apc.inc.php @@ -20,7 +20,7 @@ if ($device['os'] == "apc") $index = $split_oid[count($split_oid)-1]; $oid = "1.3.6.1.4.1.318.1.1.8.5.3.2.1.4." . $index; $descr = "Input Feed " . chr(64+$index); - discover_sensor($valid_sensor, 'freq', $device, $oid, "3.2.1.4.$index", $type, $descr, $divisor, '1', NULL, NULL, NULL, NULL, $current); + discover_sensor($valid_sensor, 'frequency', $device, $oid, "3.2.1.4.$index", $type, $descr, $divisor, '1', NULL, NULL, NULL, NULL, $current); } } @@ -39,7 +39,7 @@ if ($device['os'] == "apc") $index = $split_oid[count($split_oid)-3]; $oid = "1.3.6.1.4.1.318.1.1.8.5.4.2.1.4." . $index; $descr = "Output Feed"; if (count(explode("\n", $oids)) > 1) { $descr .= " $index"; } - discover_sensor($valid_sensor, 'freq', $device, $oid, "4.2.1.4.$index", $type, $descr, $divisor, '1', NULL, NULL, NULL, NULL, $current); + discover_sensor($valid_sensor, 'frequency', $device, $oid, "4.2.1.4.$index", $type, $descr, $divisor, '1', NULL, NULL, NULL, NULL, $current); } } @@ -53,7 +53,7 @@ if ($device['os'] == "apc") $type = "apc"; $index = "3.2.4.0"; $descr = "Input"; - discover_sensor($valid_sensor, 'freq', $device, $oid, $index, $type, $descr, $divisor, '1', NULL, NULL, NULL, NULL, $current); + discover_sensor($valid_sensor, 'frequency', $device, $oid, $index, $type, $descr, $divisor, '1', NULL, NULL, NULL, NULL, $current); } $oids = snmp_get($device, "1.3.6.1.4.1.318.1.1.1.4.2.2.0", "-OsqnU", ""); @@ -66,7 +66,7 @@ if ($device['os'] == "apc") $type = "apc"; $index = "4.2.2.0"; $descr = "Output"; - discover_sensor($valid_sensor, 'freq', $device, $oid, $index, $type, $descr, $divisor, '1', NULL, NULL, NULL, NULL, $current); + discover_sensor($valid_sensor, 'frequency', $device, $oid, $index, $type, $descr, $divisor, '1', NULL, NULL, NULL, NULL, $current); } } diff --git a/includes/discovery/frequencies/ipoman.inc.php b/includes/discovery/frequencies/ipoman.inc.php index 07d0f02ee..479699dec 100644 --- a/includes/discovery/frequencies/ipoman.inc.php +++ b/includes/discovery/frequencies/ipoman.inc.php @@ -36,7 +36,7 @@ if ($device['os'] == "ipoman") $current = $entry['inletStatusFrequency'] / 10; $low_limit = $entry['inletConfigFrequencyLow']; $high_limit = $entry['inletConfigFrequencyHigh']; - discover_sensor($valid_sensor, 'freq', $device, $freq_oid, $index, 'ipoman', $descr, $divisor, '1', $low_limit, NULL, NULL, $high_limit, $current); + discover_sensor($valid_sensor, 'frequency', $device, $freq_oid, $index, 'ipoman', $descr, $divisor, '1', $low_limit, NULL, NULL, $high_limit, $current); # FIXME: iPoMan 1201 also says it has 2 inlets, at least until firmware 1.06 - wtf? } } diff --git a/includes/discovery/frequencies/mgeups.inc.php b/includes/discovery/frequencies/mgeups.inc.php index e10d46e09..8604f5a17 100644 --- a/includes/discovery/frequencies/mgeups.inc.php +++ b/includes/discovery/frequencies/mgeups.inc.php @@ -23,7 +23,7 @@ if ($device['os'] == "mgeups") $type = "mge-ups"; $divisor = 10; $index = $i; - discover_sensor($valid_sensor, 'freq', $device, $freq_oid, $index, $type, $descr, $divisor, '1', NULL, NULL, NULL, NULL, $current); + discover_sensor($valid_sensor, 'frequency', $device, $freq_oid, $index, $type, $descr, $divisor, '1', NULL, NULL, NULL, NULL, $current); } $oids = trim(snmp_walk($device, "1.3.6.1.4.1.705.1.6.1", "-OsqnU")); if ($debug) { echo($oids."\n"); } @@ -42,7 +42,7 @@ if ($device['os'] == "mgeups") $type = "mge-ups"; $divisor = 10; $index = 100+$i; - discover_sensor($valid_sensor, 'freq', $device, $freq_oid, $index, $type, $descr, $divisor, '1', NULL, NULL, NULL, NULL, $current); + discover_sensor($valid_sensor, 'frequency', $device, $freq_oid, $index, $type, $descr, $divisor, '1', NULL, NULL, NULL, NULL, $current); } } diff --git a/includes/discovery/frequencies/netvision.inc.php b/includes/discovery/frequencies/netvision.inc.php index 8f2fc19f7..9617392bb 100644 --- a/includes/discovery/frequencies/netvision.inc.php +++ b/includes/discovery/frequencies/netvision.inc.php @@ -10,7 +10,7 @@ if ($device['os'] == "netvision") $type = "netvision"; $divisor = 10; $index = '3.2.0'; - discover_sensor($valid_sensor, 'freq', $device, $freq_oid, $index, $type, $descr, $divisor, '1', NULL, NULL, NULL, NULL, $current); + discover_sensor($valid_sensor, 'frequency', $device, $freq_oid, $index, $type, $descr, $divisor, '1', NULL, NULL, NULL, NULL, $current); $freq_oid = "1.3.6.1.4.1.4555.1.1.1.1.4.2.0"; $descr = "Output"; @@ -18,7 +18,7 @@ if ($device['os'] == "netvision") $type = "netvision"; $divisor = 10; $index = '4.2.0'; - discover_sensor($valid_sensor, 'freq', $device, $freq_oid, $index, $type, $descr, $divisor, '1', NULL, NULL, NULL, NULL, $current); + discover_sensor($valid_sensor, 'frequency', $device, $freq_oid, $index, $type, $descr, $divisor, '1', NULL, NULL, NULL, NULL, $current); } ?> \ No newline at end of file diff --git a/includes/discovery/frequencies/rfc1628.inc.php b/includes/discovery/frequencies/rfc1628.inc.php index c93969710..d5c3df3dd 100644 --- a/includes/discovery/frequencies/rfc1628.inc.php +++ b/includes/discovery/frequencies/rfc1628.inc.php @@ -18,7 +18,7 @@ if ($device['os'] == "netmanplus" || $device['os'] == "deltaups" || $device['os' $type = "rfc1628"; $divisor = 10; $index = '3.2.0.'.$i; - discover_sensor($valid_sensor, 'freq', $device, $freq_oid, $index, $type, $descr, $divisor, '1', NULL, NULL, NULL, NULL, $current); + discover_sensor($valid_sensor, 'frequency', $device, $freq_oid, $index, $type, $descr, $divisor, '1', NULL, NULL, NULL, NULL, $current); } $freq_oid = "1.3.6.1.2.1.33.1.4.2.0"; @@ -27,7 +27,7 @@ if ($device['os'] == "netmanplus" || $device['os'] == "deltaups" || $device['os' $type = "rfc1628"; $divisor = 10; $index = '4.2.0'; - discover_sensor($valid_sensor, 'freq', $device, $freq_oid, $index, $type, $descr, $divisor, '1', NULL, NULL, NULL, NULL, $current); + discover_sensor($valid_sensor, 'frequency', $device, $freq_oid, $index, $type, $descr, $divisor, '1', NULL, NULL, NULL, NULL, $current); $freq_oid = "1.3.6.1.2.1.33.1.5.1.0"; $descr = "Bypass"; @@ -35,7 +35,7 @@ if ($device['os'] == "netmanplus" || $device['os'] == "deltaups" || $device['os' $type = "rfc1628"; $divisor = 10; $index = '5.1.0'; - discover_sensor($valid_sensor, 'freq', $device, $freq_oid, $index, $type, $descr, $divisor, '1', NULL, NULL, NULL, NULL, $current); + discover_sensor($valid_sensor, 'frequency', $device, $freq_oid, $index, $type, $descr, $divisor, '1', NULL, NULL, NULL, NULL, $current); } ?> diff --git a/includes/discovery/frequencies/xups.inc.php b/includes/discovery/frequencies/xups.inc.php index d2f4008f8..d14c31cfa 100644 --- a/includes/discovery/frequencies/xups.inc.php +++ b/includes/discovery/frequencies/xups.inc.php @@ -16,7 +16,7 @@ if ($device['os'] == "powerware") $current = snmp_get($device, $freq_oid, "-Oqv") / $divisor; $type = "xups"; $index = '3.1.0'; - discover_sensor($valid_sensor, 'freq', $device, $freq_oid, $index, $type, $descr, $divisor, '1', NULL, NULL, NULL, NULL, $current); + discover_sensor($valid_sensor, 'frequency', $device, $freq_oid, $index, $type, $descr, $divisor, '1', NULL, NULL, NULL, NULL, $current); # XUPS-MIB::xupsOutputFrequency.0 = INTEGER: 500 $freq_oid = "1.3.6.1.4.1.534.1.4.2.0"; @@ -25,7 +25,7 @@ if ($device['os'] == "powerware") $current = snmp_get($device, $freq_oid, "-Oqv") / $divisor; $type = "xups"; $index = '4.2.0'; - discover_sensor($valid_sensor, 'freq', $device, $freq_oid, $index, $type, $descr, $divisor, '1', NULL, NULL, NULL, NULL, $current); + discover_sensor($valid_sensor, 'frequency', $device, $freq_oid, $index, $type, $descr, $divisor, '1', NULL, NULL, NULL, NULL, $current); # XUPS-MIB::xupsBypassFrequency.0 = INTEGER: 500 $freq_oid = "1.3.6.1.4.1.534.1.5.1.0"; @@ -38,7 +38,7 @@ if ($device['os'] == "powerware") $current /= $divisor; $type = "xups"; $index = '5.1.0'; - discover_sensor($valid_sensor, 'freq', $device, $freq_oid, $index, $type, $descr, $divisor, '1', NULL, NULL, NULL, NULL, $current); + discover_sensor($valid_sensor, 'frequency', $device, $freq_oid, $index, $type, $descr, $divisor, '1', NULL, NULL, NULL, NULL, $current); } }