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

Merge pull request #3427 from adaniels21487/issue-3405-1

Browse Source 
Nagios Services - Status update
This commit is contained in:
Neil Lathwood
2016-04-26 13:34:37 +01:00
parent 7edf31ffd7 048b553926
commit 7066c27b0a
3 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
html/includes/common/device-summary-horiz.inc.php
View File

@@ -40,8 +40,8 @@ $temp_output .= '
<tr class="active">
<td><a href="services/">Services</a></td>
<td><a href="services/"><span>'.$services['count'].'</span></a></td>
<td><a href="services/state=up/view=details/"><span class="green">'.$services['up'].'</span></a></td>
<td><a href="services/state=down/view=details/"><span class="red"> '.$services['down'].'</span></a></td>
<td><a href="services/state=ok/view=details/"><span class="green">'.$services['up'].'</span></a></td>
<td><a href="services/state=critical/view=details/"><span class="red"> '.$services['down'].'</span></a></td>
<td><a href="services/ignore=1/view=details/"><span class="grey"> '.$services['ignored'].'</span></a></td>
<td><a href="services/disabled=1/view=details/"><span class="black"> '.$services['disabled'].'</span></a></td>
'.($config['summary_errors'] ? '<td>-</td>' : '').'

4
html/includes/common/device-summary-vert.inc.php
View File

@@ -31,7 +31,7 @@ $temp_output .= '
if ($config['show_services']) {
$temp_output .= '
<td><a href="services/view=details/state=up/"><span class="green">'. $services['up'] .'</span></a></td>
<td><a href="services/view=details/state=ok/"><span class="green">'. $services['up'] .'</span></a></td>
';
}
@@ -47,7 +47,7 @@ $temp_output .= '
if ($config['show_services']) {
$temp_output .= '
<td><a href="services/view=details/state=down/"><span class="red">'. $services['down'] .'</span></a></td>
<td><a href="services/view=details/state=critical/"><span class="red">'. $services['down'] .'</span></a></td>
';
}

8
includes/caches/services.inc.php
View File

@@ -2,8 +2,8 @@
if ($_SESSION['userlevel'] >= 5) {
$data['count'] = array( 'query' => 'SELECT COUNT(*) FROM services');
$data['up'] = array( 'query' => "SELECT COUNT(*) FROM services WHERE `service_ignore` = '0' AND `service_disabled` = '0' AND `service_status` = '1'");
$data['down'] = array( 'query' => "SELECT COUNT(*) FROM services WHERE `service_ignore` = '0' AND `service_disabled` = '0' AND `service_status` = '0'");
$data['up'] = array( 'query' => "SELECT COUNT(*) FROM services WHERE `service_ignore` = '0' AND `service_disabled` = '0' AND `service_status` = '0'");
$data['down'] = array( 'query' => "SELECT COUNT(*) FROM services WHERE `service_ignore` = '0' AND `service_disabled` = '0' AND `service_status` = '2'");
$data['ignored'] = array( 'query' => "SELECT COUNT(*) FROM services WHERE `service_ignore` = '1' AND `service_disabled` = '0'");
$data['disabled'] = array( 'query' => "SELECT COUNT(*) FROM services WHERE `service_disabled` = '1'");
}
@@ -14,12 +14,12 @@ else {
);
$data['up'] = array(
'query' => "SELECT COUNT(*) FROM services AS S, devices AS D, devices_perms AS P WHERE P.`user_id` = ? AND P.`device_id` = D.`device_id` AND S.`device_id` = D.`device_id` AND S.`service_ignore` = '0' AND S.`service_disabled` = '0' AND S.`service_status` = '1'",
'query' => "SELECT COUNT(*) FROM services AS S, devices AS D, devices_perms AS P WHERE P.`user_id` = ? AND P.`device_id` = D.`device_id` AND S.`device_id` = D.`device_id` AND S.`service_ignore` = '0' AND S.`service_disabled` = '0' AND S.`service_status` = '0'",
'params' => array($_SESSION['user_id']),
);
$data['down'] = array(
'query' => "SELECT COUNT(*) FROM services AS S, devices AS D, devices_perms AS P WHERE P.`user_id` = ? AND P.`device_id` = D.`device_id` AND S.`device_id` = D.`device_id` AND S.`service_ignore` = '0' AND S.`service_disabled` = '0' AND S.`service_status` = '0'",
'query' => "SELECT COUNT(*) FROM services AS S, devices AS D, devices_perms AS P WHERE P.`user_id` = ? AND P.`device_id` = D.`device_id` AND S.`device_id` = D.`device_id` AND S.`service_ignore` = '0' AND S.`service_disabled` = '0' AND S.`service_status` = '2'",
'params' => array($_SESSION['user_id']),
);