fixed temperature graphing with unusual characters and added 3750 stackwise interfaces to ignored list (thanks Dario Calami)

git-svn-id: http://www.observium.org/svn/observer/trunk@377 61d68cd4-352d-0410-923a-c4978735b2b8
This commit is contained in:
Adam Amstrong
2009-03-24 16:18:02 +00:00
parent 999e2fb131
commit 554cdb8479
3 changed files with 9 additions and 6 deletions

2
README
View File

@@ -30,6 +30,8 @@ Please see http://www.observernms.org.
Changelog
---------
Added Pseudowire menu entry and configuration option
Release 0.5.0 ( 24 March 2009 )
Cleaned up a lot of hardcoded paths

View File

@@ -88,8 +88,8 @@ $config['syslog_age'] = "1 month"; ## Time to keep syslog for in
### Interface name strings to ignore
$config['bad_if'] = array("null", "virtual-", "unrouted", "eobc", "mpls", "sl0", "lp0", "faith0",
"-atm layer", "-atm subif", "-shdsl", "-adsl", "-aal5", "-atm",
"async", "plip", "-physical", "-signalling", "control plane",
"-atm layer", "-atm subif", "-shdsl", "-adsl", "-aal5", "-atm", "stackport",
"async", "plip", "-physical", "-signalling", "control plane", "stacksub",
"bri", "-bearer", "ng", "bluetooth", "isatap", "ras", "qos", "miniport");
### Mountpoints to ignore

View File

@@ -75,12 +75,13 @@ function temp_graph ($temp, $graph, $from, $to, $width, $height, $title, $vertic
$temperature['temp_descr_fixed'] = str_pad($temperature['temp_descr'], 28);
$temperature['temp_descr_fixed'] = substr($temperature['temp_descr_fixed'],0,28);
$temprrd = addslashes("rrd/$hostname/temp-" . str_replace("/", "_", str_replace(" ", "_",$temperature['temp_descr'])) . ".rrd");
$temprrd = str_replace(")", "_", $temprrd);
$temprrd = str_replace("(", "_", $temprrd);
$filename = str_replace(")", "_", str_replace("(", "_", str_replace("/", "_", str_replace(" ", "_",$temperature['temp_descr']))));
$temprrd = $config['rrd_dir'] . "/$hostname/temp-" . $filename . ".rrd";
$opts[] = "DEF:temp=$temprrd:temp:AVERAGE";
$opts[] = "CDEF:tempwarm=temp,".$temperature[temp_limit].",GT,temp,UNKN,IF";
$opts[] = "LINE1.5:temp#006600:" . $temperature[temp_descr_fixed];
$opts[] = "LINE1.5:temp#006600:'" . trim($temperature[temp_descr_fixed]) . "'";
$opts[] = "LINE1.5:tempwarm#cc0000";
$opts[] = "GPRINT:temp:LAST:%3.0lf<EFBFBD>C";
$opts[] = "GPRINT:temp:MAX:%3.0lf<EFBFBD>C\\\l";