mirror/librenms-librenms
1
0
Fork 0
mirror of https://github.com/librenms/librenms.git synced 2024-10-07 16:52:45 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

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

Browse Source 
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
Download Patch File Download Diff File Expand all files Collapse all files

1
html/includes/graphs/common.inc.php
View File

@@ -12,6 +12,7 @@ if ($_GET['title'] == "yes") { $rrd_options .= " --title='".$graph_title."' ";
if (isset($_GET['graph_title'])) { $rrd_options .= " --title='".$_GET['graph_title']."' "; }
if (!isset($scale_min) && !isset($scale_max)) { $rrd_options .= " --alt-autoscale-max"; }
if (!isset($scale_min) && !isset($scale_max) && !isset($norigid)) { $rrd_options .= " --rigid"; }
if (isset($scale_min)) { $rrd_options .= " -l $scale_min"; }
if (isset($scale_max)) { $rrd_options .= " -u $scale_max"; }

2
includes/common.php
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);
}

2
includes/polling/cipsec-tunnels.inc.php
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");

14
includes/rrdtool.inc.php
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);

8
poller.php
View File

@@ -22,7 +22,7 @@ include("includes/polling/functions.inc.php");
$poller_start = utime();
echo("Observium Poller v".$config['version']."\n\n");
$options = getopt("h:m:i:n:d::a::");
$options = getopt("h:m:i:n:d:r::a::");
if ($options['h'] == "odd") { $options['n'] = "1"; $options['i'] = "2"; }
elseif ($options['h'] == "even") { $options['n'] = "0"; $options['i'] = "2"; }
@@ -64,6 +64,7 @@ if (!$where)
echo("-i <instances> -n <number> Poll as instance <number> of <instances>\n");
echo(" Instances start at 0. 0-3 for -n 4\n\n");
echo("Debugging and testing options:\n");
echo("-r Do not create or update RRDs\n");
echo("-d Enable debugging output\n");
echo("-m Specify module(s) to be run\n");
echo("\n");
@@ -87,6 +88,11 @@ if (isset($options['d']))
# ini_set('error_reporting', 0);
}
if (isset($options['r']))
{
$config['norrd'] = TRUE;
}
rrdtool_pipe_open($rrd_process, $rrd_pipes);
echo("Starting polling run:\n\n");