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

rrdcached support (yarly!)

Browse Source 
git-svn-id: http://www.observium.org/svn/observer/trunk@1291 61d68cd4-352d-0410-923a-c4978735b2b8
This commit is contained in:
Adam Amstrong
2010-07-04 21:09:22 +00:00
parent c98b16c559
commit c5f7f9ac5f
3 changed files with 18 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
config.php.default
View File

@@ -15,6 +15,10 @@ $config['rrd_dir'] = "/opt/observer/rrd";
$config['temp_dir'] = "/tmp"; $config['temp_dir'] = "/tmp";
$config['observer_log'] = $config['install_dir'] . "/observer.log"; $config['observer_log'] = $config['install_dir'] . "/observer.log";
### Enable the below to use rrdcached. be sure rrd_dir is within the rrdcached dir
### and that your web server has permission to talk to rrdcached.
#$config['rrdcached'] = "unix:/var/run/rrdcached.sock";
### Default community ### Default community
$config['community'] = "public"; $config['community'] = "public";

7
html/graph.php
View File

@@ -56,8 +56,11 @@ if($_GET['debug']) {
} }
if($rrd_options) { if($rrd_options) {
if($_GET['debug']) { echo("<pre>".$config['rrdtool'] . " graph $graphfile $rrd_options\n\n"); }
$thing = shell_exec($config['rrdtool'] . " graph $graphfile $rrd_options"); if($config['rrdcached']) { $rrd_switches = " --daemon ".$config['rrdcached'] . " "; }
$rrd_cmd = $config['rrdtool'] . " graph $graphfile $rrd_options" . $rrd_switches;
$woo = shell_exec($rrd_cmd);
if($_GET['debug']) { echo("<pre>".$rrd_cmd."</pre>"); }
# $thing = popen($config['rrdtool'] . " -",'w'); # $thing = popen($config['rrdtool'] . " -",'w');
# fputs($thing, "graph $graphfile $rrd_options"); # fputs($thing, "graph $graphfile $rrd_options");
# pclose($thing); # pclose($thing);

11
includes/rrdtool.inc.php
View File

@@ -33,8 +33,15 @@ function rrdtool_lastupdate($rrdfile, $rrdupdate)
function rrdtool($command, $file, $options) function rrdtool($command, $file, $options)
{ {
global $config; global $debug; global $config; global $debug;
if ($debug) { echo($config['rrdtool'] . " $command $file $options \n"); }
return shell_exec($config['rrdtool'] . " $command $file $options"); $command = $config['rrdtool'] . " $command $file $options";
if($config['rrdcached'])
{
$command .= " --daemon " . $config['rrdcached'];
}
if ($debug) { echo($command."\n"); }
return shell_exec($command);
} }
?> ?>