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

Updated rrdtool_update() to use new array format

Browse Source
This commit is contained in:
laf
2015-08-18 16:26:55 +00:00
parent 84a0b8f676
commit 987634e463
65 changed files with 591 additions and 271 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
includes/polling/applications/mysql.inc.php
View File

@ -109,8 +109,8 @@ $mapping = array(
);
$values = array();
foreach ($mapping as $key) {
$values[] = isset($map[$key]) ? $map[$key] : (-1);
foreach ($mapping as $k => $v) {
$fields[$k] = isset($map[$v]) ? $map[$v] : (-1);
}
$string = implode(':', $values);
@ -201,7 +201,7 @@ if (!is_file($mysql_rrd)) {
);
}//end if
rrdtool_update($mysql_rrd, "N:$string");
rrdtool_update($mysql_rrd, $fields);
// Process state statistics
$mysql_status_rrd = $config['rrd_dir'].'/'.$device['hostname'].'/app-mysql-'.$app['app_id'].'-status.rrd';
@ -227,8 +227,9 @@ $mapping_status = array(
$values = array();
$rrd_create = '';
unset($fields);
foreach ($mapping_status as $desc => $id) {
$values[] = isset($map[$id]) ? $map[$id] : (-1);
$fields[$desc] = isset($map[$id]) ? $map[$id] : (-1);
$rrd_create .= ' DS:'.$id.':GAUGE:600:0:125000000000';
}
@ -238,4 +239,4 @@ if (!is_file($mysql_status_rrd)) {
rrdtool_create($mysql_status_rrd, '--step 300 '.$rrd_create.' '.$config['rrd_rra']);
}
rrdtool_update($mysql_status_rrd, "N:$string");
rrdtool_update($mysql_status_rrd, $fields);