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

Separate convenience function for RRD filename generation; tidy formatting

Browse Source
This commit is contained in:
Paul Gear
2015-06-13 16:13:12 +10:00
parent 96bee67394
commit 0cc75d7d1d
2 changed files with 18 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
includes/functions.php
View File

@ -1251,7 +1251,8 @@ function ip_exists($ip) {
/*
* convenience function - please use this instead of 'if ($debug) { echo ...; }'
*/
function d_echo($text) {
function d_echo($text)
{
global $debug;
if ($debug) {
echo "$text\n";
@ -1261,9 +1262,22 @@ function d_echo($text) {
/*
* convenience function - please use this instead of 'if ($debug) { print_r ...; }'
*/
function d_print_r($var) {
function d_print_r($var)
{
global $debug;
if ($debug) {
print_r($var);
}
}
/*
* @return the name of the rrd file for $host's $extra component
* @param host Host name
* @param extra Components of RRD filename - will be separated with "-"
*/
function rrdname($host, $extra)
{
global $config;
return implode("/", array($config['rrd_dir'], $host, safename(implode("-", $extra)).".rrd"));
}

4
includes/polling/functions.inc.php
View File

@ -349,7 +349,7 @@ function poll_mib_def($device, $mib_name_table, $mib_subdir, $mib_oids, $mib_gra
/*
* Please use this instead of creating & updating RRD files manually.
* @param device Device object - only 'hostname' is used at present
* @param name Array of name objects - filename will be constructed using this with a "-" delimiter
* @param name Array of rrdname components
* @param def Array of data definitions
* @param val Array of value definitions
*
@ -357,7 +357,7 @@ function poll_mib_def($device, $mib_name_table, $mib_subdir, $mib_oids, $mib_gra
function rrd_create_update($device, $name, $def, $val, $step = 300)
{
global $config;
$rrd = implode("/", array($config['rrd_dir'], $device['hostname'], safename(implode("-", $name)).".rrd"));
$rrd = rrd_name($device['hostname'], $name);
if (!is_file($rrd) && $def != null) {
// add the --step and the rra definitions to the array