nicolas/librenms
1
0
Fork 0
mirror of https://github.com/stylersnico/librenms.git synced 2026-08-02 00:32:09 +02:00
Code Issues Packages Projects Releases Wiki Activity

move divider for voltages into discovery

Browse Source 
git-svn-id: http://www.observium.org/svn/observer/trunk@807 61d68cd4-352d-0410-923a-c4978735b2b8
This commit is contained in:
Tom Laermans
2010-02-10 15:32:59 +00:00
parent 17b264cdfd
commit bf92c792f6
3 changed files with 9 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
database-update.sql
+3
View File
@@ -99,3 +99,6 @@ CREATE TABLE `fanspeed` (
KEY `fan_host` (`fan_host`) KEY `fan_host` (`fan_host`)
) ENGINE=InnoDB DEFAULT CHARSET=latin1; ) ENGINE=InnoDB DEFAULT CHARSET=latin1;
ALTER TABLE `voltage` ADD `volt_limit_low` int(11) NULL DEFAULT NULL AFTER `volt_limit`; ALTER TABLE `voltage` ADD `volt_limit_low` int(11) NULL DEFAULT NULL AFTER `volt_limit`;
ALTER TABLE `voltage` CHANGE `volt_current` `volt_current` FLOAT(3) NULL DEFAULT NULL;
ALTER TABLE `voltage` CHANGE `volt_limit` `volt_limit` FLOAT(3) NULL DEFAULT NULL;
ALTER TABLE `voltage` CHANGE `volt_limit_low` `volt_limit_low` FLOAT(3) NULL DEFAULT NULL;
includes/discovery/voltages.php
+5 -5
View File
@@ -67,11 +67,11 @@ if ($device['os'] == "linux")
$monitor_oid = "1.3.6.1.4.1.10876.2.1.1.1.1.10$oid"; $monitor_oid = "1.3.6.1.4.1.10876.2.1.1.1.1.10$oid";
$limit_oid = "1.3.6.1.4.1.10876.2.1.1.1.1.5$oid"; $limit_oid = "1.3.6.1.4.1.10876.2.1.1.1.1.5$oid";
$lowlimit_oid = "1.3.6.1.4.1.10876.2.1.1.1.1.6$oid"; $lowlimit_oid = "1.3.6.1.4.1.10876.2.1.1.1.1.6$oid";
$descr = trim(shell_exec($config['snmpget'] . " -m SUPERMICRO-HEALTH-MIB -O qv -$snmpver -c $community $hostname:$port $descr_oid")); $descr = trim(shell_exec($config['snmpget'] . " -m SUPERMICRO-HEALTH-MIB -O qv -$snmpver -c $community $hostname:$port $descr_oid")) / 1000;
$volt = trim(shell_exec($config['snmpget'] . " -m SUPERMICRO-HEALTH-MIB -O qv -$snmpver -c $community $hostname:$port $volt_oid")); $volt = trim(shell_exec($config['snmpget'] . " -m SUPERMICRO-HEALTH-MIB -O qv -$snmpver -c $community $hostname:$port $volt_oid")) / 1000;
$monitor = trim(shell_exec($config['snmpget'] . " -m SUPERMICRO-HEALTH-MIB -O qv -$snmpver -c $community $hostname:$port $monitor_oid")); $monitor = trim(shell_exec($config['snmpget'] . " -m SUPERMICRO-HEALTH-MIB -O qv -$snmpver -c $community $hostname:$port $monitor_oid")) / 1000;
$limit = trim(shell_exec($config['snmpget'] . " -m SUPERMICRO-HEALTH-MIB -O qv -$snmpver -c $community $hostname:$port $limit_oid")); $limit = trim(shell_exec($config['snmpget'] . " -m SUPERMICRO-HEALTH-MIB -O qv -$snmpver -c $community $hostname:$port $limit_oid")) / 1000;
$lowlimit = trim(shell_exec($config['snmpget'] . " -m SUPERMICRO-HEALTH-MIB -O qv -$snmpver -c $community $hostname:$port $lowlimit_oid")); $lowlimit = trim(shell_exec($config['snmpget'] . " -m SUPERMICRO-HEALTH-MIB -O qv -$snmpver -c $community $hostname:$port $lowlimit_oid")) / 1000;
if ($monitor == 'true') if ($monitor == 'true')
{ {
$descr = trim(str_ireplace("Voltage", "", $descr)); $descr = trim(str_ireplace("Voltage", "", $descr));
includes/polling/voltages.inc.php
+1 -2
View File
@@ -8,11 +8,10 @@ while($voltage = mysql_fetch_array($volt_data)) {
$volt_cmd = $config['snmpget'] . " -m SNMPv2-MIB -O Uqnv -" . $device['snmpver'] . " -c " . $device['community'] . " " . $device['hostname'].":".$device['port'] . " " . $voltage['volt_oid'] . "|grep -v \"No Such Instance\""; $volt_cmd = $config['snmpget'] . " -m SNMPv2-MIB -O Uqnv -" . $device['snmpver'] . " -c " . $device['community'] . " " . $device['hostname'].":".$device['port'] . " " . $voltage['volt_oid'] . "|grep -v \"No Such Instance\"";
$volt = trim(str_replace("\"", "", shell_exec($volt_cmd))); $volt = trim(str_replace("\"", "", shell_exec($volt_cmd)));
if ($voltage['volt_precision']) if ($voltage['volt_precision'])
{ {
$volt = $volt / $voltage['volt_precision']; $volt = $volt / $voltage['volt_precision'];
$voltage['volt_limit'] = $voltage['volt_limit'] / $voltage['volt_precision'];
$voltage['volt_limit_low'] = $voltage['volt_limit_low'] / $voltage['volt_precision'];
} }
$voltrrd = $config['rrd_dir'] . "/" . $device['hostname'] . "/" . safename("volt-" . $voltage['volt_descr'] . ".rrd"); $voltrrd = $config['rrd_dir'] . "/" . $device['hostname'] . "/" . safename("volt-" . $voltage['volt_descr'] . ".rrd");