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

show never polled information (#15341)

Browse Source
This commit is contained in:
SourceDoctor
2023-09-24 18:10:11 +02:00
committed by GitHub
parent 88eee297c4
commit c0a233700c
2 changed files with 14 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
app/Http/Controllers/Widgets/AvailabilityMapController.php
View File

@@ -221,7 +221,12 @@ class AvailabilityMapController extends WidgetController
private function getDeviceTooltip(Device $device, string $state_name): string
{
$tooltip = $device->displayName();
$time = $device->formatDownUptime(true);
if (! $device->status && ! $device->last_polled) {
$time = __('Never polled');
} else {
$time = $device->formatDownUptime(true);
}
if ($time) {
$tooltip .= ' - ' . ($state_name == 'down' ? 'downtime ' : '') . $time;

10
includes/html/dev-overview-data.inc.php
View File

@@ -113,8 +113,14 @@ if (! empty($device['last_discovered'])) {
echo "<div class='row'><div class='col-sm-4'>$last_discovered_text</div><div class='col-sm-8' title='$last_discovered_text at " . $device['last_discovered'] . "'>$last_discovered</div></div>";
}
$uptime = (\LibreNMS\Util\Time::formatInterval($device['status'] ? $device['uptime'] : time() - strtotime($device['last_polled'])));
$uptime_text = ($device['status'] ? 'Uptime' : 'Downtime');
if (! $device['status'] && ! $device['last_polled']) {
$uptime = __('Never polled');
$uptime_text = 'Uptime';
} else {
$uptime = (\LibreNMS\Util\Time::formatInterval($device['status'] ? $device['uptime'] : time() - strtotime($device['last_polled'])));
$uptime_text = ($device['status'] ? 'Uptime' : 'Downtime');
}
if ($uptime) {
echo "<div class='row'><div class='col-sm-4'>$uptime_text</div><div class='col-sm-8'>$uptime</div></div>";