nicolas/librenms
1
0
Fork 0
mirror of https://github.com/stylersnico/librenms.git synced 2026-07-12 16:06:25 +02:00
Code Issues Packages Projects Releases Wiki Activity

more fixes to discovery

Browse Source 
git-svn-id: http://www.observium.org/svn/observer/trunk@841 61d68cd4-352d-0410-923a-c4978735b2b8
This commit is contained in:
Adam Amstrong
2010-02-15 01:53:00 +00:00
parent 2491186697
commit 01da6907e5
4 changed files with 9 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
database-update.sql
+2 -1
View File
@@ -88,4 +88,5 @@ ALTER TABLE `temperature` CHANGE `temp_host` `device_id` INT( 11 ) NOT NULL D
ALTER TABLE `fanspeed` CHANGE `fan_host` `device_id` INT( 11 ) NOT NULL DEFAULT '0' ALTER TABLE `fanspeed` CHANGE `fan_host` `device_id` INT( 11 ) NOT NULL DEFAULT '0'
ALTER TABLE `voltage` CHANGE `volt_host` `device_id` INT( 11 ) NOT NULL DEFAULT '0' ALTER TABLE `voltage` CHANGE `volt_host` `device_id` INT( 11 ) NOT NULL DEFAULT '0'
CREATE TABLE IF NOT EXISTS `processors` ( `processor_id` int(11) NOT NULL AUTO_INCREMENT, `entPhysicalIndex` int(11) NOT NULL, `device_id` int(11) NOT NULL, `processor_oid` int(11) NOT NULL, `processor_type` int(11) NOT NULL, `processor_usage` int(11) NOT NULL, `processor_description` varchar(64) NOT NULL, PRIMARY KEY (`processor_id`), KEY `cpuCPU_id` (`processor_id`,`device_id`) ) ENGINE=MyISAM DEFAULT CHARSET=latin1 AUTO_INCREMENT=1 ; CREATE TABLE IF NOT EXISTS `processors` ( `processor_id` int(11) NOT NULL AUTO_INCREMENT, `entPhysicalIndex` int(11) NOT NULL, `device_id` int(11) NOT NULL, `processor_oid` int(11) NOT NULL, `processor_type` int(11) NOT NULL, `processor_usage` int(11) NOT NULL, `processor_description` varchar(64) NOT NULL, PRIMARY KEY (`processor_id`), KEY `cpuCPU_id` (`processor_id`,`device_id`) ) ENGINE=MyISAM DEFAULT CHARSET=latin1 AUTO_INCREMENT=1 ;
ALTER TABLE `processors` ADD `hrDeviceIndex` int(11) NOT NULL AFTER `entPhysicalIndex` ALTER TABLE `processors` ADD `hrDeviceIndex` int(11) NULL AFTER `entPhysicalIndex`
ALTER TABLE `temperature` CHANGE `temp_current` `temp_current` FLOAT( 4 ) NOT NULL DEFAULT '0'
discovery.php
+1
View File
@@ -4,6 +4,7 @@
include("config.php"); include("config.php");
include("includes/functions.php"); include("includes/functions.php");
include("includes/functions-poller.inc.php"); include("includes/functions-poller.inc.php");
include("includes/discovery/functions.inc.php");
$start = utime(); $start = utime();
includes/defaults.inc.php
+5 -2
View File
@@ -68,6 +68,11 @@ $config['allow_entity_sensor']['watts'] = 1;
$config['allow_entity_sensor']['truthvalue'] = 1; $config['allow_entity_sensor']['truthvalue'] = 1;
$config['allow_entity_sensor']['specialEnum'] = 1; $config['allow_entity_sensor']['specialEnum'] = 1;
# Set default alert limits for various sensors and metrics
$config['limit']['fan'] = "1000";
$config['limit']['temp'] = "60";
# Filesystems # Filesystems
$config['ignore_mount'] = array("/kern", "/mnt/cdrom", "/proc"); $config['ignore_mount'] = array("/kern", "/mnt/cdrom", "/proc");
@@ -76,6 +81,4 @@ $config['ignore_mount_regexp'] = array();
$config['ignore_mount_removable'] = 1; # Ignore removable disk storage $config['ignore_mount_removable'] = 1; # Ignore removable disk storage
$config['ignore_mount_network'] = 1; # Ignore network mounted storage $config['ignore_mount_network'] = 1; # Ignore network mounted storage
?> ?>
includes/polling/fanspeeds.inc.php
+1 -1
View File
@@ -14,7 +14,7 @@ while($fanspeed = mysql_fetch_array($fan_data)) {
$fanrrd = $config['rrd_dir'] . "/" . $device['hostname'] . "/" . safename("fan-" . $fanspeed['fan_descr'] . ".rrd"); $fanrrd = $config['rrd_dir'] . "/" . $device['hostname'] . "/" . safename("fan-" . $fanspeed['fan_descr'] . ".rrd");
if (!is_file($fanrrd)) { if (!is_file($fanrrd)) {
`rrdtool create $fanrrd \ `rrdtool create $fanrrd \
--step 300 \ --step 300 \
DS:fan:GAUGE:600:0:20000 \ DS:fan:GAUGE:600:0:20000 \
RRA:AVERAGE:0.5:1:1200 \ RRA:AVERAGE:0.5:1:1200 \