basic discovery only of voltages and fanspeeds, on supermicro superodoctor boxes only for now

git-svn-id: http://www.observium.org/svn/observer/trunk@800 61d68cd4-352d-0410-923a-c4978735b2b8
This commit is contained in:
Tom Laermans 2010-02-09 23:19:14 +00:00
parent f745c416a1
commit 9b10924eec
4 changed files with 251 additions and 1 deletions

View File

@ -76,3 +76,25 @@ UPDATE temperature SET temp_precision=10 WHERE temp_tenths=1;
ALTER TABLE `temperature` DROP `temp_tenths`;
CREATE TABLE IF NOT EXISTS `dbSchema` ( `revision` int(11) NOT NULL default '0', PRIMARY KEY (`revision`)) ENGINE=MyISAM DEFAULT CHARSET=latin1;
ALTER TABLE `storage` ADD `storage_perc_warn` INT(11) NULL DEFAULT '60';
CREATE TABLE `voltage` (
`volt_id` int(11) NOT NULL auto_increment,
`volt_host` int(11) NOT NULL default '0',
`volt_oid` varchar(64) NOT NULL,
`volt_descr` varchar(32) NOT NULL default '',
`volt_precision` int(11) NOT NULL default '1',
`volt_current` int(11) NOT NULL default '0',
`volt_limit` int(11) NOT NULL default '60',
PRIMARY KEY (`volt_id`),
KEY `volt_host` (`volt_host`)
) ENGINE=InnoDB DEFAULT CHARSET=latin1;
CREATE TABLE `fanspeed` (
`fan_id` int(11) NOT NULL auto_increment,
`fan_host` int(11) NOT NULL default '0',
`fan_oid` varchar(64) NOT NULL,
`fan_descr` varchar(32) NOT NULL default '',
`fan_precision` int(11) NOT NULL default '1',
`fan_current` int(11) NOT NULL default '0',
`fan_limit` int(11) NOT NULL default '60',
PRIMARY KEY (`fan_id`),
KEY `fan_host` (`fan_host`)
) ENGINE=InnoDB DEFAULT CHARSET=latin1;

View File

@ -98,8 +98,10 @@ foreach ($devices as $device)
## Discovery IPv6 Addresses
include("includes/discovery/ipv6-addresses.php");
## Discover Temperatures
## Discover Temperatures/Voltages/Fanspeeds
include("includes/discovery/temperatures.php");
include("includes/discovery/voltages.php");
include("includes/discovery/fanspeeds.php");
## Discover Storage
include("includes/discovery/storage.php");

View File

