From f06b0ffb6604d3714f34386a9a415f1f55f88b13 Mon Sep 17 00:00:00 2001 From: crcro Date: Tue, 27 Sep 2016 23:07:42 +0300 Subject: [PATCH] fix: device with no uptime (#4625) fix: Add checks for devices with no uptime over snmp #4587 --- html/pages/front/default.php | 2 +- includes/definitions.inc.php | 1 + includes/polling/core.inc.php | 2 +- 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/html/pages/front/default.php b/html/pages/front/default.php index e1244e4b31..0789ca3221 100644 --- a/html/pages/front/default.php +++ b/html/pages/front/default.php @@ -116,7 +116,7 @@ if (isset($config['enable_bgp']) && $config['enable_bgp']) { } // Device rebooted boxes -if (filter_var($config['uptime_warning'], FILTER_VALIDATE_FLOAT) !== false && $config['uptime_warning'] > 0) { +if (filter_var($config['uptime_warning'], FILTER_VALIDATE_FLOAT) !== false && $config['uptime_warning'] > 0 && $config['os'][$os]['bad_uptime'] !== true) { if (is_admin() === true || is_read() === true) { $sql = "SELECT * FROM `devices` AS D WHERE D.status = '1' AND D.uptime > 0 AND D.uptime < '".$config['uptime_warning']."' AND D.ignore = 0 LIMIT ".$config['front_page_down_box_limit']; } else { diff --git a/includes/definitions.inc.php b/includes/definitions.inc.php index 0b18de0a67..723888b3dd 100644 --- a/includes/definitions.inc.php +++ b/includes/definitions.inc.php @@ -1903,6 +1903,7 @@ $config['os'][$os]['icon'] = 'meraki'; $config['os'][$os]['ifname'] = 1; $config['os'][$os]['over'][0]['graph'] = 'device_bits'; $config['os'][$os]['over'][0]['text'] = 'Device Traffic'; +$config['os'][$os]['bad_uptime'] = true; $os = 'merakims'; $config['os'][$os]['text'] = 'Meraki Switch'; diff --git a/includes/polling/core.inc.php b/includes/polling/core.inc.php index 80e69f3b65..86c1eb952d 100644 --- a/includes/polling/core.inc.php +++ b/includes/polling/core.inc.php @@ -50,7 +50,7 @@ if ($device["os"] != "edgeswitch") { } } -if (is_numeric($uptime)) { +if (is_numeric($uptime) && $config['os'][$os]['bad_uptime'] !== true) { if ($uptime < $device['uptime']) { log_event('Device rebooted after '.formatUptime($device['uptime']), $device, 'reboot', $device['uptime']); }