From 52933eeb0d191c53041b96ad34f472a2406e00bd Mon Sep 17 00:00:00 2001 From: Tom Laermans Date: Fri, 4 Jun 2010 09:09:19 +0000 Subject: [PATCH] argh, clean up fucked up patches, add galaxy pw autodiscovery to mgeups git-svn-id: http://www.observium.org/svn/observer/trunk@1098 61d68cd4-352d-0410-923a-c4978735b2b8 --- includes/discovery/frequencies.inc.php | 101 ----------------------- includes/discovery/ups.inc.php | 20 ----- includes/osdiscovery/discover-mgeups.php | 19 +---- includes/polling/frequencies.inc.php | 55 ------------ 4 files changed, 1 insertion(+), 194 deletions(-) diff --git a/includes/discovery/frequencies.inc.php b/includes/discovery/frequencies.inc.php index a2788020bb..a594e85ec5 100644 --- a/includes/discovery/frequencies.inc.php +++ b/includes/discovery/frequencies.inc.php @@ -77,107 +77,6 @@ if ($device['os'] == "mgeups") } -## Delete removed sensors - -if($debug) { print_r($freq_exists); } - -$sql = "SELECT * FROM frequency WHERE device_id = '".$device['device_id']."'"; -if ($query = mysql_query($sql)) -{ - while ($test_freq = mysql_fetch_array($query)) - { - $index = $test_freq['freq_index']; - $type = $test_freq['freq_type']; - if($debug) { echo("$type -> $index\n"); } - if(!$freq_exists[$type][$index]) { - echo("-"); - mysql_query("DELETE FROM `frequency` WHERE freq_id = '" . $test_freq['freq_id'] . "'"); - } - } -} - -unset($fan_exists); echo("\n"); - -?> - 1) $descr .= " Phase $i"; - $current = snmp_get($device, $freq_oid, "-Oqv") / 10; - $type = "mge-ups"; - $precision = 10; - $index = $i; - if ($current > 55 && $current < 65) - { - #FIXME Are these sensible values? - $lowlimit = 58; - $limit = 62; - } - else if ($current > 45 && $current < 55) - { - #FIXME Are these sensible values? - $lowlimit = 48; - $limit = 52; - } - else - { - $lowlimit = 0; - $limit = 0; - } - echo discover_freq($device, $freq_oid, $index, $type, $descr, $precision, $lowlimit, $limit, $current); - $freq_exists[$type][$index] = 1; - } - $oids = trim(snmp_walk($device, "1.3.6.1.4.1.705.1.6.1", "-OsqnU")); - if ($debug) { echo($oids."\n"); } - list($unused,$numPhase) = explode(' ',$oids); - for($i = 1; $i <= $numPhase;$i++) - { - $freq_oid = ".1.3.6.1.4.1.705.1.6.2.1.3.$i.0"; - $descr = "Input"; if ($numPhase > 1) $descr .= " Phase $i"; - $current = snmp_get($device, $freq_oid, "-Oqv") / 10; - $type = "mge-ups"; - $precision = 10; - $index = 100+$i; - if ($current > 55 && $current < 65) - { - #FIXME Are these sensible values? - $lowlimit = 58; - $limit = 62; - } - else if ($current > 45 && $current < 55) - { - #FIXME Are these sensible values? - $lowlimit = 48; - $limit = 52; - } - else - { - $lowlimit = 0; - $limit = 0; - } - echo discover_freq($device, $freq_oid, $index, $type, $descr, $precision, $lowlimit, $limit, $current); - $freq_exists[$type][$index] = 1; - } -} - - ## Delete removed sensors if($debug) { print_r($freq_exists); } diff --git a/includes/discovery/ups.inc.php b/includes/discovery/ups.inc.php index 2e08a7cc70..e55befb6ea 100644 --- a/includes/discovery/ups.inc.php +++ b/includes/discovery/ups.inc.php @@ -8,23 +8,3 @@ $port = $device['port']; echo("UPS : "); ?> - - diff --git a/includes/osdiscovery/discover-mgeups.php b/includes/osdiscovery/discover-mgeups.php index 6c12daf081..52a7dcdb23 100644 --- a/includes/osdiscovery/discover-mgeups.php +++ b/includes/osdiscovery/discover-mgeups.php @@ -3,24 +3,7 @@ if(!$os) { if(strstr($sysDescr, "Pulsar M")) { $os = "mgeups"; } - -} - -?> - - - $frequency['freq_limit_low'] && $freq <= $frequency['freq_limit_low']) - { - if($device['sysContact']) { $email = $device['sysContact']; } else { $email = $config['email_default']; } - $msg = "Frequency Alarm: " . $device['hostname'] . " " . $frequency['freq_descr'] . " is " . $freq . "Hz (Limit " . $frequency['freq_limit']; - $msg .= "Hz) at " . date($config['timestamp_format']); - mail($email, "Frequency Alarm: " . $device['hostname'] . " " . $frequency['freq_descr'], $msg, $config['email_headers']); - echo("Alerting for " . $device['hostname'] . " " . $frequency['freq_descr'] . "\n"); - eventlog('Frequency ' . $frequency['freq_descr'] . " under threshold: " . $frequency['freq_current'] . " Hz (> " . $frequency['freq_limit'] . " Hz)", $device['device_id']); - } - else if($frequency['freq_current'] < $frequency['freq_limit'] && $freq >= $frequency['freq_limit']) - { - if($device['sysContact']) { $email = $device['sysContact']; } else { $email = $config['email_default']; } - $msg = "Frequency Alarm: " . $device['hostname'] . " " . $frequency['freq_descr'] . " is " . $freq . "Hz (Limit " . $frequency['freq_limit']; - $msg .= "Hz) at " . date($config['timestamp_format']); - mail($email, "Frequency Alarm: " . $device['hostname'] . " " . $frequency['freq_descr'], $msg, $config['email_headers']); - echo("Alerting for " . $device['hostname'] . " " . $frequency['freq_descr'] . "\n"); - eventlog('Frequency ' . $frequency['freq_descr'] . " above threshold: " . $frequency['freq_current'] . " Hz (< " . $frequency['freq_limit'] . " Hz)", $device['device_id']); - } - - mysql_query("UPDATE frequency SET freq_current = '$freq' WHERE freq_id = '" . $frequency['freq_id'] . "'"); -} - -?>