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

Added functions to shorten code

Browse Source
This commit is contained in:
laf
2015-07-10 16:10:35 +01:00
parent a39e28c969
commit 2d78c7d3e0
4 changed files with 25 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
html/includes/graphs/device/smokeping_all_common.inc.php
View File

@@ -38,11 +38,8 @@ foreach ($smokeping_files[$direction][$device['hostname']] as $source => $filena
$descr = rrdtool_escape($source, $descr_len); $descr = rrdtool_escape($source, $descr_len);
if ($config['smokeping']['integration'] === true) { $filename = generate_smokeping_file($device,$filename);
$filename = $config['smokeping']['dir'] .'/'. $device['type'] .'/'. $filename;
} else {
$filename = $config['smokeping']['dir'] . $filename;
}
$rrd_options .= " DEF:median$i=".$filename.":median:AVERAGE "; $rrd_options .= " DEF:median$i=".$filename.":median:AVERAGE ";
$rrd_options .= " DEF:loss$i=".$filename.":loss:AVERAGE"; $rrd_options .= " DEF:loss$i=".$filename.":loss:AVERAGE";
$rrd_options .= " CDEF:ploss$i=loss$i,$pings,/,100,*"; $rrd_options .= " CDEF:ploss$i=loss$i,$pings,/,100,*";

7
html/includes/graphs/device/smokeping_all_common_avg.inc.php
View File

@@ -39,11 +39,8 @@ foreach ($smokeping_files[$direction][$device['hostname']] as $source => $filena
$descr = rrdtool_escape($source, $descr_len); $descr = rrdtool_escape($source, $descr_len);
if ($config['smokeping']['integration'] === true) { $filename = generate_smokeping_file($device,$filename);
$filename = $config['smokeping']['dir'] .'/'. $device['type'] .'/'. $filename;
} else {
$filename = $config['smokeping']['dir'] . $filename;
}
$rrd_options .= " DEF:median$i=".$filename.":median:AVERAGE "; $rrd_options .= " DEF:median$i=".$filename.":median:AVERAGE ";
$rrd_options .= " CDEF:dm$i=median$i,UN,0,median$i,IF"; $rrd_options .= " CDEF:dm$i=median$i,UN,0,median$i,IF";
$rrd_options .= " DEF:loss$i=".$filename.":loss:AVERAGE"; $rrd_options .= " DEF:loss$i=".$filename.":loss:AVERAGE";

6
html/includes/graphs/smokeping/in.inc.php
View File

@@ -33,11 +33,7 @@ if($width > "500")
if($src['hostname'] == $config['own_hostname']) if($src['hostname'] == $config['own_hostname'])
{ {
if ($config['smokeping']['integration'] === true) { $filename_dir = generate_smokeping_dir($device);
$filename_dir = $config['smokeping']['dir'] .'/'. $device['type'] .'/';
} else {
$filename_dir = $config['smokeping']['dir'];
}
if (!file_exists($filename_dir.$device['hostname'].'.rrd')) if (!file_exists($filename_dir.$device['hostname'].'.rrd'))
{ {
// Try with dots in hostname replaced by underscores // Try with dots in hostname replaced by underscores

25
includes/common.php
View File

@@ -751,11 +751,7 @@ function get_smokeping_files($device) {
global $config; global $config;
if (isset($config['smokeping']['dir'])) { if (isset($config['smokeping']['dir'])) {
$smokeping_files = array(); $smokeping_files = array();
if ($config['smokeping']['integration'] === true) { $filename_dir = generate_smokeping_dir($device);
$smokeping_dir = $config['smokeping']['dir'] . "/" . $device['type'];
} else {
$smokeping_dir = $config['smokeping']['dir'];
}
if ($handle = opendir($smokeping_dir)) { if ($handle = opendir($smokeping_dir)) {
while (false !== ($file = readdir($handle))) { while (false !== ($file = readdir($handle))) {
if ($file != "." && $file != "..") { if ($file != "." && $file != "..") {
@@ -778,3 +774,22 @@ function get_smokeping_files($device) {
} }
return $smokeping_files; return $smokeping_files;
} }
function generate_smokeping_file($device,$file) {
global $config;
if ($config['smokeping']['integration'] === true) {
return $config['smokeping']['dir'] .'/'. $device['type'] .'/'. $file;
} else {
return $config['smokeping']['dir'] . $file;
}
}
function generate_smokeping_dir($device) {
global $config;
if ($config['smokeping']['integration'] === true) {
return $config['smokeping']['dir'] .'/'. $device['type'] .'/';
} else {
return $config['smokeping']['dir'];
}
}