add the ability to run poller without updating rrds. add --rigid to graphs.

git-svn-id: http://www.observium.org/svn/observer/trunk@3124 61d68cd4-352d-0410-923a-c4978735b2b8
This commit is contained in:
Adam Amstrong
2012-05-03 10:45:36 +00:00
parent 7e14405439
commit 62180e6146
5 changed files with 23 additions and 4 deletions

View File

@@ -287,7 +287,7 @@ function truncate($substring, $max = 50, $rep = '...')
}
function mres($string)
{ // short function wrapper because the real one is stupidly long and ugly. aestetics.
{ // short function wrapper because the real one is stupidly long and ugly. aesthetics.
return mysql_real_escape_string($string);
}

View File

@@ -1,5 +1,7 @@
<?php
## FIXME - seems to be broken. IPs appear with leading zeroes.
$ipsec_array = snmpwalk_cache_oid($device, "cipSecTunnelEntry", array(), "CISCO-IPSEC-FLOW-MONITOR-MIB");
$ike_array = snmpwalk_cache_oid($device, "cikeTunnelEntry", array(), "CISCO-IPSEC-FLOW-MONITOR-MIB");

View File

@@ -162,7 +162,12 @@ function rrdtool($command, $filename, $options)
$cmd .= " --daemon " . $config['rrdcached'];
}
fwrite($rrd_pipes[0], $cmd."\n");
if($config['norrd'])
{
print Console_Color::convert("%g RRD Disabled %n", false);
} else {
fwrite($rrd_pipes[0], $cmd."\n");
}
if ($debug)
{
@@ -189,7 +194,12 @@ function rrdtool_create($filename, $options)
{
global $config, $debug;
$command = $config['rrdtool'] . " create $filename $options";
if($config['norrd'])
{
print Console_Color::convert("%g RRD Disabled %n", false);
} else {
$command = $config['rrdtool'] . " create $filename $options";
}
if ($debug) { echo($command."\n"); }
return shell_exec($command);