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

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

Browse Source 
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
Download Patch File Download Diff File Expand all files Collapse all files

45
includes/services.inc.php
View File

@@ -110,6 +110,7 @@ function discover_service($device, $service) {
function poll_service($service) {
global $config;
$update = array();
$old_status = $service['service_status'];
$check_cmd = "";
@@ -126,17 +127,17 @@ function poll_service($service) {
$check_cmd .= " " . $service['service_param'];
}
$service_id = $service['service_id'];
// Some debugging
d_echo("\nNagios Service - ".$service['service_id']."\n");
d_echo("Request: ".$check_cmd."\n");
d_echo("\nNagios Service - $service_id\n");
d_echo("Request: $check_cmd\n");
list($new_status, $msg, $perf) = check_service($check_cmd);
d_echo("Response: ".$msg."\n");
d_echo("Response: $msg\n");
// If we have performance data we will store it.
if (count($perf) > 0) {
// Yes, We have perf data.
$filename = "services-".$service['service_id'].".rrd";
$rrd_filename = $config['rrd_dir'] . "/" . $service['hostname'] . "/" . safename ($filename);
$rrd_name = array('services', $service_id);
// Set the DS in the DB if it is blank.
$DS = array();
@@ -148,28 +149,28 @@ function poll_service($service) {
$update['service_ds'] = json_encode($DS);
}
// Create the RRD
if (!file_exists ($rrd_filename)) {
$rra = "";
foreach ($perf as $k => $v) {
if ($v['uom'] == 'c') {
// This is a counter, create the DS as such
$rra .= " DS:".$k.":COUNTER:600:0:U";
}
else {
// Not a counter, must be a gauge
$rra .= " DS:".$k.":GAUGE:600:0:U";
}
// rrd definition
$rrd_def = array();
foreach ($perf as $k => $v) {
if ($v['uom'] == 'c') {
// This is a counter, create the DS as such
$rrd_def[] = "DS:".$k.":COUNTER:600:0:U";
}
else {
// Not a counter, must be a gauge
$rrd_def[] = "DS:".$k.":GAUGE:600:0:U";
}
rrdtool_create ($rrd_filename, $rra . $config['rrd_rra']);
}
// Update RRD
$rrd = array();
// Update data
$fields = array();
foreach ($perf as $k => $v) {
$rrd[$k] = $v['value'];
$fields[$k] = $v['value'];
}
rrdtool_update ($rrd_filename, $rrd);
$tags = compact('service_id', 'rrd_name', 'rrd_def');
//TODO not sure if we have $device at this point, if we do replace faked $device
data_update(array('hostname' => $service['hostname']), 'services', $tags, $fields);
}
if ($old_status != $new_status) {