From 432fa5cadd99536fd6c9173efc5e78f3ce80f5e9 Mon Sep 17 00:00:00 2001 From: laf Date: Wed, 24 Jun 2015 11:41:10 +0100 Subject: [PATCH 01/10] Updated smokeping to support Rosiaks integration --- .../device/smokeping_all_common.inc.php | 6 +++- .../device/smokeping_all_common_avg.inc.php | 6 +++- .../graphs/device/smokeping_common.inc.php | 25 +-------------- html/includes/graphs/smokeping/auth.inc.php | 4 +-- html/includes/graphs/smokeping/in.inc.php | 14 +++++--- html/pages/device.inc.php | 29 +---------------- includes/common.php | 32 ++++++++++++++++++- 7 files changed, 54 insertions(+), 62 deletions(-) diff --git a/html/includes/graphs/device/smokeping_all_common.inc.php b/html/includes/graphs/device/smokeping_all_common.inc.php index edff0d7e5..3549633bf 100644 --- a/html/includes/graphs/device/smokeping_all_common.inc.php +++ b/html/includes/graphs/device/smokeping_all_common.inc.php @@ -38,7 +38,11 @@ foreach ($smokeping_files[$direction][$device['hostname']] as $source => $filena $descr = rrdtool_escape($source, $descr_len); - $filename = $config['smokeping']['dir'] . $filename; + if ($config['smokeping']['integration'] === true) { + $filename = $config['smokeping']['dir'] .'/'. $device['type'] .'/'. $filename; + } else { + $filename = $config['smokeping']['dir'] . $filename; + } $rrd_options .= " DEF:median$i=".$filename.":median:AVERAGE "; $rrd_options .= " DEF:loss$i=".$filename.":loss:AVERAGE"; $rrd_options .= " CDEF:ploss$i=loss$i,$pings,/,100,*"; diff --git a/html/includes/graphs/device/smokeping_all_common_avg.inc.php b/html/includes/graphs/device/smokeping_all_common_avg.inc.php index 12681140a..3178e613c 100644 --- a/html/includes/graphs/device/smokeping_all_common_avg.inc.php +++ b/html/includes/graphs/device/smokeping_all_common_avg.inc.php @@ -39,7 +39,11 @@ foreach ($smokeping_files[$direction][$device['hostname']] as $source => $filena $descr = rrdtool_escape($source, $descr_len); - $filename = $config['smokeping']['dir'] . $filename; + if ($config['smokeping']['integration'] === true) { + $filename = $config['smokeping']['dir'] .'/'. $device['type'] .'/'. $filename; + } else { + $filename = $config['smokeping']['dir'] . $filename; + } $rrd_options .= " DEF:median$i=".$filename.":median:AVERAGE "; $rrd_options .= " CDEF:dm$i=median$i,UN,0,median$i,IF"; $rrd_options .= " DEF:loss$i=".$filename.":loss:AVERAGE"; diff --git a/html/includes/graphs/device/smokeping_common.inc.php b/html/includes/graphs/device/smokeping_common.inc.php index c158e8267..ce9df8a4e 100644 --- a/html/includes/graphs/device/smokeping_common.inc.php +++ b/html/includes/graphs/device/smokeping_common.inc.php @@ -1,26 +1,3 @@ +$smokeping_files = get_smokeping_files($device); diff --git a/html/includes/graphs/smokeping/auth.inc.php b/html/includes/graphs/smokeping/auth.inc.php index 55e9f80ee..ff2d92795 100644 --- a/html/includes/graphs/smokeping/auth.inc.php +++ b/html/includes/graphs/smokeping/auth.inc.php @@ -1,8 +1,8 @@ "500") if($src['hostname'] == $config['own_hostname']) { - $filename = $config['smokeping']['dir'] . $device['hostname'].'.rrd'; - if (!file_exists($filename)) + if ($config['smokeping']['integration'] === true) { + $filename_dir = $config['smokeping']['dir'] .'/'. $device['type'] .'/'; + } else { + $filename_dir = $config['smokeping']['dir']; + } + if (!file_exists($filename_dir.$device['hostname'].'.rrd')) { // Try with dots in hostname replaced by underscores - $filename = $config['smokeping']['dir'] . str_replace(".", "_", $device['hostname']).'.rrd'; + $filename = $filename_dir . str_replace(".", "_", $device['hostname']).'.rrd'; } } else { - $filename = $config['smokeping']['dir'] . $device['hostname'] .'~'.$src['hostname'].'.rrd'; + $filename = $filename_dir . $device['hostname'] .'~'.$src['hostname'].'.rrd'; if (!file_exists($filename)) { // Try with dots in hostname replaced by underscores - $filename = $config['smokeping']['dir'] . str_replace(".", "-", $device['hostname']) .'~'.$src['hostname'].'.rrd'; + $filename = $filename_dir . str_replace(".", "-", $device['hostname']) .'~'.$src['hostname'].'.rrd'; } } diff --git a/html/pages/device.inc.php b/html/pages/device.inc.php index c72daf9bf..93149f601 100644 --- a/html/pages/device.inc.php +++ b/html/pages/device.inc.php @@ -138,34 +138,7 @@ if (device_permitted($vars['device']) || $check_device == $vars['device']) '); } - if (isset($config['smokeping']['dir'])) - { - $smokeping_files = array(); - if ($handle = opendir($config['smokeping']['dir'])) - { - while (false !== ($file = readdir($handle))) - { - if ($file != "." && $file != "..") - { - if (eregi(".rrd", $file)) - { - if (eregi("~", $file)) - { - list($target,$slave) = explode("~", str_replace(".rrd", "", $file)); - $target = str_replace("_", ".", $target); - $smokeping_files['in'][$target][$slave] = $file; - $smokeping_files['out'][$slave][$target] = $file; - } else { - $target = str_replace(".rrd", "", $file); - $target = str_replace("_", ".", $target); - $smokeping_files['in'][$target][$config['own_hostname']] = $file; - $smokeping_files['out'][$config['own_hostname']][$target] = $file; - } - } - } - } - } - } + $smokeping_files = get_smokeping_files($device); if (count($smokeping_files['in'][$device['hostname']]) || count($smokeping_files['out'][$device['hostname']])) { diff --git a/includes/common.php b/includes/common.php index 8e7499841..514d42e18 100644 --- a/includes/common.php +++ b/includes/common.php @@ -747,4 +747,34 @@ function get_graph_subtypes($type) return $types; } -?> +function get_smokeping_files($device) { + global $config; + if (isset($config['smokeping']['dir'])) { + $smokeping_files = array(); + if ($config['smokeping']['integration'] === true) { + $smokeping_dir = $config['smokeping']['dir'] . "/" . $device['type']; + } else { + $smokeping_dir = $config['smokeping']['dir']; + } + if ($handle = opendir($smokeping_dir)) { + while (false !== ($file = readdir($handle))) { + if ($file != "." && $file != "..") { + if (eregi(".rrd", $file)) { + if (eregi("~", $file)) { + list($target,$slave) = explode("~", str_replace(".rrd", "", $file)); + $target = str_replace("_", ".", $target); + $smokeping_files['in'][$target][$slave] = $file; + $smokeping_files['out'][$slave][$target] = $file; + } else { + $target = str_replace(".rrd", "", $file); + $target = str_replace("_", ".", $target); + $smokeping_files['in'][$target][$config['own_hostname']] = $file; + $smokeping_files['out'][$config['own_hostname']][$target] = $file; + } + } + } + } + } + } + return $smokeping_files; +} From e43abbedfab666267314870187223a90a1194e60 Mon Sep 17 00:00:00 2001 From: laf Date: Sun, 28 Jun 2015 16:20:13 +0100 Subject: [PATCH 02/10] Hopefully final updates for Smokeping integration --- html/pages/device/latency.inc.php | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/html/pages/device/latency.inc.php b/html/pages/device/latency.inc.php index 72f882be6..0cd9215a6 100644 --- a/html/pages/device/latency.inc.php +++ b/html/pages/device/latency.inc.php @@ -64,10 +64,15 @@ if($vars['view'] == "incoming") { $hostname = str_replace(".rrd", "", $host); $host = device_by_name($src); + if ($config['smokeping']['integration'] === true) { + $dest = device_by_name(str_replace("_",".",$hostname)); + } else { + $dest = $host; + } if (is_numeric($host['device_id'])) { echo(''); - echo('

'.generate_device_link($host).'

'); + echo('

'.generate_device_link($dest).'

'); $graph_array['type'] = "smokeping_in"; $graph_array['device'] = $device['device_id']; $graph_array['src'] = $host['device_id']; From 0b30d18733b691395de018fcad2edd371fdd63d0 Mon Sep 17 00:00:00 2001 From: laf Date: Tue, 7 Jul 2015 20:24:09 +0100 Subject: [PATCH 03/10] Final pieces to the smokeping integration --- doc/Extensions/Smokeping.md | 45 +++++++++++++++++++++++++++++++++++++ scripts/gen_smokeping.php | 36 +++++++++++++++++++++++++++++ 2 files changed, 81 insertions(+) create mode 100644 doc/Extensions/Smokeping.md create mode 100755 scripts/gen_smokeping.php diff --git a/doc/Extensions/Smokeping.md b/doc/Extensions/Smokeping.md new file mode 100644 index 000000000..713800cac --- /dev/null +++ b/doc/Extensions/Smokeping.md @@ -0,0 +1,45 @@ +# Smokeping integration + +We currently have two ways to use Smokeping with LibreNMS, the first is using the included script generator to generate the config for Smokeping. The +second is to utilise an existing Smokeping setup. + +### Included Smokeping script + +To use this, please add something similar to your smokeping config file: + +```bash +@include /opt/smokeping/etc/librenms.conf +``` + +Then you need to generate the config file (maybe even add a cron to schedule this in and reload smokeping). We've assumed a few locations for smokeping, the config file you want +to call it and where LibreNMS is: + +```bash +cd /opt/librenms/scripts/ +php ./gen_smokeping.php > /opt/smokepgin/etc/librenms.conf +/opt/smokeping/bin/smokeping --reload +``` + +Sample cron: + +```bash +15 0 * * * root cd /opt/librenms/scripts && php ./gen_smokeping.php > /opt/smokepgin/etc/librenms.conf && /opt/smokeping/bin/smokeping --reload >> /dev/null 2>&1 +``` + +Now configure LibreNMS (make sure you point dir to your smokeping data directory: + +```php +$config['smokeping']['dir'] = '/opt/smokeping/data'; +$config['smokeping']['integration'] = true; +``` + +### Standard Smokeping + +This is quite simple, just point your dir at the smokeping data directory - please be aware that all RRD files need to be within this dir and NOT sub dirs: + +```php +$config['smokeping']['dir'] = '/opt/smokeping/data'; +$config['own_hostname'] +``` + +You should now see a new tab in your device page called ping. diff --git a/scripts/gen_smokeping.php b/scripts/gen_smokeping.php new file mode 100755 index 000000000..454e281b6 --- /dev/null +++ b/scripts/gen_smokeping.php @@ -0,0 +1,36 @@ + +* This program is free software: you can redistribute it and/or modify it +* under the terms of the GNU General Public License as published by the +* Free Software Foundation, either version 3 of the License, or (at your +* option) any later version. Please see LICENSE.txt at the top level of +* the source code distribution for details. +*/ + +include_once("../config.php"); +include_once("../includes/defaults.inc.php"); +include_once("../includes/definitions.inc.php"); +include_once("../includes/functions.inc.php"); + +?> + +menu = Top +title = Network Latency Grapher + + Date: Tue, 7 Jul 2015 20:28:04 +0100 Subject: [PATCH 04/10] Some small changes --- scripts/gen_smokeping.php | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/scripts/gen_smokeping.php b/scripts/gen_smokeping.php index 454e281b6..ec10cab62 100755 --- a/scripts/gen_smokeping.php +++ b/scripts/gen_smokeping.php @@ -13,7 +13,6 @@ include_once("../config.php"); include_once("../includes/defaults.inc.php"); include_once("../includes/definitions.inc.php"); -include_once("../includes/functions.inc.php"); ?> @@ -22,11 +21,11 @@ title = Network Latency Grapher Date: Wed, 8 Jul 2015 00:25:38 +0100 Subject: [PATCH 05/10] Fixed spelinlg errors :) --- doc/Extensions/Smokeping.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/doc/Extensions/Smokeping.md b/doc/Extensions/Smokeping.md index 713800cac..902b14f2a 100644 --- a/doc/Extensions/Smokeping.md +++ b/doc/Extensions/Smokeping.md @@ -16,14 +16,14 @@ to call it and where LibreNMS is: ```bash cd /opt/librenms/scripts/ -php ./gen_smokeping.php > /opt/smokepgin/etc/librenms.conf +php ./gen_smokeping.php > /opt/smokeping/etc/librenms.conf /opt/smokeping/bin/smokeping --reload ``` Sample cron: ```bash -15 0 * * * root cd /opt/librenms/scripts && php ./gen_smokeping.php > /opt/smokepgin/etc/librenms.conf && /opt/smokeping/bin/smokeping --reload >> /dev/null 2>&1 +15 0 * * * root cd /opt/librenms/scripts && php ./gen_smokeping.php > /opt/smokeping/etc/librenms.conf && /opt/smokeping/bin/smokeping --reload >> /dev/null 2>&1 ``` Now configure LibreNMS (make sure you point dir to your smokeping data directory: From 2d78c7d3e0f77d33ff652e919f9e91827ca71bde Mon Sep 17 00:00:00 2001 From: laf Date: Fri, 10 Jul 2015 16:10:35 +0100 Subject: [PATCH 06/10] Added functions to shorten code --- .../device/smokeping_all_common.inc.php | 7 ++---- .../device/smokeping_all_common_avg.inc.php | 7 ++---- html/includes/graphs/smokeping/in.inc.php | 6 +---- includes/common.php | 25 +++++++++++++++---- 4 files changed, 25 insertions(+), 20 deletions(-) diff --git a/html/includes/graphs/device/smokeping_all_common.inc.php b/html/includes/graphs/device/smokeping_all_common.inc.php index 3549633bf..6f5a5aadc 100644 --- a/html/includes/graphs/device/smokeping_all_common.inc.php +++ b/html/includes/graphs/device/smokeping_all_common.inc.php @@ -38,11 +38,8 @@ foreach ($smokeping_files[$direction][$device['hostname']] as $source => $filena $descr = rrdtool_escape($source, $descr_len); - if ($config['smokeping']['integration'] === true) { - $filename = $config['smokeping']['dir'] .'/'. $device['type'] .'/'. $filename; - } else { - $filename = $config['smokeping']['dir'] . $filename; - } + $filename = generate_smokeping_file($device,$filename); + $rrd_options .= " DEF:median$i=".$filename.":median:AVERAGE "; $rrd_options .= " DEF:loss$i=".$filename.":loss:AVERAGE"; $rrd_options .= " CDEF:ploss$i=loss$i,$pings,/,100,*"; diff --git a/html/includes/graphs/device/smokeping_all_common_avg.inc.php b/html/includes/graphs/device/smokeping_all_common_avg.inc.php index 3178e613c..0f0248d03 100644 --- a/html/includes/graphs/device/smokeping_all_common_avg.inc.php +++ b/html/includes/graphs/device/smokeping_all_common_avg.inc.php @@ -39,11 +39,8 @@ foreach ($smokeping_files[$direction][$device['hostname']] as $source => $filena $descr = rrdtool_escape($source, $descr_len); - if ($config['smokeping']['integration'] === true) { - $filename = $config['smokeping']['dir'] .'/'. $device['type'] .'/'. $filename; - } else { - $filename = $config['smokeping']['dir'] . $filename; - } + $filename = generate_smokeping_file($device,$filename); + $rrd_options .= " DEF:median$i=".$filename.":median:AVERAGE "; $rrd_options .= " CDEF:dm$i=median$i,UN,0,median$i,IF"; $rrd_options .= " DEF:loss$i=".$filename.":loss:AVERAGE"; diff --git a/html/includes/graphs/smokeping/in.inc.php b/html/includes/graphs/smokeping/in.inc.php index 62abf2012..3114d6193 100644 --- a/html/includes/graphs/smokeping/in.inc.php +++ b/html/includes/graphs/smokeping/in.inc.php @@ -33,11 +33,7 @@ if($width > "500") if($src['hostname'] == $config['own_hostname']) { - if ($config['smokeping']['integration'] === true) { - $filename_dir = $config['smokeping']['dir'] .'/'. $device['type'] .'/'; - } else { - $filename_dir = $config['smokeping']['dir']; - } + $filename_dir = generate_smokeping_dir($device); if (!file_exists($filename_dir.$device['hostname'].'.rrd')) { // Try with dots in hostname replaced by underscores diff --git a/includes/common.php b/includes/common.php index 514d42e18..f931793f7 100644 --- a/includes/common.php +++ b/includes/common.php @@ -751,11 +751,7 @@ function get_smokeping_files($device) { global $config; if (isset($config['smokeping']['dir'])) { $smokeping_files = array(); - if ($config['smokeping']['integration'] === true) { - $smokeping_dir = $config['smokeping']['dir'] . "/" . $device['type']; - } else { - $smokeping_dir = $config['smokeping']['dir']; - } + $filename_dir = generate_smokeping_dir($device); if ($handle = opendir($smokeping_dir)) { while (false !== ($file = readdir($handle))) { if ($file != "." && $file != "..") { @@ -778,3 +774,22 @@ function get_smokeping_files($device) { } 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']; + } +} + From 0e45bad17320b0e0ef6d30cb23cbd5fd7077917c Mon Sep 17 00:00:00 2001 From: laf Date: Fri, 10 Jul 2015 16:28:47 +0100 Subject: [PATCH 07/10] Fixed issue with using dir --- html/includes/graphs/smokeping/in.inc.php | 3 ++- includes/common.php | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/html/includes/graphs/smokeping/in.inc.php b/html/includes/graphs/smokeping/in.inc.php index 3114d6193..8c8024e24 100644 --- a/html/includes/graphs/smokeping/in.inc.php +++ b/html/includes/graphs/smokeping/in.inc.php @@ -31,9 +31,10 @@ if($width > "500") $rrd_options .= " COMMENT:'".substr(str_pad($unit_text, $descr_len+5),0,$descr_len+5)." RTT Loss SDev RTT\:SDev \l'"; } +$filename_dir = generate_smokeping_dir($device); if($src['hostname'] == $config['own_hostname']) { - $filename_dir = generate_smokeping_dir($device); + $filename = $filename_dir . $device['hostname'].'.rrd'; if (!file_exists($filename_dir.$device['hostname'].'.rrd')) { // Try with dots in hostname replaced by underscores diff --git a/includes/common.php b/includes/common.php index f931793f7..4885ba985 100644 --- a/includes/common.php +++ b/includes/common.php @@ -751,7 +751,7 @@ function get_smokeping_files($device) { global $config; if (isset($config['smokeping']['dir'])) { $smokeping_files = array(); - $filename_dir = generate_smokeping_dir($device); + $smokeping_dir = generate_smokeping_dir($device); if ($handle = opendir($smokeping_dir)) { while (false !== ($file = readdir($handle))) { if ($file != "." && $file != "..") { From e356d80141f0d1c0f5165a3f2e55bb3855c4ef56 Mon Sep 17 00:00:00 2001 From: laf Date: Sun, 12 Jul 2015 19:47:50 +0100 Subject: [PATCH 08/10] Updated function and use - generate_smokeping_file --- html/includes/graphs/smokeping/in.inc.php | 2 +- includes/common.php | 19 +++++++------------ 2 files changed, 8 insertions(+), 13 deletions(-) diff --git a/html/includes/graphs/smokeping/in.inc.php b/html/includes/graphs/smokeping/in.inc.php index 8c8024e24..c50d8a704 100644 --- a/html/includes/graphs/smokeping/in.inc.php +++ b/html/includes/graphs/smokeping/in.inc.php @@ -31,7 +31,7 @@ if($width > "500") $rrd_options .= " COMMENT:'".substr(str_pad($unit_text, $descr_len+5),0,$descr_len+5)." RTT Loss SDev RTT\:SDev \l'"; } -$filename_dir = generate_smokeping_dir($device); +$filename_dir = generate_smokeping_file($device); if($src['hostname'] == $config['own_hostname']) { $filename = $filename_dir . $device['hostname'].'.rrd'; diff --git a/includes/common.php b/includes/common.php index 4885ba985..ff8a29313 100644 --- a/includes/common.php +++ b/includes/common.php @@ -751,7 +751,7 @@ function get_smokeping_files($device) { global $config; if (isset($config['smokeping']['dir'])) { $smokeping_files = array(); - $smokeping_dir = generate_smokeping_dir($device); + $smokeping_dir = generate_smokeping_file($device); if ($handle = opendir($smokeping_dir)) { while (false !== ($file = readdir($handle))) { if ($file != "." && $file != "..") { @@ -778,18 +778,13 @@ function get_smokeping_files($device) { function generate_smokeping_file($device,$file) { global $config; if ($config['smokeping']['integration'] === true) { - return $config['smokeping']['dir'] .'/'. $device['type'] .'/'. $file; + $response = $config['smokeping']['dir'] .'/'. $device['type'] .'/'; } 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']; + $response = $config['smokeping']['dir'] . '/'; } + if (!empty($file)) { + $response = $response . $file; + } + return $response; } From 451c3a0981f1973eb13834ae8adbe355df28366a Mon Sep 17 00:00:00 2001 From: laf Date: Mon, 13 Jul 2015 09:37:48 +0100 Subject: [PATCH 09/10] Updated to use Pauls code --- includes/common.php | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) diff --git a/includes/common.php b/includes/common.php index ff8a29313..4af63c71d 100644 --- a/includes/common.php +++ b/includes/common.php @@ -775,16 +775,12 @@ function get_smokeping_files($device) { return $smokeping_files; } -function generate_smokeping_file($device,$file) { +function generate_smokeping_file($device,$file='') { global $config; if ($config['smokeping']['integration'] === true) { - $response = $config['smokeping']['dir'] .'/'. $device['type'] .'/'; + return $config['smokeping']['dir'] .'/'. $device['type'] .'/' . $file; } else { - $response = $config['smokeping']['dir'] . '/'; + return $config['smokeping']['dir'] . '/' . $file; } - if (!empty($file)) { - $response = $response . $file; - } - return $response; } From 6ec525c2225f0d4091988b9330c5a65af3dcf6fd Mon Sep 17 00:00:00 2001 From: laf Date: Thu, 16 Jul 2015 16:01:51 +0100 Subject: [PATCH 10/10] Formatting + scrut updates --- html/includes/graphs/smokeping/in.inc.php | 4 ++-- html/pages/device/latency.inc.php | 2 +- includes/common.php | 22 ++++++++++++---------- scripts/gen_smokeping.php | 14 +++++++------- 4 files changed, 22 insertions(+), 20 deletions(-) diff --git a/html/includes/graphs/smokeping/in.inc.php b/html/includes/graphs/smokeping/in.inc.php index 382bd7928..dda61c9dd 100644 --- a/html/includes/graphs/smokeping/in.inc.php +++ b/html/includes/graphs/smokeping/in.inc.php @@ -35,14 +35,14 @@ if ($src['hostname'] == $config['own_hostname']) { $filename = $filename_dir . $device['hostname'].'.rrd'; if (!file_exists($filename_dir.$device['hostname'].'.rrd')) { // Try with dots in hostname replaced by underscores - $filename = $filename_dir . str_replace(".", "_", $device['hostname']).'.rrd'; + $filename = $filename_dir . str_replace('.', '_', $device['hostname']).'.rrd'; } } else { $filename = $filename_dir . $device['hostname'] .'~'.$src['hostname'].'.rrd'; if (!file_exists($filename)) { // Try with dots in hostname replaced by underscores - $filename = $filename_dir . str_replace(".", "-", $device['hostname']) .'~'.$src['hostname'].'.rrd'; + $filename = $filename_dir . str_replace('.', '-', $device['hostname']) .'~'.$src['hostname'].'.rrd'; } } diff --git a/html/pages/device/latency.inc.php b/html/pages/device/latency.inc.php index d18382356..bc3f962e4 100644 --- a/html/pages/device/latency.inc.php +++ b/html/pages/device/latency.inc.php @@ -71,7 +71,7 @@ if ($vars['view'] == 'incoming') { } if (is_numeric($host['device_id'])) { echo ''; - echo('

'.generate_device_link($dest).'

'); + echo '

'.generate_device_link($dest).'

'; $graph_array['type'] = 'smokeping_in'; $graph_array['device'] = $device['device_id']; $graph_array['src'] = $host['device_id']; diff --git a/includes/common.php b/includes/common.php index 93d5afe67..58602d40a 100644 --- a/includes/common.php +++ b/includes/common.php @@ -701,21 +701,22 @@ function get_graph_subtypes($type) { function get_smokeping_files($device) { global $config; + $smokeping_files = array(); if (isset($config['smokeping']['dir'])) { - $smokeping_files = array(); $smokeping_dir = generate_smokeping_file($device); if ($handle = opendir($smokeping_dir)) { while (false !== ($file = readdir($handle))) { - if ($file != "." && $file != "..") { - if (eregi(".rrd", $file)) { - if (eregi("~", $file)) { - list($target,$slave) = explode("~", str_replace(".rrd", "", $file)); - $target = str_replace("_", ".", $target); + if ($file != '.' && $file != '..') { + if (eregi('.rrd', $file)) { + if (eregi('~', $file)) { + list($target,$slave) = explode('~', str_replace('.rrd', '', $file)); + $target = str_replace('_', '.', $target); $smokeping_files['in'][$target][$slave] = $file; $smokeping_files['out'][$slave][$target] = $file; - } else { - $target = str_replace(".rrd", "", $file); - $target = str_replace("_", ".", $target); + } + else { + $target = str_replace('.rrd', '', $file); + $target = str_replace('_', '.', $target); $smokeping_files['in'][$target][$config['own_hostname']] = $file; $smokeping_files['out'][$config['own_hostname']][$target] = $file; } @@ -731,7 +732,8 @@ function generate_smokeping_file($device,$file='') { global $config; if ($config['smokeping']['integration'] === true) { return $config['smokeping']['dir'] .'/'. $device['type'] .'/' . $file; - } else { + } + else { return $config['smokeping']['dir'] . '/' . $file; } } diff --git a/scripts/gen_smokeping.php b/scripts/gen_smokeping.php index ec10cab62..9421af137 100755 --- a/scripts/gen_smokeping.php +++ b/scripts/gen_smokeping.php @@ -22,14 +22,14 @@ title = Network Latency Grapher