nicolas/librenms
1
0
Fork 0
mirror of https://github.com/stylersnico/librenms.git synced 2026-07-12 16:06:25 +02:00
Code Issues Packages Projects Releases Wiki Activity

updates

Browse Source 
git-svn-id: http://www.observium.org/svn/observer/trunk@528 61d68cd4-352d-0410-923a-c4978735b2b8
This commit is contained in:
Adam Amstrong
2009-11-21 15:07:09 +00:00
parent 79bf6e81b5
commit 64368223a0
15 changed files with 783 additions and 856 deletions
Download Patch File Download Diff File Expand all files Collapse all files
includes/collectd/functions.php
+4 -4
View File
@@ -545,7 +545,7 @@ function collectd_draw_rrd($host, $plugin, $pinst = null, $type, $tinst = null,
$rrd_cmd = array_merge($rrd_cmd, $small_opts);
}
$rrd_cmd = array_merge($rrd_cmd, $config['rrd_opts'], $opts['rrd_opts'], $graph);
$rrd_cmd = array_merge($rrd_cmd, $config['rrd_opts_array'], $opts['rrd_opts'], $graph);
$cmd = RRDTOOL;
for ($i = 1; $i < count($rrd_cmd); $i++)
@@ -586,7 +586,7 @@ function collectd_draw_generic($timespan, $host, $plugin, $pinst = null, $type,
$rrd_cmd = array_merge($rrd_cmd, $small_opts);
}
$rrd_cmd = array_merge($rrd_cmd, $config['rrd_opts']);
$rrd_cmd = array_merge($rrd_cmd, $config['rrd_opts_array']);
$rrd_args = $GraphDefs[$type];
foreach ($config['datadirs'] as $datadir) {
@@ -642,7 +642,7 @@ function collectd_draw_meta_stack(&$opts, &$sources) {
}
$cmd = array_merge($cmd, $config['rrd_opts'], $opts['rrd_opts']);
$cmd = array_merge($cmd, $config['rrd_opts_array'], $opts['rrd_opts']);
$max_inst_name = 0;
foreach($sources as &$inst_data) {
@@ -730,7 +730,7 @@ function collectd_draw_meta_line(&$opts, &$sources) {
array_unshift($opts['rrd_opts'], '-o');
# $cmd = array(RRDTOOL, 'graph', '-', '-a', 'PNG', '-w', $config['rrd_width'], '-h', $config['rrd_height'], '-s', -1*$timespan_def['seconds'], '-t', $opts['title']);
# $cmd = array_merge($cmd, $config['rrd_opts'], $opts['rrd_opts']);
# $cmd = array_merge($cmd, $config['rrd_opts_array'], $opts['rrd_opts']);
$cmd = array(RRDTOOL, 'graph', '-', '-a', 'PNG', '-w', $config['rrd_width'], '-h', $config['rrd_height'], '-s', -1*$timespan_def['seconds']);