opensourcemirror
/
LibreNMS
mirror of https://github.com/librenms/librenms.git
1
0
Fork 0
Code Releases Activity

Fixed smokeping graphs (#10415) 

* Remove duplicate code

* Fix smokeping rrd file discovery

* Fix Smokeping outgoing graphs
This commit is contained in:
Sander Steffann 2019-07-09 11:28:35 +02:00 committed by Neil Lathwood
parent 592b2ea432
commit 164f3a096a
3 changed files with 9 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -32,7 +32,7 @@ if ($width > '500') {
$filename_dir = generate_smokeping_file($device);
if ($src['hostname'] == Config::get('own_hostname')) {
$filename = $filename_dir . $device['hostname'].'.rrd';
if (!rrdtool_check_rrd_exists($filename_dir.$device['hostname'].'.rrd')) {
if (!rrdtool_check_rrd_exists($filename)) {
// Try with dots in hostname replaced by underscores
$filename = $filename_dir . str_replace('.', '_', $device['hostname']).'.rrd';
}

9
includes/html/graphs/smokeping/out.inc.php
View File

@ -29,17 +29,18 @@ 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_file($device);
if ($device['hostname'] == Config::get('own_hostname')) {
$filename = Config::get('smokeping.dir') . $dest['hostname'] . '.rrd';
$filename = $filename_dir . $dest['hostname'] . '.rrd';
if (!rrdtool_check_rrd_exists($filename)) {
// Try with dots in hostname replaced by underscores
$filename = Config::get('smokeping.dir') . str_replace('.', '_', $dest['hostname']) . '.rrd';
$filename = $filename_dir . str_replace('.', '_', $dest['hostname']) . '.rrd';
}
} else {
$filename = Config::get('smokeping.dir') . $dest['hostname'] . '~' . $device['hostname'] . '.rrd';
$filename = $filename_dir . $dest['hostname'] . '~' . $device['hostname'] . '.rrd';
if (!rrdtool_check_rrd_exists($filename)) {
// Try with dots in hostname replaced by underscores
$filename = Config::get('smokeping.dir') . str_replace('.', '_', $dest['hostname']) . '~' . $device['hostname'] . '.rrd';
$filename = $filename_dir . str_replace('.', '_', $dest['hostname']) . '~' . $device['hostname'] . '.rrd';
}
}

5
includes/html/pages/device/latency.inc.php
View File

@ -87,13 +87,14 @@ if ($vars['view'] == 'incoming') {
$graph_array['type'] = 'device_smokeping_out_all_avg';
$graph_array['device'] = $device['device_id'];
echo '<tr><td>';
echo '<h3>Aggregate</h3>';
echo '<h3>Average</h3>';
include 'includes/html/print-graphrow.inc.php';
echo '</td></tr>';
$graph_array['type'] = 'device_smokeping_out_all';
$graph_array['device'] = $device['device_id'];
$graph_array['legend'] = 'no';
echo '<tr><td>';
echo '<h3>Aggregate</h3>';
@ -106,7 +107,7 @@ if ($vars['view'] == 'incoming') {
asort($smokeping_files['out'][$device['hostname']]);
foreach ($smokeping_files['out'][$device['hostname']] as $host) {
$hostname = str_replace('.rrd', '', $host);
$hostname = str_replace('_', '.', str_replace('.rrd', '', $host));
list($hostname) = explode('~', $hostname);
$host = device_by_name($hostname);
if (is_numeric($host['device_id'])) {