@ -0,0 +1,114 @@
<?php
$id = $device['device_id'];
$hostname = $device['hostname'];
$community = $device['community'];
$snmpver = $device['snmpver'];
$port = $device['port'];
echo("Fanspeeds : ");
## LMSensors Fanspeeds
/*
if ($device['os'] == "linux")
{
$oids = shell_exec($config['snmpwalk'] . " -m LM-SENSORS-MIB -$snmpver -CI -Osqn -c $community $hostname:$port lmTempSensorsDevice");
if ($debug) { echo($oids."\n"); }
$oids = trim($oids);
if ($oids) echo("LM-SENSORS ");
foreach(explode("\n", $oids) as $data)
{
$data = trim($data);
if ($data)
{
list($oid,$descr) = explode(" ", $data,2);
$split_oid = explode('.',$oid);
$fan_id = $split_oid[count($split_oid)-1];
$fan_oid = "1.3.6.1.4.1.2021.13.16.2.1.3.$fan_id";
$fan = trim(shell_exec($config['snmpget'] . " -m LM-SENSORS-MIB -O qv -$snmpver -c $community $hostname:$port $fan_oid")) / 1000;
$descr = str_ireplace("temp-", "", $descr);
$descr = trim($descr);
if (mysql_result(mysql_query("SELECT count(fan_id) FROM `fanspeed` WHERE fan_oid = '$fan_oid' AND fan_host = '$id'"),0) == '0')
{
$query = "INSERT INTO fanspeed (`fan_host`, `fan_oid`, `fan_descr`, `fan_precision`, `fan_limit`, `fan_current`) values ('$id', '$fan_oid', '$descr',1000, " . ($config['defaults']['fan_limit'] ? $config['defaults']['fan_limit'] : '60') . ", '$fan')";
mysql_query($query);
echo("+");
}
elseif (mysql_result(mysql_query("SELECT `fan_descr` FROM fanspeed WHERE `fan_host` = '$id' AND `fan_oid` = '$fan_oid'"), 0) != $descr)
{
echo("U");
mysql_query("UPDATE fanspeed SET `fan_descr` = '$descr' WHERE `fan_host` = '$id' AND `fan_oid` = '$fan_oid'");
}
else
{
echo(".");
}
$fan_exists[] = "$id $fan_oid";
}
}
}
*/
## Supermicro Fanspeeds
if ($device['os'] == "linux")
{
$oids = shell_exec($config['snmpwalk'] . " -m SUPERMICRO-HEALTH-MIB -$snmpver -CI -Osqn -c $community $hostname:$port 1.3.6.1.4.1.10876.2.1.1.1.1.3 | sed s/1.3.6.1.4.1.10876.2.1.1.1.1.3.//g");
$oids = trim($oids);
if ($oids) echo("Supermicro ");
foreach(explode("\n", $oids) as $data)
{
$data = trim($data);
if ($data)
{
list($oid,$type) = explode(" ", $data);
if ($type == 0)
{
$fan_oid = "1.3.6.1.4.1.10876.2.1.1.1.1.4$oid";
$descr_oid = "1.3.6.1.4.1.10876.2.1.1.1.1.2$oid";
$limit_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"));
$fan = trim(shell_exec($config['snmpget'] . " -m SUPERMICRO-HEALTH-MIB -O qv -$snmpver -c $community $hostname:$port $fan_oid"));
$limit = trim(shell_exec($config['snmpget'] . " -m SUPERMICRO-HEALTH-MIB -O qv -$snmpver -c $community $hostname:$port $limit_oid"));
$descr = str_ireplace("Speed", "", $descr);
$descr = trim($descr);
if (mysql_result(mysql_query("SELECT count(fan_id) FROM `fanspeed` WHERE fan_oid = '$fan_oid' AND fan_host = '$id'"),0) == '0')
{
$query = "INSERT INTO fanspeed (`fan_host`, `fan_oid`, `fan_descr`, `fan_current`, `fan_limit`) values ('$id', '$fan_oid', '$descr', '$fan', '$limit')";
mysql_query($query);
echo("+");
}
else
{
echo(".");
}
$fan_exists[] = "$id $fan_oid";
}
}
}
}
## Delete removed sensors
$sql = "SELECT * FROM fanspeed AS V, devices AS D WHERE V.fan_host = D.device_id AND D.device_id = '".$device['device_id']."'";
$query = mysql_query($sql);
while ($sensor = mysql_fetch_array($query))
{
unset($exists);
$i = 0;
while ($i < count($fan_exists) && !$exists)
{
$thisfan = $sensor['fan_host'] . " " . $sensor['fan_oid'];
if ($fan_exists[$i] == $thisfan) { $exists = 1; }
$i++;
}
if (!$exists)
{
echo("-");
mysql_query("DELETE FROM fanspeed WHERE fan_id = '" . $sensor['fan_id'] . "'");
}
}
unset($fan_exists); echo("\n");
?>

112
includes/discovery/voltages.php Executable file
View File

