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 ability to pass an array of values to rrdtool_update, which are checked and replaced with U if invalid.

Browse Source 
git-svn-id: http://www.observium.org/svn/observer/trunk@3152 61d68cd4-352d-0410-923a-c4978735b2b8
This commit is contained in:
Adam Amstrong
2012-05-09 11:33:16 +00:00
parent 9888002704
commit 0f10f2b5b0
3 changed files with 17 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
includes/polling/netstats-snmp.inc.php
View File

@@ -24,8 +24,7 @@ if ($device['os'] != "Snom")
$data_array = snmpwalk_cache_oid($device, "snmp", array(), "SNMPv2-MIB"); $data_array = snmpwalk_cache_oid($device, "snmp", array(), "SNMPv2-MIB");
$rrdupdate = "N"; $rrdupdate = array();
foreach ($oids as $oid) foreach ($oids as $oid)
{ {
if (is_numeric($data_array[0][$oid])) if (is_numeric($data_array[0][$oid]))
@@ -34,7 +33,7 @@ if ($device['os'] != "Snom")
} else { } else {
$value = "U"; $value = "U";
} }
$rrdupdate .= ":$value"; $rrdupdate[] = $value;
} }
if (isset($data_array[0]['snmpInPkts']) && isset($data_array[0]['snmpOutPkts'])) if (isset($data_array[0]['snmpInPkts']) && isset($data_array[0]['snmpOutPkts']))

15
includes/rrdtool.inc.php
View File

@@ -32,8 +32,6 @@ function rrdtool_pipe_open(&$rrd_process, &$rrd_pipes)
$command = $config['rrdtool'] . " -"; $command = $config['rrdtool'] . " -";
# $command = "/usr/bin/php /home/observium/dev/testpipe.php";
$descriptorspec = array( $descriptorspec = array(
0 => array("pipe", "r"), // stdin is a pipe that the child will read from 0 => array("pipe", "r"), // stdin is a pipe that the child will read from
1 => array("pipe", "w"), // stdout is a pipe that the child will write to 1 => array("pipe", "w"), // stdout is a pipe that the child will write to
@@ -168,7 +166,6 @@ function rrdtool($command, $filename, $options)
} else { } else {
fwrite($rrd_pipes[0], $cmd."\n"); fwrite($rrd_pipes[0], $cmd."\n");
} }
if ($debug) if ($debug)
{ {
echo stream_get_contents($rrd_pipes[1]); echo stream_get_contents($rrd_pipes[1]);
@@ -209,6 +206,18 @@ function rrdtool_create($filename, $options)
function rrdtool_update($filename, $options) function rrdtool_update($filename, $options)
{ {
/// Do some sanitisation on the data if passed as an array.
if(is_array($options))
{
$values[] = "N";
foreach($options as $value)
{
if(!is_numeric($value)) { $value = U; }
$values[] = $value;
}
$options = implode(':', $values);
}
return rrdtool("update", $filename, $options); return rrdtool("update", $filename, $options);
} }

4
poller.php
View File

@@ -24,7 +24,7 @@ include("includes/polling/functions.inc.php");
$poller_start = utime(); $poller_start = utime();
echo("Observium Poller v".$config['version']."\n\n"); echo("Observium Poller v".$config['version']."\n\n");
$options = getopt("h:m:i:n:d:r::a::"); $options = getopt("h:m:i:n:r:d::a::");
if ($options['h'] == "odd") { $options['n'] = "1"; $options['i'] = "2"; } if ($options['h'] == "odd") { $options['n'] = "1"; $options['i'] = "2"; }
elseif ($options['h'] == "even") { $options['n'] = "0"; $options['i'] = "2"; } elseif ($options['h'] == "even") { $options['n'] = "0"; $options['i'] = "2"; }
@@ -74,6 +74,8 @@ if (!$where)
exit; exit;
} }
print_r($options);
if (isset($options['d'])) if (isset($options['d']))
{ {
echo("DEBUG!\n"); echo("DEBUG!\n");