pretty up frequency/current/fanspeed graphs, add Dell multifunction laserprinter detection (PRINTERS, WE LOVE THEM)

git-svn-id: http://www.observium.org/svn/observer/trunk@1236 61d68cd4-352d-0410-923a-c4978735b2b8
This commit is contained in:
Tom Laermans
2010-06-21 16:41:32 +00:00
parent 6213e164ab
commit 8fb5408f97
4 changed files with 1 additions and 3 deletions

View File

@@ -15,7 +15,6 @@ include("common.inc.php");
$rrd_filename = $config['rrd_dir'] . "/".$hostname."/" . safename("current-" . $current['current_descr'] . ".rrd");
$rrd_options .= " DEF:current=$rrd_filename:current:AVERAGE";
$rrd_options .= " AREA:current#FFFF99";
$rrd_options .= " LINE1.5:current#cc0000:'" . $current['current_descr_fixed']."'";
$rrd_options .= " GPRINT:current:LAST:%3.0lfA";
$rrd_options .= " GPRINT:current:MAX:%3.0lfA\\\\l";

View File

@@ -15,7 +15,6 @@ include("common.inc.php");
$rrd_filename = $config['rrd_dir'] . "/".$hostname."/" . safename("fan-" . $fanspeed['fan_descr'] . ".rrd");
$rrd_options .= " DEF:fan=$rrd_filename:fan:AVERAGE";
$rrd_options .= " AREA:fan#FFFF99";
$rrd_options .= " LINE1.5:fan#cc0000:'" . str_replace(':','\:',str_replace('\*','*',quotemeta($fanspeed['fan_descr_fixed'])))."'"; # Ugly hack :(
$rrd_options .= " GPRINT:fan:LAST:%3.0lfrpm";
$rrd_options .= " GPRINT:fan:MAX:%3.0lfrpm\\\\l";

View File

@@ -15,7 +15,6 @@ include("common.inc.php");
$rrd_filename = $config['rrd_dir'] . "/".$hostname."/" . safename("freq-" . $frequency['freq_descr'] . ".rrd");
$rrd_options .= " DEF:freq=$rrd_filename:freq:AVERAGE";
$rrd_options .= " AREA:freq#FFFF99";
$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

@@ -4,6 +4,7 @@ if(!$os) {
if(strstr($sysDescr, "Dell Color Laser")) { $os = "dell-laser"; }
elseif(strstr($sysDescr, "Dell Laser Printer")) { $os = "dell-laser"; }
elseif(preg_match("/^Dell.*MFP/", $sysDescr)) { $os = "dell-laser"; }
}