@ -0,0 +1,112 @@
<?php
$id = $device['device_id'];
$hostname = $device['hostname'];
$community = $device['community'];
$snmpver = $device['snmpver'];
$port = $device['port'];
echo("Voltages : ");
## LMSensors Voltages
/*
if ($device['os'] == "linux")
{
$oids = shell_exec($config['snmpwalk'] . " -m LM-SENSORS-MIB -$snmpver -CI -Osqn -c $community $hostname:$port lmTempSensorsDevice");
if ($debug) { echo($oids."\n"); }
$oids = trim($oids);
if ($oids) echo("LM-SENSORS ");
foreach(explode("\n", $oids) as $data)
{
$data = trim($data);
if ($data)
{
list($oid,$descr) = explode(" ", $data,2);
$split_oid = explode('.',$oid);
$volt_id = $split_oid[count($split_oid)-1];
$volt_oid = "1.3.6.1.4.1.2021.13.16.2.1.3.$volt_id";
$volt = trim(shell_exec($config['snmpget'] . " -m LM-SENSORS-MIB -O qv -$snmpver -c $community $hostname:$port $volt_oid")) / 1000;
$descr = str_ireplace("temp-", "", $descr);
$descr = trim($descr);
if (mysql_result(mysql_query("SELECT count(volt_id) FROM `voltage` WHERE volt_oid = '$volt_oid' AND volt_host = '$id'"),0) == '0')
{
$query = "INSERT INTO voltage (`volt_host`, `volt_oid`, `volt_descr`, `volt_precision`, `volt_limit`, `volt_current`) values ('$id', '$volt_oid', '$descr',1000, " . ($config['defaults']['volt_limit'] ? $config['defaults']['volt_limit'] : '60') . ", '$volt')";
mysql_query($query);
echo("+");
}
elseif (mysql_result(mysql_query("SELECT `volt_descr` FROM voltage WHERE `volt_host` = '$id' AND `volt_oid` = '$volt_oid'"), 0) != $descr)
{
echo("U");
mysql_query("UPDATE voltage SET `volt_descr` = '$descr' WHERE `volt_host` = '$id' AND `volt_oid` = '$volt_oid'");
}
else
{
echo(".");
}
$volt_exists[] = "$id $volt_oid";
}
}
}
*/
## Supermicro Voltages
if ($device['os'] == "linux")
{
$oids = shell_exec($config['snmpwalk'] . " -m SUPERMICRO-HEALTH-MIB -$snmpver -CI -Osqn -c $community $hostname:$port 1.3.6.1.4.1.10876.2.1.1.1.1.3 | sed s/1.3.6.1.4.1.10876.2.1.1.1.1.3.//g");
$oids = trim($oids);
if ($oids) echo("Supermicro ");
foreach(explode("\n", $oids) as $data)
{
$data = trim($data);
if ($data)
{
list($oid,$type) = explode(" ", $data);
if ($type == 1)
{
$volt_oid = "1.3.6.1.4.1.10876.2.1.1.1.1.4$oid";
$descr_oid = "1.3.6.1.4.1.10876.2.1.1.1.1.2$oid";
$descr = trim(shell_exec($config['snmpget'] . " -m SUPERMICRO-HEALTH-MIB -O qv -$snmpver -c $community $hostname:$port $descr_oid"));
$volt = trim(shell_exec($config['snmpget'] . " -m SUPERMICRO-HEALTH-MIB -O qv -$snmpver -c $community $hostname:$port $volt_oid"));
$descr = str_ireplace("Voltage", "", $descr);
$descr = trim($descr);
if (mysql_result(mysql_query("SELECT count(volt_id) FROM `voltage` WHERE volt_oid = '$volt_oid' AND volt_host = '$id'"),0) == '0')
{
$query = "INSERT INTO voltage (`volt_host`, `volt_oid`, `volt_descr`, `volt_current`, `volt_limit`) values ('$id', '$volt_oid', '$descr', '$volt', '-1')";
mysql_query($query);
echo("+");
}
else
{
echo(".");
}
$volt_exists[] = "$id $volt_oid";
}
}
}
}
## Delete removed sensors
$sql = "SELECT * FROM voltage AS V, devices AS D WHERE V.volt_host = D.device_id AND D.device_id = '".$device['device_id']."'";
$query = mysql_query($sql);
while ($sensor = mysql_fetch_array($query))
{
unset($exists);
$i = 0;
while ($i < count($volt_exists) && !$exists)
{
$thisvolt = $sensor['volt_host'] . " " . $sensor['volt_oid'];
if ($volt_exists[$i] == $thisvolt) { $exists = 1; }
$i++;
}
if (!$exists)
{
echo("-");
mysql_query("DELETE FROM voltage WHERE volt_id = '" . $sensor['volt_id'] . "'");
}
}
unset($volt_exists); echo("\n");
?>