Major changes to graphing system organisation. Prevent sensors from being discovered in ENTITY-SENSOR-MIB if they've already been detected in CISCO-ENTITY-SENSOR-MIB (they share entPhysicalIndex). Fix ADSL poller. Make popup overlibs prettier as default.

git-svn-id: http://www.observium.org/svn/observer/trunk@1470 61d68cd4-352d-0410-923a-c4978735b2b8
This commit is contained in:
Adam Amstrong
2010-07-24 19:14:41 +00:00
parent 289228a544
commit ada14bd542
125 changed files with 432 additions and 403 deletions

View File

@ -0,0 +1,22 @@
<?php
$scale_min = "0";
include("common.inc.php");
$rrd_options .= " COMMENT:' Last Max\\n'";
$current = mysql_fetch_array(mysql_query("SELECT * FROM sensors WHERE sensor_class='current' AND sensor_id = '".mres($_GET['id'])."'"));
$hostname = mysql_result(mysql_query("SELECT hostname FROM devices WHERE device_id = '" . $current['device_id'] . "'"),0);
$current['sensor_descr_fixed'] = substr(str_pad($current['sensor_descr'], 28),0,28);
$rrd_filename = $config['rrd_dir'] . "/".$hostname."/" . safename("current-" . $current['sensor_descr'] . ".rrd");
$rrd_options .= " DEF:current=$rrd_filename:current:AVERAGE";
$rrd_options .= " LINE1.5:current#cc0000:'" . $current['sensor_descr_fixed']."'";
$rrd_options .= " GPRINT:current:LAST:%3.0lfA";
$rrd_options .= " GPRINT:current:MAX:%3.0lfA\\\\l";
?>

View File

@ -0,0 +1,22 @@
<?php
$scale_min = "0";
include("common.inc.php");
$rrd_options .= " COMMENT:' Last Max\\n'";
$frequency = mysql_fetch_array(mysql_query("SELECT * FROM frequency where freq_id = '".mres($_GET['id'])."'"));
$hostname = mysql_result(mysql_query("SELECT hostname FROM devices WHERE device_id = '" . $frequency['device_id'] . "'"),0);
$frequency['freq_descr_fixed'] = substr(str_pad($frequency['freq_descr'], 28),0,28);
$rrd_filename = $config['rrd_dir'] . "/".$hostname."/" . safename("freq-" . $frequency['freq_descr'] . ".rrd");
$rrd_options .= " DEF:freq=$rrd_filename:freq:AVERAGE";
$rrd_options .= " LINE1.5:freq#cc0000:'" . $frequency['freq_descr_fixed']."'";
$rrd_options .= " GPRINT:freq:LAST:%3.0lfHz";
$rrd_options .= " GPRINT:freq:MAX:%3.0lfHz\\\\l";
?>

View File

@ -0,0 +1,37 @@
<?php
$scale_min = "25";
$scale_max = "40";
include("common.inc.php");
$rrd_options .= " COMMENT:' Last Max\\n'";
$humidity = mysql_fetch_array(mysql_query("SELECT * FROM sensors WHERE sensor_class='humidity' AND sensor_id = '".mres($_GET['id'])."'"));
$hostname = mysql_result(mysql_query("SELECT hostname FROM devices WHERE device_id = '" . $humidity['device_id'] . "'"),0);
$humidity['sensor_descr_fixed'] = substr(str_pad($humidity['sensor_descr'], 28),0,28);
$rrd_filename = $config['rrd_dir'] . "/".$hostname."/" . safename("humidity-" . $humidity['sensor_descr'] . ".rrd");
$rrd_options .= " DEF:humidity=$rrd_filename:humidity:AVERAGE";
$rrd_options .= " DEF:humidity_max=$rrd_filename:humidity:MAX";
$rrd_options .= " DEF:humidity_min=$rrd_filename:humidity:MIN";
$rrd_options .= " CDEF:humiditywarm=humidity_max,".$humidity['sensor_limit'].",GT,humidity,UNKN,IF";
$rrd_options .= " CDEF:humiditycold=humidity_min,20,LT,humidity,UNKN,IF";
$rrd_options .= " AREA:humidity_max#c5c5c5";
$rrd_options .= " AREA:humidity_min#ffffffff";
# $rrd_options .= " AREA:humidity#bbd392";
# $rrd_options .= " AREA:humiditywarm#FFCCCC";
# $rrd_options .= " AREA:humiditycold#CCCCFF";
$rrd_options .= " LINE1:humidity#cc0000:'" . str_replace(':','\:',str_replace('\*','*',quotemeta($humidity['sensor_descr_fixed'])))."'"; # Ugly hack :(
$rrd_options .= " LINE1:humiditywarm#660000";
$rrd_options .= " GPRINT:humidity:LAST:%3.0lf%%";
$rrd_options .= " GPRINT:humidity:MAX:%3.0lf%%\\\\l";
?>

