From 9b10924eec99d3073843613b7f6ed8245279e177 Mon Sep 17 00:00:00 2001 From: Tom Laermans Date: Tue, 9 Feb 2010 23:19:14 +0000 Subject: [PATCH] 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 --- database-update.sql | 22 ++++++ discovery.php | 4 +- includes/discovery/fanspeeds.php | 114 +++++++++++++++++++++++++++++++ includes/discovery/voltages.php | 112 ++++++++++++++++++++++++++++++ 4 files changed, 251 insertions(+), 1 deletion(-) create mode 100644 includes/discovery/fanspeeds.php create mode 100755 includes/discovery/voltages.php diff --git a/database-update.sql b/database-update.sql index 20ab8b4941..feb0263d24 100644 --- a/database-update.sql +++ b/database-update.sql @@ -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; diff --git a/discovery.php b/discovery.php index 6a8906adfb..324d77a60f 100755 --- a/discovery.php +++ b/discovery.php @@ -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"); diff --git a/includes/discovery/fanspeeds.php b/includes/discovery/fanspeeds.php new file mode 100644 index 0000000000..86f379a3df --- /dev/null +++ b/includes/discovery/fanspeeds.php @@ -0,0 +1,114 @@ + diff --git a/includes/discovery/voltages.php b/includes/discovery/voltages.php new file mode 100755 index 0000000000..f0769f0280 --- /dev/null +++ b/includes/discovery/voltages.php @@ -0,0 +1,112 @@ +