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

Fix latency tab bugs (#11787)

Browse Source 
when there is no latency data
fix smokeping error
This commit is contained in:
Tony Murray
2020-06-07 23:18:18 -05:00
committed by GitHub
parent 7b93b386a3
commit 147ba0f00d
2 changed files with 9 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
LibreNMS/Util/Smokeping.php
+2 -2
View File
@@ -48,11 +48,11 @@ class Smokeping
{
if (is_null($this->files) && Config::has('smokeping.dir')) {
$dir = $this->generateFileName();
if (is_dir($dir)) {
if (is_dir($dir) && is_readable($dir)) {
foreach (array_diff(scandir($dir), ['.', '..']) as $file) {
if (stripos($file, '.rrd') !== false) {
if (strpos($file, '~') !== false) {
list($target, $slave) = explode('~', $this->filenameToHostname($file));
[$target, $slave] = explode('~', $this->filenameToHostname($file));
$this->files['in'][$target][$slave] = $file;
$this->files['out'][$slave][$target] = $file;
} else {
app/Http/Controllers/Device/Tabs/LatencyController.php
+7 -2
View File
@@ -37,7 +37,8 @@ class LatencyController implements DeviceTab
{
public function visible(Device $device): bool
{
return true;
return Config::get('smokeping.integration') || DB::table('device_perf')
->where('device_id', $device->device_id)->exists();
}
public function slug(): string
@@ -61,7 +62,11 @@ class LatencyController implements DeviceTab
$to = Request::get('dtpickerto', Carbon::now()->format(Config::get('dateformat.byminute')));
$perf = $this->fetchPerfData($device, $from, $to);
$duration = abs(strtotime($perf->first()->date) - strtotime($perf->last()->date)) * 1000;
$duration = $perf && $perf->isNotEmpty()
? abs(strtotime($perf->first()->date) - strtotime($perf->last()->date)) * 1000
: 0;
$smokeping = new Smokeping($device);
$smokeping_tabs = [];