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

looks like services can have warning also, changed the warning labels to warn for readability

Browse Source
This commit is contained in:
crcro
2016-08-13 16:38:47 +03:00
parent 50cf4f1b7f
commit 889c02dd2a
4 changed files with 16 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
html/css/dark.css
View File

@@ -118,7 +118,7 @@
border:1px solid #D9534F; border:1px solid #D9534F;
} }
.device-availability.warning { .device-availability.warn, .service-availability.warn {
border:1px solid #FFB733; border:1px solid #FFB733;
} }

2
html/css/light.css
View File

@@ -114,7 +114,7 @@
border:1px solid #D9534F; border:1px solid #D9534F;
} }
.device-availability.warning { .device-availability.warn, .service-availability.warn {
border:1px solid #FFB733; border:1px solid #FFB733;
} }

2
html/css/mono.css
View File

@@ -118,7 +118,7 @@
border:1px solid #D9534F; border:1px solid #D9534F;
} }
.device-availability.warning { .device-availability.warn, .service-availability.warn {
border:1px solid #FFB733; border:1px solid #FFB733;
} }

17
html/includes/common/availability-map.inc.php
View File

@@ -50,6 +50,7 @@ if (defined('show_settings')) {
$host_warn_count = 0; $host_warn_count = 0;
$host_down_count = 0; $host_down_count = 0;
$service_up_count = 0; $service_up_count = 0;
$service_warn_count = 0;
$service_down_count = 0; $service_down_count = 0;
if ($mode == 0 || $mode == 2) { if ($mode == 0 || $mode == 2) {
@@ -69,7 +70,7 @@ if (defined('show_settings')) {
foreach (dbFetchRows($sql, $param) as $device) { foreach (dbFetchRows($sql, $param) as $device) {
if ($device['status'] == '1') { if ($device['status'] == '1') {
if (($device['uptime'] < $config['uptime_warning']) && ($device['uptime'] != '0')) { if (($device['uptime'] < $config['uptime_warning']) && ($device['uptime'] != '0')) {
$deviceState = 'warning'; $deviceState = 'warn';
$deviceLabel = 'label-warning'; $deviceLabel = 'label-warning';
$host_warn_count++; $host_warn_count++;
} else { } else {
@@ -109,10 +110,14 @@ if (defined('show_settings')) {
$serviceLabel = "label-success"; $serviceLabel = "label-success";
$serviceState = "up"; $serviceState = "up";
$service_up_count++; $service_up_count++;
} elseif ($service['service_status'] == '1') {
$serviceLabel = "label-warning";
$serviceState = "warn";
$service_warn_count++;
} else { } else {
$serviceLabel = "label-danger"; $serviceLabel = "label-danger";
$serviceState = "down"; $serviceState = "down";
$service_down_count += 1; $service_down_count++;
} }
if ($directpage == "yes") { if ($directpage == "yes") {
@@ -155,7 +160,7 @@ if (defined('show_settings')) {
$temp_header[] = '<div class="small page-availability-report-entry"><span>' . $host_up_count . '</span></div>'; $temp_header[] = '<div class="small page-availability-report-entry"><span>' . $host_up_count . '</span></div>';
$temp_header[] = '</div>'; $temp_header[] = '</div>';
$temp_header[] = '<div style="float:right;">'; $temp_header[] = '<div style="float:right;">';
$temp_header[] = '<div class="small page-availability-report-entry"><label class="label label-warning label-font-border">warning</label></div>'; $temp_header[] = '<div class="small page-availability-report-entry"><label class="label label-warning label-font-border">warn</label></div>';
$temp_header[] = '<div class="small page-availability-report-entry"><span>' . $host_warn_count . '</span></div>'; $temp_header[] = '<div class="small page-availability-report-entry"><span>' . $host_warn_count . '</span></div>';
$temp_header[] = '</div>'; $temp_header[] = '</div>';
$temp_header[] = '<div style="float:right;">'; $temp_header[] = '<div style="float:right;">';
@@ -177,12 +182,16 @@ if (defined('show_settings')) {
$temp_header[] = '<div class="small page-availability-report-entry"><span>' . $service_up_count . '</span></div>'; $temp_header[] = '<div class="small page-availability-report-entry"><span>' . $service_up_count . '</span></div>';
$temp_header[] = '</div>'; $temp_header[] = '</div>';
$temp_header[] = '<div style="float:right;">'; $temp_header[] = '<div style="float:right;">';
$temp_header[] = '<div class="small page-availability-report-entry"><label class="label label-warning label-font-border">warn</label></div>';
$temp_header[] = '<div class="small page-availability-report-entry"><span>' . $service_warn_count . '</span></div>';
$temp_header[] = '</div>';
$temp_header[] = '<div style="float:right;">';
$temp_header[] = '<div class="small page-availability-report-entry"><label class="label label-danger label-font-border">down</label></div>'; $temp_header[] = '<div class="small page-availability-report-entry"><label class="label label-danger label-font-border">down</label></div>';
$temp_header[] = '<div class="small page-availability-report-entry"><span>' . $service_down_count . '</span></div>'; $temp_header[] = '<div class="small page-availability-report-entry"><span>' . $service_down_count . '</span></div>';
$temp_header[] = '</div>'; $temp_header[] = '</div>';
$temp_header[] = '</div>'; $temp_header[] = '</div>';
} else { } else {
$temp_header[] = '<div class="widget-availability-service">Total services <label class="label label-success label-font-border">up</label> '.$service_up_count.' <label class="label label-danger label-font-border">down</label> '.$service_down_count.'</div>'; $temp_header[] = '<div class="widget-availability-service">Total services <label class="label label-success label-font-border">up</label> '.$service_up_count.' <label class="label label-warning label-font-border">warn</label> '.$service_warn_count.' <label class="label label-danger label-font-border">down</label> '.$service_down_count.'</div>';
} }
} }