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

Added support for using rrdcached via tcp connections

Browse Source
This commit is contained in:
laf
2015-04-27 10:04:57 +01:00
parent 67e49dfd7d
commit 567a31f45f
2 changed files with 12 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
includes/defaults.inc.php
View File

@@ -85,6 +85,7 @@ $config['rrd_rra'] .= " RRA:LAST:0.5:1:1440 ";
// RRDCacheD - Make sure it can write to your RRD dir!
#$config['rrdcached'] = "unix:/var/run/rrdcached.sock";
$config['rrdcached_dir'] = FALSE;// Set this if you are using tcp connections to rrdcached
// Web Interface Settings

13
includes/rrdtool.inc.php
View File

@@ -107,6 +107,10 @@ function rrdtool_graph($graph_file, $options)
if ($config['rrdcached'])
{
if (isset($config['rrdcached_dir']) && $config['rrdcached_dir'] !== FALSE) {
$options = str_replace($config['rrd_dir']."/",$config['rrdcached_dir']."/",$options);
$options = str_replace($config['rrd_dir'] ,$config['rrdcached_dir']."/",$options);
}
fwrite($rrd_pipes[0], "graph --daemon " . $config['rrdcached'] . " $graph_file $options");
} else {
fwrite($rrd_pipes[0], "graph $graph_file $options");
@@ -150,10 +154,15 @@ function rrdtool($command, $filename, $options)
{
global $config, $debug, $rrd_pipes, $console_color;
$cmd = "$command $filename $options";
if ($command != "create" && $config['rrdcached'])
{
$cmd .= " --daemon " . $config['rrdcached'];
if (isset($config['rrdcached_dir']) && $config['rrdcached_dir'] !== FALSE) {
$filename = str_replace($config['rrd_dir']."/",$config['rrdcached_dir']."/",$filename);
$filename = str_replace($config['rrd_dir'] ,$config['rrdcached_dir']."/",$filename);
}
$cmd = "$command $filename $options --daemon " . $config['rrdcached'];
} else {
$cmd = "$command $filename $options";
}
if ($config['norrd'])