View File

@ -0,0 +1,38 @@
<?php
$scale_min = "25";
$scale_max = "40";
include("common.inc.php");
$rrd_options .= " COMMENT:' Last Min Max\\n'";
$temperature = mysql_fetch_array(mysql_query("SELECT * FROM sensors where sensor_id = '".mres($_GET['id'])."'"));
$hostname = mysql_result(mysql_query("SELECT hostname FROM devices WHERE device_id = '" . $temperature['device_id'] . "'"),0);
$temperature['sensor_descr_fixed'] = substr(str_pad($temperature['sensor_descr'], 28),0,28);
$rrd_filename = $config['rrd_dir'] . "/".$hostname."/" . safename("temp-" . $temperature['sensor_descr'] . ".rrd");
$rrd_options .= " DEF:temp=$rrd_filename:temp:AVERAGE";
$rrd_options .= " DEF:temp_max=$rrd_filename:temp:MAX";
$rrd_options .= " DEF:temp_min=$rrd_filename:temp:MIN";
$rrd_options .= " CDEF:tempwarm=temp_max,".$temperature['sensor_limit'].",GT,temp,UNKN,IF";
$rrd_options .= " CDEF:tempcold=temp_min,20,LT,temp,UNKN,IF";
$rrd_options .= " AREA:temp_max#c5c5c5";
$rrd_options .= " AREA:temp_min#ffffffff";
# $rrd_options .= " AREA:temp#bbd392";
# $rrd_options .= " AREA:tempwarm#FFCCCC";
# $rrd_options .= " AREA:tempcold#CCCCFF";
$rrd_options .= " LINE1:temp#cc0000:'" . str_replace(':','\:',str_replace('\*','*',quotemeta($temperature['sensor_descr_fixed'])))."'"; # Ugly hack :(
$rrd_options .= " LINE1:tempwarm#660000";
$rrd_options .= " GPRINT:temp:LAST:%3.0lfC";
$rrd_options .= " GPRINT:temp:MIN:%3.0lfC";
$rrd_options .= " GPRINT:temp:MAX:%3.0lfC\\\\l";
?>

View File

@ -0,0 +1,31 @@
<?php
$scale_min = "0";
include("common.inc.php");
$rrd_options .= " -A ";
$rrd_options .= " COMMENT:' Last Max\\n'";
$voltage = mysql_fetch_array(mysql_query("SELECT * FROM sensors WHERE sensor_class='voltage' AND sensor_id = '".mres($_GET['id'])."'"));
$hostname = mysql_result(mysql_query("SELECT hostname FROM devices WHERE device_id = '" . $voltage['device_id'] . "'"),0);
$voltage['sensor_descr_fixed'] = substr(str_pad($voltage['sensor_descr'], 22),0,22);
$rrd_filename = $config['rrd_dir'] . "/".$hostname."/" . safename("volt-" . $voltage['sensor_descr'] . ".rrd");
$rrd_options .= " DEF:volt=$rrd_filename:volt:AVERAGE";
$rrd_options .= " DEF:volt_max=$rrd_filename:volt:MAX";
$rrd_options .= " DEF:volt_min=$rrd_filename:volt:MIN";
$rrd_options .= " AREA:volt_max#c5c5c5";
$rrd_options .= " AREA:volt_min#ffffffff";
#$rrd_options .= " AREA:volt#FFFF99";
$rrd_options .= " LINE1.5:volt#cc0000:'" . $voltage['sensor_descr_fixed']."'";
$rrd_options .= " GPRINT:volt:LAST:%3.2lfV";
$rrd_options .= " GPRINT:volt:MAX:%3.2lfV\\\\l";
?>