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

Proxmox rrd fix

Browse Source 
Attempt to fix proxmox rrd naming. Create a separate function to generate it's file names.
This commit is contained in:
Tony Murray
2016-08-12 11:05:58 -05:00
parent 516e49b6d3
commit 1949f2f4ea
3 changed files with 77 additions and 51 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
includes/rrdtool.inc.php
View File

@@ -292,6 +292,26 @@ function rrd_name($host, $extra, $extension = ".rrd")
return implode("/", array($config['rrd_dir'], $host, $filename.$extension));
} // rrd_name
/**
* Generates a filename for a proxmox cluster rrd
*
* @param $pmxcluster
* @param $vmid
* @param $vmport
* @return string full path to the rrd.
*/
function proxmox_rrd_name($pmxcluster, $vmid, $vmport) {
global $config;
$pmxcdir = join('/', array($config['rrd_dir'], 'proxmox', safename($pmxcluster)));
// this is not needed for remote rrdcached
if (!is_dir($pmxcdir)) {
mkdir($pmxcdir, 0775, true);
}
return join('/', array($pmxcdir, safename($vmid.'_netif_'.$vmport.'.rrd')));
}
/**
* Modify an rrd file's max value and trim the peaks as defined by rrdtool
*
@@ -358,7 +378,13 @@ function rrdtool_data_update($device, $measurement, $tags, $fields)
rrd_file_rename($device, $oldname, $rrd_name);
}
$rrd = rrd_name($device['hostname'], $rrd_name);
if (isset($tags['rrd_proxmox_name'])) {
$pmxvars = $tags['rrd_proxmox_name'];
$rrd = proxmox_rrd_name($pmxvars['pmxcluster'], $pmxvars['vmid'], $pmxvars['vmport']);
} else {
$rrd = rrd_name($device['hostname'], $rrd_name);
}
if ($tags['rrd_def']) {
$rrd_def = is_array($tags['rrd_def']) ? $tags['rrd_def'] : array($tags['rrd_def']);
// add the --step and the rra definitions to the command