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

Mark Devices in Maintenance Mode (#11092)

Browse Source 
* Mark Devices in Maintenance Mode

* code climate fix
This commit is contained in:
SourceDoctor
2020-02-02 15:33:01 +01:00
committed by GitHub
parent ee72fa4d3c
commit c07678d55f
6 changed files with 38 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/Http/Controllers/Table/DeviceController.php
View File

@ -32,6 +32,7 @@ use LibreNMS\Config;
use LibreNMS\Util\Rewrite;
use LibreNMS\Util\Url;
use LibreNMS\Util\Time;
use LibreNMS\Alert\AlertUtil;
class DeviceController extends TableController
{
@ -127,6 +128,7 @@ class DeviceController extends TableController
return [
'extra' => $this->getLabel($device),
'status' => $this->getStatus($device),
'maintenance' => AlertUtil::isMaintenance($device->device_id),
'icon' => '<img src="' . asset($device->icon) . '" title="' . pathinfo($device->icon, PATHINFO_FILENAME) . '">',
'hostname' => $this->getHostname($device),
'metrics' => $this->getMetrics($device),

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

@ -106,7 +106,7 @@ class AvailabilityMapController extends WidgetController
// process status
$uptime_warn = Config::get('uptime_warning', 84600);
$totals = ['warn' => 0, 'up' => 0, 'down' => 0, 'ignored' => 0, 'disabled' => 0];
$totals = ['warn' => 0, 'up' => 0, 'down' => 0, 'maintenance' => 0, 'ignored' => 0, 'disabled' => 0];
foreach ($devices as $device) {
if ($device->disabled) {
$totals['disabled']++;
@ -131,6 +131,11 @@ class AvailabilityMapController extends WidgetController
$device->stateName = 'down';
$device->labelClass = 'label-danger';
}
if ($device->isUnderMaintenance()) {
$device->labelClass = 'label-default';
$totals['maintenance']++;
}
}
return [$devices, $totals];
}

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

@ -12,6 +12,7 @@
* the source code distribution for details.
*/
use LibreNMS\Alert\AlertUtil;
use LibreNMS\Config;
$mode = Session::get('map_view', 0);
@ -146,6 +147,7 @@ if (defined('SHOW_SETTINGS')) {
$host_up_count = 0;
$host_warn_count = 0;
$host_down_count = 0;
$host_maintenance_count = 0;
$host_disable_notify_count = 0;
$host_disabled_count = 0;
$service_up_count = 0;
@ -221,6 +223,12 @@ if (defined('SHOW_SETTINGS')) {
$deviceLabelOld = 'availability-map-oldview-box-down';
$host_down_count++;
}
if (AlertUtil::isMaintenance($device['device_id'])) {
$deviceLabel = 'label-default';
$host_maintenance_count++;
}
$device_system_name = format_hostname($device);
if (Config::get('webui.availability_map_compact') == 0) {
@ -382,8 +390,11 @@ if (defined('SHOW_SETTINGS')) {
<span>Total hosts</span>
<span class="label label-success label-font-border label-border">up: '.$host_up_count.'</span>
<span class="label label-warning label-font-border label-border">warn: '.$host_warn_count.'</span>
<span class="label label-danger label-font-border label-border">down: '.$host_down_count.'</span>
'.$disabled_ignored_header.'
<span class="label label-danger label-font-border label-border">down: '.$host_down_count.'</span>';
if ($host_maintenance_count) {
$temp_header[] = '<span class="label label-default label-font-border label-border">maintenance: '.$host_maintenance_count.'</span>';
}
$temp_header[] = $disabled_ignored_header.'
</div>';
}

5
includes/html/device-header.inc.php
View File

@ -1,5 +1,6 @@
<?php
use LibreNMS\Alert\AlertUtil;
use LibreNMS\Config;
echo getLogoTag($device, 'device-icon-header pull-left') .'
@ -11,6 +12,10 @@ if ($host_id > 0) {
<a href="'.generate_url(array('page'=>'device','device'=>$host_id)).'"><i class="fa fa-server fa-fw fa-lg"></i></a>';
}
if (AlertUtil::isMaintenance($device['device_id'])) {
echo ('<span title="Scheduled Maintenance" class="glyphicon glyphicon-wrench"></span>');
}
echo '
<span style="font-size: 20px;">'.generate_device_link($device).'</span><br />
'.generate_link($device['location'], array('page' => 'devices', 'location' => $device['location'])) .'

9
includes/html/pages/devices.inc.php
View File

@ -13,6 +13,8 @@
* @author LibreNMS Contributors
*/
use LibreNMS\Alert\AlertUtil;
$pagetitle[] = "Devices";
if (!isset($vars['format'])) {
@ -298,6 +300,7 @@ if ($format == "graph") {
<tr>
<th data-column-id="status" data-formatter="status" data-width="7px" data-searchable="false">&nbsp;</th>
<th data-column-id="icon" data-width="70px" data-searchable="false" data-formatter="icon" data-visible="<?php echo $detailed ? 'true' : 'false'; ?>">Vendor</th>
<th data-column-id="maintenance" data-width="5px" data-searchable="false" data-formatter="maintenance" data-visible="<?php echo $detailed ? 'true' : 'false'; ?>"></th>
<th data-column-id="hostname" data-order="asc" <?php echo $detailed ? 'data-formatter="device"' : ''; ?>>Device</th>
<th data-column-id="metrics" data-width="<?php echo $detailed ? '100px' : '150px'; ?>" data-sortable="false" data-searchable="false" data-visible="<?php echo $detailed ? 'true' : 'false'; ?>">Metrics</th>
<th data-column-id="hardware">Platform</th>
@ -322,6 +325,12 @@ if ($format == "graph") {
"icon": function (column, row) {
return "<span class=\"device-table-icon\">" + row.icon + "</span>";
},
"maintenance": function (column, row) {
if (row.maintenance) {
return "<span title=\"Scheduled Maintenance\" class=\"glyphicon glyphicon-wrench\"></span>";
}
return '';
},
"device": function (column, row) {
return "<span>" + row.hostname + "</span>";
},

3
resources/views/widgets/availability-map.blade.php
View File

@ -8,6 +8,9 @@
<a href="{{ url('devices/state=up') }}"><span class="label label-success label-font-border label-border">@lang('up'): {{ $device_totals['up'] }}</span></a>
<span class="label label-warning label-font-border label-border">@lang('warn'): {{ $device_totals['warn'] }}</span>
<a href="{{ url('devices/state=down') }}"><span class="label label-danger label-font-border label-border">@lang('down'): {{ $device_totals['down'] }}</span></a>
@if($device_totals['maintenance'])
<span class="label label-default label-font-border label-border">@lang('maintenance'): {{ $device_totals['maintenance'] }}</span>
@endif
</div>
@endif