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 rrdtool 1.5

Browse Source
This commit is contained in:
laf
2015-08-23 19:36:22 +00:00
parent a9b08fbaa0
commit c0125f28e4
4 changed files with 33 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
includes/rrdtool.inc.php
View File

@@ -166,7 +166,7 @@ function rrdtool_graph($graph_file, $options) {
function rrdtool($command, $filename, $options) {
global $config, $debug, $rrd_pipes, $console_color;
if ($command != 'create' && $config['rrdcached']) {
if ($config['rrdtool_version'] >= 1.5 && $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);
@@ -206,19 +206,7 @@ function rrdtool($command, $filename, $options) {
function rrdtool_create($filename, $options) {
global $config, $console_color;
if ($config['norrd']) {
print $console_color->convert('[%gRRD Disabled%n] ', false);
}
else {
$command = $config['rrdtool']." create $filename $options";
}
d_echo($console_color->convert('RRD[%g'.$command.'%n] '));
return shell_exec($command);
return rrdtool('create', $filename, $options);
}