Remove nfs requirement for distributed poller (with rrdtool 1.5+)

Use data_update instead of rrd_update/rrd_create and influx_update
Centralize rrd file check so we can check against a remote rrdcached server too
Use rrd_name() to generate rrd file names
This commit is contained in:
Tony Murray
2016-07-07 01:33:43 -05:00
parent bc7e5ffb46
commit 57650e4ffc
344 changed files with 1920 additions and 2470 deletions

View File

@@ -7,30 +7,16 @@ $unit_text = 'ShoutCast Server';
$total_text = 'Total of all ShoutCast Servers';
$nototal = 0;
$rrddir = $config['rrd_dir'].'/'.$device['hostname'];
$files = array();
$i = 0;
$x = 0;
if ($handle = opendir($rrddir)) {
while (false !== ($file = readdir($handle))) {
if ($file != '.' && $file != '..') {
if (stripos($file, 'app-shoutcast-'.$app['app_id']) !== false) {
array_push($files, $file);
}
}
}
}
foreach ($files as $id => $file) {
$hostname = str_ireplace('app-shoutcast-'.$app['app_id'].'-', '', $file);
$hostname = str_ireplace('.rrd', '', $hostname);
list($host, $port) = explode('_', $hostname, 2);
$rrd_filenames[] = $rrddir.'/'.$file;
$rrd_list[$i]['filename'] = $rrddir.'/'.$file;
$rrd_list[$i]['descr'] = $host.':'.$port;
$rrd_list[$i]['colour'] = $colour;
$i++;
$rrd_list = array();
$rrd_filenames = glob(rrd_name($device['hostname'], array('app', 'shoutcast', $app['app_id'], '*')));
foreach ($rrd_filenames as $file) {
$hostname = end(explode('-',basename($file, '.rrd')));
list($host, $port) = explode('_', $hostname, 2);
$rrd_list[] = array(
'filename' => $file,
'descr' => $host.':'.$port,
// 'colour' => $colour
);
}
require 'includes/graphs/common.inc.php';