From 067fa022632e0e656d2466e89a4e784b149a8cd6 Mon Sep 17 00:00:00 2001 From: Johannes Meyer Date: Fri, 7 Mar 2014 08:59:20 +0100 Subject: [PATCH] Split and merge status summary in tactical overview --- .../controllers/TacticalController.php | 96 ++--- .../tactical/components/ok_hosts.phtml | 113 ++++++ .../servicestatesummarybyhoststate.phtml | 32 +- .../tactical/components/problem_hosts.phtml | 175 ++++++++++ .../tactical/components/statussummary.phtml | 327 ------------------ .../views/scripts/tactical/index.phtml | 3 +- .../Backend/Ido/Query/StatusSummaryQuery.php | 96 ++--- .../Monitoring/DataView/StatusSummary.php | 96 ++--- 8 files changed, 402 insertions(+), 536 deletions(-) create mode 100644 modules/monitoring/application/views/scripts/tactical/components/ok_hosts.phtml create mode 100644 modules/monitoring/application/views/scripts/tactical/components/problem_hosts.phtml delete mode 100644 modules/monitoring/application/views/scripts/tactical/components/statussummary.phtml diff --git a/modules/monitoring/application/controllers/TacticalController.php b/modules/monitoring/application/controllers/TacticalController.php index edfb1aa12..0fd636278 100644 --- a/modules/monitoring/application/controllers/TacticalController.php +++ b/modules/monitoring/application/controllers/TacticalController.php @@ -27,70 +27,38 @@ class Monitoring_TacticalController extends MonitoringController 'hosts_unreachable_passive', 'hosts_unreachable_not_checked', - 'services_ok_on_up_hosts', - 'services_ok_not_checked_on_up_hosts', - 'services_pending_on_up_hosts', - 'services_pending_not_checked_on_up_hosts', - 'services_warning_on_up_hosts', - 'services_warning_unhandled_on_up_hosts', - 'services_warning_passive_on_up_hosts', - 'services_warning_not_checked_on_up_hosts', - 'services_critical_on_up_hosts', - 'services_critical_unhandled_on_up_hosts', - 'services_critical_passive_on_up_hosts', - 'services_critical_not_checked_on_up_hosts', - 'services_unknown_on_up_hosts', - 'services_unknown_unhandled_on_up_hosts', - 'services_unknown_passive_on_up_hosts', - 'services_unknown_not_checked_on_up_hosts', - 'services_ok_on_down_hosts', - 'services_ok_not_checked_on_down_hosts', - 'services_pending_on_down_hosts', - 'services_pending_not_checked_on_down_hosts', - 'services_warning_on_down_hosts', - 'services_warning_unhandled_on_down_hosts', - 'services_warning_passive_on_down_hosts', - 'services_warning_not_checked_on_down_hosts', - 'services_critical_on_down_hosts', - 'services_critical_unhandled_on_down_hosts', - 'services_critical_passive_on_down_hosts', - 'services_critical_not_checked_on_down_hosts', - 'services_unknown_on_down_hosts', - 'services_unknown_unhandled_on_down_hosts', - 'services_unknown_passive_on_down_hosts', - 'services_unknown_not_checked_on_down_hosts', - 'services_ok_on_unreachable_hosts', - 'services_ok_not_checked_on_unreachable_hosts', - 'services_pending_on_unreachable_hosts', - 'services_pending_not_checked_on_unreachable_hosts', - 'services_warning_on_unreachable_hosts', - 'services_warning_unhandled_on_unreachable_hosts', - 'services_warning_passive_on_unreachable_hosts', - 'services_warning_not_checked_on_unreachable_hosts', - 'services_critical_on_unreachable_hosts', - 'services_critical_unhandled_on_unreachable_hosts', - 'services_critical_passive_on_unreachable_hosts', - 'services_critical_not_checked_on_unreachable_hosts', - 'services_unknown_on_unreachable_hosts', - 'services_unknown_unhandled_on_unreachable_hosts', - 'services_unknown_passive_on_unreachable_hosts', - 'services_unknown_not_checked_on_unreachable_hosts', - 'services_ok_on_pending_hosts', - 'services_ok_not_checked_on_pending_hosts', - 'services_pending_on_pending_hosts', - 'services_pending_not_checked_on_pending_hosts', - 'services_warning_on_pending_hosts', - 'services_warning_unhandled_on_pending_hosts', - 'services_warning_passive_on_pending_hosts', - 'services_warning_not_checked_on_pending_hosts', - 'services_critical_on_pending_hosts', - 'services_critical_unhandled_on_pending_hosts', - 'services_critical_passive_on_pending_hosts', - 'services_critical_not_checked_on_pending_hosts', - 'services_unknown_on_pending_hosts', - 'services_unknown_unhandled_on_pending_hosts', - 'services_unknown_passive_on_pending_hosts', - 'services_unknown_not_checked_on_pending_hosts', + 'services_ok_on_ok_hosts', + 'services_ok_not_checked_on_ok_hosts', + 'services_pending_on_ok_hosts', + 'services_pending_not_checked_on_ok_hosts', + 'services_warning_on_ok_hosts', + 'services_warning_unhandled_on_ok_hosts', + 'services_warning_passive_on_ok_hosts', + 'services_warning_not_checked_on_ok_hosts', + 'services_critical_on_ok_hosts', + 'services_critical_unhandled_on_ok_hosts', + 'services_critical_passive_on_ok_hosts', + 'services_critical_not_checked_on_ok_hosts', + 'services_unknown_on_ok_hosts', + 'services_unknown_unhandled_on_ok_hosts', + 'services_unknown_passive_on_ok_hosts', + 'services_unknown_not_checked_on_ok_hosts', + 'services_ok_on_problem_hosts', + 'services_ok_not_checked_on_problem_hosts', + 'services_pending_on_problem_hosts', + 'services_pending_not_checked_on_problem_hosts', + 'services_warning_on_problem_hosts', + 'services_warning_unhandled_on_problem_hosts', + 'services_warning_passive_on_problem_hosts', + 'services_warning_not_checked_on_problem_hosts', + 'services_critical_on_problem_hosts', + 'services_critical_unhandled_on_problem_hosts', + 'services_critical_passive_on_problem_hosts', + 'services_critical_not_checked_on_problem_hosts', + 'services_unknown_on_problem_hosts', + 'services_unknown_unhandled_on_problem_hosts', + 'services_unknown_passive_on_problem_hosts', + 'services_unknown_not_checked_on_problem_hosts', 'hosts_active', 'hosts_passive', diff --git a/modules/monitoring/application/views/scripts/tactical/components/ok_hosts.phtml b/modules/monitoring/application/views/scripts/tactical/components/ok_hosts.phtml new file mode 100644 index 000000000..9b94d0d0d --- /dev/null +++ b/modules/monitoring/application/views/scripts/tactical/components/ok_hosts.phtml @@ -0,0 +1,113 @@ +
+

translate('OK Hosts'); ?>

+
+ + + + + + + + + + + + + +
translate('Hosts'); ?>translate('Services'); ?>
+statusSummary->hosts_up): ?> +
+ + statusSummary->hosts_up; ?> UP + +statusSummary->hosts_up_not_checked): ?> + + statusSummary->hosts_up_not_checked > 1) { + printf( + $this->translate('%d are not checked at all'), + $this->statusSummary->hosts_up_not_checked + ); + } else { + printf( + $this->translate('%d is not checked at all'), + $this->statusSummary->hosts_up_not_checked + ); + } + ?> + + +
+ +statusSummary->hosts_pending): ?> +
+ + statusSummary->hosts_pending; ?> PENDING + +statusSummary->hosts_pending_not_checked): ?> + + statusSummary->hosts_pending_not_checked > 1) { + printf( + $this->translate('%d are not checked at all'), + $this->statusSummary->hosts_pending_not_checked + ); + } else { + printf( + $this->translate('%d is not checked at all'), + $this->statusSummary->hosts_pending_not_checked + ); + } + ?> + + +
+ + 		+statusSummary->hosts_up || $this->statusSummary->hosts_pending): ?> + partial( + 'tactical/components/parts/servicestatesummarybyhoststate.phtml', + array( + 'host_problem' => 0, + 'services_ok' => $this->statusSummary->services_ok_on_ok_hosts, + 'services_ok_not_checked' => $this->statusSummary->services_ok_not_checked_on_ok_hosts, + 'services_pending' => $this->statusSummary->services_pending_on_ok_hosts, + 'services_pending_not_checked' => $this->statusSummary->services_pending_not_checked_on_ok_hosts, + 'services_warning' => $this->statusSummary->services_warning_on_ok_hosts, + 'services_warning_unhandled' => $this->statusSummary->services_warning_unhandled_on_ok_hosts, + 'services_warning_passive' => $this->statusSummary->services_warning_passive_on_ok_hosts, + 'services_warning_not_checked' => $this->statusSummary->services_warning_not_checked_on_ok_hosts, + 'services_critical' => $this->statusSummary->services_critical_on_ok_hosts, + 'services_critical_unhandled' => $this->statusSummary->services_critical_unhandled_on_ok_hosts, + 'services_critical_passive' => $this->statusSummary->services_critical_passive_on_ok_hosts, + 'services_critical_not_checked' => $this->statusSummary->services_critical_not_checked_on_ok_hosts, + 'services_unknown' => $this->statusSummary->services_unknown_on_ok_hosts, + 'services_unknown_unhandled' => $this->statusSummary->services_unknown_unhandled_on_ok_hosts, + 'services_unknown_passive' => $this->statusSummary->services_unknown_passive_on_ok_hosts, + 'services_unknown_not_checked' => $this->statusSummary->services_unknown_not_checked_on_ok_hosts + ) + ); ?> + +
+
+
diff --git a/modules/monitoring/application/views/scripts/tactical/components/parts/servicestatesummarybyhoststate.phtml b/modules/monitoring/application/views/scripts/tactical/components/parts/servicestatesummarybyhoststate.phtml index 61d384eb5..f2ebc1f8a 100644 --- a/modules/monitoring/application/views/scripts/tactical/components/parts/servicestatesummarybyhoststate.phtml +++ b/modules/monitoring/application/views/scripts/tactical/components/parts/servicestatesummarybyhoststate.phtml @@ -2,14 +2,14 @@
CRITICAL translate('Unhandled'); ?> @@ -19,7 +19,7 @@ 'monitoring/list/services', array( 'service_state' => 2, - 'host_state' => $hostState, + 'host_problem' => $host_problem, 'service_active_checks_enabled' => 0, 'service_passive_checks_enabled' => 1 ) @@ -44,7 +44,7 @@ 'monitoring/list/services', array( 'service_state' => 2, - 'host_state' => $hostState, + 'host_problem' => $host_problem, 'service_active_checks_enabled' => 0, 'service_passive_checks_enabled' => 0 ) @@ -70,14 +70,14 @@
WARNING translate('Unhandled'); ?> @@ -87,7 +87,7 @@ 'monitoring/list/services', array( 'service_state' => 1, - 'host_state' => $hostState, + 'host_problem' => $host_problem, 'service_active_checks_enabled' => 0, 'service_passive_checks_enabled' => 1 ) @@ -112,7 +112,7 @@ 'monitoring/list/services', array( 'service_state' => 1, - 'host_state' => $hostState, + 'host_problem' => $host_problem, 'service_active_checks_enabled' => 0, 'service_passive_checks_enabled' => 0 ) @@ -138,14 +138,14 @@
UNKNOWN translate('Unhandled'); ?> @@ -155,7 +155,7 @@ 'monitoring/list/services', array( 'service_state' => 3, - 'host_state' => $hostState, + 'host_problem' => $host_problem, 'service_active_checks_enabled' => 0, 'service_passive_checks_enabled' => 1 ) @@ -180,7 +180,7 @@ 'monitoring/list/services', array( 'service_state' => 3, - 'host_state' => $hostState, + 'host_problem' => $host_problem, 'service_active_checks_enabled' => 0, 'service_passive_checks_enabled' => 0 ) @@ -206,7 +206,7 @@
OK @@ -215,7 +215,7 @@ 'monitoring/list/services', array( 'service_state' => 0, - 'host_state' => $hostState, + 'host_problem' => $host_problem, 'service_active_checks_enabled' => 0, 'service_passive_checks_enabled' => 0 ) @@ -241,7 +241,7 @@
PENDING @@ -250,7 +250,7 @@ 'monitoring/list/services', array( 'service_state' => 99, - 'host_state' => $hostState, + 'host_problem' => $host_problem, 'service_active_checks_enabled' => 0, 'service_passive_checks_enabled' => 0 ) diff --git a/modules/monitoring/application/views/scripts/tactical/components/problem_hosts.phtml b/modules/monitoring/application/views/scripts/tactical/components/problem_hosts.phtml new file mode 100644 index 000000000..2600fca23 --- /dev/null +++ b/modules/monitoring/application/views/scripts/tactical/components/problem_hosts.phtml @@ -0,0 +1,175 @@ +
+

translate('Problem Hosts'); ?>

+
+ + + + + + + + + + + + + +
translate('Hosts'); ?>translate('Services'); ?>
+statusSummary->hosts_down): ?> +
+ + statusSummary->hosts_down; ?> DOWN + +statusSummary->hosts_down_unhandled): ?> + + statusSummary->hosts_down_unhandled . ' ' . $this->translate('Unhandled'); ?> + + +statusSummary->hosts_down_passive): ?> + + statusSummary->hosts_down_passive > 1) { + printf( + $this->translate('%d are passively checked'), + $this->statusSummary->hosts_down_passive + ); + } else { + printf( + $this->translate('%d is passively checked'), + $this->statusSummary->hosts_down_passive + ); + } + ?> + + +statusSummary->hosts_down_not_checked): ?> + + statusSummary->hosts_down_not_checked > 1) { + printf( + $this->translate('%d are not checked at all'), + $this->statusSummary->hosts_down_not_checked + ); + } else { + printf( + $this->translate('%d is not checked at all'), + $this->statusSummary->hosts_down_not_checked + ); + } + ?> + + +
+ +statusSummary->hosts_unreachable): ?> +
+ + statusSummary->hosts_unreachable; ?> UNREACHABLE + +statusSummary->hosts_unreachable_unhandled): ?> + + statusSummary->hosts_unreachable_unhandled . ' ' . $this->translate('Unhandled'); ?> + + +statusSummary->hosts_unreachable_passive): ?> + + statusSummary->hosts_unreachable_passive > 1) { + printf( + $this->translate('%d are passively checked'), + $this->statusSummary->hosts_unreachable_passive + ); + } else { + printf( + $this->translate('%d is passively checked'), + $this->statusSummary->hosts_unreachable_passive + ); + } + ?> + + +statusSummary->hosts_unreachable_not_checked): ?> + + statusSummary->hosts_unreachable_not_checked > 1) { + printf( + $this->translate('%d are not checked at all'), + $this->statusSummary->hosts_unreachable_not_checked + ); + } else { + printf( + $this->translate('%d is not checked at all'), + $this->statusSummary->hosts_unreachable_not_checked + ); + } + ?> + + +
+ + 		+ partial( + 'tactical/components/parts/servicestatesummarybyhoststate.phtml', + array( + 'host_problem' => 1, + 'services_ok' => $this->statusSummary->services_ok_on_problem_hosts, + 'services_ok_not_checked' => $this->statusSummary->services_ok_not_checked_on_problem_hosts, + 'services_pending' => $this->statusSummary->services_pending_on_problem_hosts, + 'services_pending_not_checked' => $this->statusSummary->services_pending_not_checked_on_problem_hosts, + 'services_warning' => $this->statusSummary->services_warning_on_problem_hosts, + 'services_warning_unhandled' => $this->statusSummary->services_warning_unhandled_on_problem_hosts, + 'services_warning_passive' => $this->statusSummary->services_warning_passive_on_problem_hosts, + 'services_warning_not_checked' => $this->statusSummary->services_warning_not_checked_on_problem_hosts, + 'services_critical' => $this->statusSummary->services_critical_on_problem_hosts, + 'services_critical_unhandled' => $this->statusSummary->services_critical_unhandled_on_problem_hosts, + 'services_critical_passive' => $this->statusSummary->services_critical_passive_on_problem_hosts, + 'services_critical_not_checked' => $this->statusSummary->services_critical_not_checked_on_problem_hosts, + 'services_unknown' => $this->statusSummary->services_unknown_on_problem_hosts, + 'services_unknown_unhandled' => $this->statusSummary->services_unknown_unhandled_on_problem_hosts, + 'services_unknown_passive' => $this->statusSummary->services_unknown_passive_on_problem_hosts, + 'services_unknown_not_checked' => $this->statusSummary->services_unknown_not_checked_on_problem_hosts + ) + ); ?> +
+
+
diff --git a/modules/monitoring/application/views/scripts/tactical/components/statussummary.phtml b/modules/monitoring/application/views/scripts/tactical/components/statussummary.phtml deleted file mode 100644 index 683a8e8c8..000000000 --- a/modules/monitoring/application/views/scripts/tactical/components/statussummary.phtml +++ /dev/null @@ -1,327 +0,0 @@ -
-

translate('Status Summary'); ?>

-
- - - - - - - - -statusSummary->hosts_up): ?> - - - - - -statusSummary->hosts_pending): ?> - - - - - -statusSummary->hosts_unreachable): ?> - - - - - -statusSummary->hosts_down): ?> - - - - - - -
translate('Hosts'); ?>translate('Services'); ?>
-
- - statusSummary->hosts_up; ?> UP - -statusSummary->hosts_up_not_checked): ?> - - statusSummary->hosts_up_not_checked > 1) { - printf( - $this->translate('%d are not checked at all'), - $this->statusSummary->hosts_up_not_checked - ); - } else { - printf( - $this->translate('%d is not checked at all'), - $this->statusSummary->hosts_up_not_checked - ); - } - ?> - - -
- 		- partial( - 'tactical/components/parts/servicestatesummarybyhoststate.phtml', - array( - 'hostState' => 0, - 'services_ok' => $this->statusSummary->services_ok_on_up_hosts, - 'services_ok_not_checked' => $this->statusSummary->services_ok_not_checked_on_up_hosts, - 'services_pending' => $this->statusSummary->services_pending_on_up_hosts, - 'services_pending_not_checked' => $this->statusSummary->services_pending_not_checked_on_up_hosts, - 'services_warning' => $this->statusSummary->services_warning_on_up_hosts, - 'services_warning_unhandled' => $this->statusSummary->services_warning_unhandled_on_up_hosts, - 'services_warning_passive' => $this->statusSummary->services_warning_passive_on_up_hosts, - 'services_warning_not_checked' => $this->statusSummary->services_warning_not_checked_on_up_hosts, - 'services_critical' => $this->statusSummary->services_critical_on_up_hosts, - 'services_critical_unhandled' => $this->statusSummary->services_critical_unhandled_on_up_hosts, - 'services_critical_passive' => $this->statusSummary->services_critical_passive_on_up_hosts, - 'services_critical_not_checked' => $this->statusSummary->services_critical_not_checked_on_up_hosts, - 'services_unknown' => $this->statusSummary->services_unknown_on_up_hosts, - 'services_unknown_unhandled' => $this->statusSummary->services_unknown_unhandled_on_up_hosts, - 'services_unknown_passive' => $this->statusSummary->services_unknown_passive_on_up_hosts, - 'services_unknown_not_checked' => $this->statusSummary->services_unknown_not_checked_on_up_hosts - ) - ); ?> -
-
- - statusSummary->hosts_pending; ?> PENDING - -statusSummary->hosts_pending_not_checked): ?> - - statusSummary->hosts_pending_not_checked > 1) { - printf( - $this->translate('%d are not checked at all'), - $this->statusSummary->hosts_pending_not_checked - ); - } else { - printf( - $this->translate('%d is not checked at all'), - $this->statusSummary->hosts_pending_not_checked - ); - } - ?> - - -
- 		- partial( - 'tactical/components/parts/servicestatesummarybyhoststate.phtml', - array( - 'hostState' => 99, - 'services_ok' => $this->statusSummary->services_ok_on_pending_hosts, - 'services_ok_not_checked' => $this->statusSummary->services_ok_not_checked_on_pending_hosts, - 'services_pending' => $this->statusSummary->services_pending_on_pending_hosts, - 'services_pending_not_checked' => $this->statusSummary->services_pending_not_checked_on_pending_hosts, - 'services_warning' => $this->statusSummary->services_warning_on_pending_hosts, - 'services_warning_unhandled' => $this->statusSummary->services_warning_unhandled_on_pending_hosts, - 'services_warning_passive' => $this->statusSummary->services_warning_passive_on_pending_hosts, - 'services_warning_not_checked' => $this->statusSummary->services_warning_not_checked_on_pending_hosts, - 'services_critical' => $this->statusSummary->services_critical_on_pending_hosts, - 'services_critical_unhandled' => $this->statusSummary->services_critical_unhandled_on_pending_hosts, - 'services_critical_passive' => $this->statusSummary->services_critical_passive_on_pending_hosts, - 'services_critical_not_checked' => $this->statusSummary->services_critical_not_checked_on_pending_hosts, - 'services_unknown' => $this->statusSummary->services_unknown_on_pending_hosts, - 'services_unknown_unhandled' => $this->statusSummary->services_unknown_unhandled_on_pending_hosts, - 'services_unknown_passive' => $this->statusSummary->services_unknown_passive_on_pending_hosts, - 'services_unknown_not_checked' => $this->statusSummary->services_unknown_not_checked_on_pending_hosts - ) - ); ?> -
-
- - statusSummary->hosts_unreachable; ?> UNREACHABLE - -statusSummary->hosts_unreachable_unhandled): ?> - - statusSummary->hosts_unreachable_unhandled . ' ' . $this->translate('Unhandled'); ?> - - -statusSummary->hosts_unreachable_passive): ?> - - statusSummary->hosts_unreachable_passive > 1) { - printf( - $this->translate('%d are passively checked'), - $this->statusSummary->hosts_unreachable_passive - ); - } else { - printf( - $this->translate('%d is passively checked'), - $this->statusSummary->hosts_unreachable_passive - ); - } - ?> - - -statusSummary->hosts_unreachable_not_checked): ?> - - statusSummary->hosts_unreachable_not_checked > 1) { - printf( - $this->translate('%d are not checked at all'), - $this->statusSummary->hosts_unreachable_not_checked - ); - } else { - printf( - $this->translate('%d is not checked at all'), - $this->statusSummary->hosts_unreachable_not_checked - ); - } - ?> - - -
- 		- partial( - 'tactical/components/parts/servicestatesummarybyhoststate.phtml', - array( - 'hostState' => 2, - 'services_ok' => $this->statusSummary->services_ok_on_unreachable_hosts, - 'services_ok_not_checked' => $this->statusSummary->services_ok_not_checked_on_unreachable_hosts, - 'services_pending' => $this->statusSummary->services_pending_on_unreachable_hosts, - 'services_pending_not_checked' => $this->statusSummary->services_pending_not_checked_on_unreachable_hosts, - 'services_warning' => $this->statusSummary->services_warning_on_unreachable_hosts, - 'services_warning_unhandled' => $this->statusSummary->services_warning_unhandled_on_unreachable_hosts, - 'services_warning_passive' => $this->statusSummary->services_warning_passive_on_unreachable_hosts, - 'services_warning_not_checked' => $this->statusSummary->services_warning_not_checked_on_unreachable_hosts, - 'services_critical' => $this->statusSummary->services_critical_on_unreachable_hosts, - 'services_critical_unhandled' => $this->statusSummary->services_critical_unhandled_on_unreachable_hosts, - 'services_critical_passive' => $this->statusSummary->services_critical_passive_on_unreachable_hosts, - 'services_critical_not_checked' => $this->statusSummary->services_critical_not_checked_on_unreachable_hosts, - 'services_unknown' => $this->statusSummary->services_unknown_on_unreachable_hosts, - 'services_unknown_unhandled' => $this->statusSummary->services_unknown_unhandled_on_unreachable_hosts, - 'services_unknown_passive' => $this->statusSummary->services_unknown_passive_on_unreachable_hosts, - 'services_unknown_not_checked' => $this->statusSummary->services_unknown_not_checked_on_unreachable_hosts - ) - ); ?> -
-
- - statusSummary->hosts_down; ?> DOWN - -statusSummary->hosts_down_unhandled): ?> - - statusSummary->hosts_down_unhandled . ' ' . $this->translate('Unhandled'); ?> - - -statusSummary->hosts_down_passive): ?> - - statusSummary->hosts_down_passive > 1) { - printf( - $this->translate('%d are passively checked'), - $this->statusSummary->hosts_down_passive - ); - } else { - printf( - $this->translate('%d is passively checked'), - $this->statusSummary->hosts_down_passive - ); - } - ?> - - -statusSummary->hosts_down_not_checked): ?> - - statusSummary->hosts_down_not_checked > 1) { - printf( - $this->translate('%d are not checked at all'), - $this->statusSummary->hosts_down_not_checked - ); - } else { - printf( - $this->translate('%d is not checked at all'), - $this->statusSummary->hosts_down_not_checked - ); - } - ?> - - -
- 		- partial( - 'tactical/components/parts/servicestatesummarybyhoststate.phtml', - array( - 'hostState' => 1, - 'services_ok' => $this->statusSummary->services_ok_on_down_hosts, - 'services_ok_not_checked' => $this->statusSummary->services_ok_not_checked_on_down_hosts, - 'services_pending' => $this->statusSummary->services_pending_on_down_hosts, - 'services_pending_not_checked' => $this->statusSummary->services_pending_not_checked_on_down_hosts, - 'services_warning' => $this->statusSummary->services_warning_on_down_hosts, - 'services_warning_unhandled' => $this->statusSummary->services_warning_unhandled_on_down_hosts, - 'services_warning_passive' => $this->statusSummary->services_warning_passive_on_down_hosts, - 'services_warning_not_checked' => $this->statusSummary->services_warning_not_checked_on_down_hosts, - 'services_critical' => $this->statusSummary->services_critical_on_down_hosts, - 'services_critical_unhandled' => $this->statusSummary->services_critical_unhandled_on_down_hosts, - 'services_critical_passive' => $this->statusSummary->services_critical_passive_on_down_hosts, - 'services_critical_not_checked' => $this->statusSummary->services_critical_not_checked_on_down_hosts, - 'services_unknown' => $this->statusSummary->services_unknown_on_down_hosts, - 'services_unknown_unhandled' => $this->statusSummary->services_unknown_unhandled_on_down_hosts, - 'services_unknown_passive' => $this->statusSummary->services_unknown_passive_on_down_hosts, - 'services_unknown_not_checked' => $this->statusSummary->services_unknown_not_checked_on_down_hosts - ) - ); ?> -
-
-
diff --git a/modules/monitoring/application/views/scripts/tactical/index.phtml b/modules/monitoring/application/views/scripts/tactical/index.phtml index 563df62d4..cd5f39285 100644 --- a/modules/monitoring/application/views/scripts/tactical/index.phtml +++ b/modules/monitoring/application/views/scripts/tactical/index.phtml @@ -1,6 +1,7 @@
- render('tactical/components/statussummary.phtml'); ?> + render('tactical/components/problem_hosts.phtml'); ?> + render('tactical/components/ok_hosts.phtml'); ?> render('tactical/components/hostservicechecks.phtml'); ?> render('tactical/components/monitoringfeatures.phtml'); ?>
diff --git a/modules/monitoring/library/Monitoring/Backend/Ido/Query/StatusSummaryQuery.php b/modules/monitoring/library/Monitoring/Backend/Ido/Query/StatusSummaryQuery.php index 3c2bbd338..a50237389 100644 --- a/modules/monitoring/library/Monitoring/Backend/Ido/Query/StatusSummaryQuery.php +++ b/modules/monitoring/library/Monitoring/Backend/Ido/Query/StatusSummaryQuery.php @@ -87,70 +87,38 @@ class StatusSummaryQuery extends IdoQuery 'services_flapping' => 'SUM(CASE WHEN object_type = \'service\' AND is_flapping = 1 THEN 1 ELSE 0 END)', - 'services_ok_on_up_hosts' => 'SUM(CASE WHEN object_type = \'service\' AND host_state = 0 AND state = 0 THEN 1 ELSE 0 END)', - 'services_ok_not_checked_on_up_hosts' => 'SUM(CASE WHEN object_type = \'service\' AND host_state = 0 AND state = 0 AND is_active_checked = 0 AND is_passive_checked = 0 THEN 1 ELSE 0 END)', - 'services_pending_on_up_hosts' => 'SUM(CASE WHEN object_type = \'service\' AND host_state = 0 AND state = 99 THEN 1 ELSE 0 END)', - 'services_pending_not_checked_on_up_hosts' => 'SUM(CASE WHEN object_type = \'service\' AND host_state = 0 AND state = 99 AND is_active_checked = 0 AND is_passive_checked = 0 THEN 1 ELSE 0 END)', - 'services_warning_on_up_hosts' => 'SUM(CASE WHEN object_type = \'service\' AND host_state = 0 AND state = 1 THEN 1 ELSE 0 END)', - 'services_warning_unhandled_on_up_hosts' => 'SUM(CASE WHEN object_type = \'service\' AND host_state = 0 AND state = 1 AND acknowledged + in_downtime = 0 THEN 1 ELSE 0 END)', - 'services_warning_passive_on_up_hosts' => 'SUM(CASE WHEN object_type = \'service\' AND host_state = 0 AND state = 1 AND is_passive_checked = 1 THEN 1 ELSE 0 END)', - 'services_warning_not_checked_on_up_hosts' => 'SUM(CASE WHEN object_type = \'service\' AND host_state = 0 AND state = 1 AND is_active_checked = 0 AND is_passive_checked = 0 THEN 1 ELSE 0 END)', - 'services_critical_on_up_hosts' => 'SUM(CASE WHEN object_type = \'service\' AND host_state = 0 AND state = 2 THEN 1 ELSE 0 END)', - 'services_critical_unhandled_on_up_hosts' => 'SUM(CASE WHEN object_type = \'service\' AND host_state = 0 AND state = 2 AND acknowledged + in_downtime = 0 THEN 1 ELSE 0 END)', - 'services_critical_passive_on_up_hosts' => 'SUM(CASE WHEN object_type = \'service\' AND host_state = 0 AND state = 2 AND is_passive_checked = 1 THEN 1 ELSE 0 END)', - 'services_critical_not_checked_on_up_hosts' => 'SUM(CASE WHEN object_type = \'service\' AND host_state = 0 AND state = 2 AND is_active_checked = 0 AND is_passive_checked = 0 THEN 1 ELSE 0 END)', - 'services_unknown_on_up_hosts' => 'SUM(CASE WHEN object_type = \'service\' AND host_state = 0 AND state = 3 THEN 1 ELSE 0 END)', - 'services_unknown_unhandled_on_up_hosts' => 'SUM(CASE WHEN object_type = \'service\' AND host_state = 0 AND state = 3 AND acknowledged + in_downtime = 0 THEN 1 ELSE 0 END)', - 'services_unknown_passive_on_up_hosts' => 'SUM(CASE WHEN object_type = \'service\' AND host_state = 0 AND state = 3 AND is_passive_checked = 1 THEN 1 ELSE 0 END)', - 'services_unknown_not_checked_on_up_hosts' => 'SUM(CASE WHEN object_type = \'service\' AND host_state = 0 AND state = 3 AND is_active_checked = 0 AND is_passive_checked = 0 THEN 1 ELSE 0 END)', - 'services_ok_on_down_hosts' => 'SUM(CASE WHEN object_type = \'service\' AND host_state = 1 AND state = 0 THEN 1 ELSE 0 END)', - 'services_ok_not_checked_on_down_hosts' => 'SUM(CASE WHEN object_type = \'service\' AND host_state = 1 AND state = 0 AND is_active_checked = 0 AND is_passive_checked = 0 THEN 1 ELSE 0 END)', - 'services_pending_on_down_hosts' => 'SUM(CASE WHEN object_type = \'service\' AND host_state = 1 AND state = 99 THEN 1 ELSE 0 END)', - 'services_pending_not_checked_on_down_hosts' => 'SUM(CASE WHEN object_type = \'service\' AND host_state = 1 AND state = 99 AND is_active_checked = 0 AND is_passive_checked = 0 THEN 1 ELSE 0 END)', - 'services_warning_on_down_hosts' => 'SUM(CASE WHEN object_type = \'service\' AND host_state = 1 AND state = 1 THEN 1 ELSE 0 END)', - 'services_warning_unhandled_on_down_hosts' => 'SUM(CASE WHEN object_type = \'service\' AND host_state = 1 AND state = 1 AND acknowledged + in_downtime = 0 THEN 1 ELSE 0 END)', - 'services_warning_passive_on_down_hosts' => 'SUM(CASE WHEN object_type = \'service\' AND host_state = 1 AND state = 1 AND is_passive_checked = 1 THEN 1 ELSE 0 END)', - 'services_warning_not_checked_on_down_hosts' => 'SUM(CASE WHEN object_type = \'service\' AND host_state = 1 AND state = 1 AND is_active_checked = 0 AND is_passive_checked = 0 THEN 1 ELSE 0 END)', - 'services_critical_on_down_hosts' => 'SUM(CASE WHEN object_type = \'service\' AND host_state = 1 AND state = 2 THEN 1 ELSE 0 END)', - 'services_critical_unhandled_on_down_hosts' => 'SUM(CASE WHEN object_type = \'service\' AND host_state = 1 AND state = 2 AND acknowledged + in_downtime = 0 THEN 1 ELSE 0 END)', - 'services_critical_passive_on_down_hosts' => 'SUM(CASE WHEN object_type = \'service\' AND host_state = 1 AND state = 2 AND is_passive_checked = 1 THEN 1 ELSE 0 END)', - 'services_critical_not_checked_on_down_hosts' => 'SUM(CASE WHEN object_type = \'service\' AND host_state = 1 AND state = 2 AND is_active_checked = 0 AND is_passive_checked = 0 THEN 1 ELSE 0 END)', - 'services_unknown_on_down_hosts' => 'SUM(CASE WHEN object_type = \'service\' AND host_state = 1 AND state = 3 THEN 1 ELSE 0 END)', - 'services_unknown_unhandled_on_down_hosts' => 'SUM(CASE WHEN object_type = \'service\' AND host_state = 1 AND state = 3 AND acknowledged + in_downtime = 0 THEN 1 ELSE 0 END)', - 'services_unknown_passive_on_down_hosts' => 'SUM(CASE WHEN object_type = \'service\' AND host_state = 1 AND state = 3 AND is_passive_checked = 1 THEN 1 ELSE 0 END)', - 'services_unknown_not_checked_on_down_hosts' => 'SUM(CASE WHEN object_type = \'service\' AND host_state = 1 AND state = 3 AND is_active_checked = 0 AND is_passive_checked = 0 THEN 1 ELSE 0 END)', - 'services_ok_on_unreachable_hosts' => 'SUM(CASE WHEN object_type = \'service\' AND host_state = 2 AND state = 0 THEN 1 ELSE 0 END)', - 'services_ok_not_checked_on_unreachable_hosts' => 'SUM(CASE WHEN object_type = \'service\' AND host_state = 2 AND state = 0 AND is_active_checked = 0 AND is_passive_checked = 0 THEN 1 ELSE 0 END)', - 'services_pending_on_unreachable_hosts' => 'SUM(CASE WHEN object_type = \'service\' AND host_state = 2 AND state = 99 THEN 1 ELSE 0 END)', - 'services_pending_not_checked_on_unreachable_hosts' => 'SUM(CASE WHEN object_type = \'service\' AND host_state = 2 AND state = 99 AND is_active_checked = 0 AND is_passive_checked = 0 THEN 1 ELSE 0 END)', - 'services_warning_on_unreachable_hosts' => 'SUM(CASE WHEN object_type = \'service\' AND host_state = 2 AND state = 1 THEN 1 ELSE 0 END)', - 'services_warning_unhandled_on_unreachable_hosts' => 'SUM(CASE WHEN object_type = \'service\' AND host_state = 2 AND state = 1 AND acknowledged + in_downtime = 0 THEN 1 ELSE 0 END)', - 'services_warning_passive_on_unreachable_hosts' => 'SUM(CASE WHEN object_type = \'service\' AND host_state = 2 AND state = 1 AND is_passive_checked = 1 THEN 1 ELSE 0 END)', - 'services_warning_not_checked_on_unreachable_hosts' => 'SUM(CASE WHEN object_type = \'service\' AND host_state = 2 AND state = 1 AND is_active_checked = 0 AND is_passive_checked = 0 THEN 1 ELSE 0 END)', - 'services_critical_on_unreachable_hosts' => 'SUM(CASE WHEN object_type = \'service\' AND host_state = 2 AND state = 2 THEN 1 ELSE 0 END)', - 'services_critical_unhandled_on_unreachable_hosts' => 'SUM(CASE WHEN object_type = \'service\' AND host_state = 2 AND state = 2 AND acknowledged + in_downtime = 0 THEN 1 ELSE 0 END)', - 'services_critical_passive_on_unreachable_hosts' => 'SUM(CASE WHEN object_type = \'service\' AND host_state = 2 AND state = 2 AND is_passive_checked = 1 THEN 1 ELSE 0 END)', - 'services_critical_not_checked_on_unreachable_hosts' => 'SUM(CASE WHEN object_type = \'service\' AND host_state = 2 AND state = 2 AND is_active_checked = 0 AND is_passive_checked = 0 THEN 1 ELSE 0 END)', - 'services_unknown_on_unreachable_hosts' => 'SUM(CASE WHEN object_type = \'service\' AND host_state = 2 AND state = 3 THEN 1 ELSE 0 END)', - 'services_unknown_unhandled_on_unreachable_hosts' => 'SUM(CASE WHEN object_type = \'service\' AND host_state = 2 AND state = 3 AND acknowledged + in_downtime = 0 THEN 1 ELSE 0 END)', - 'services_unknown_passive_on_unreachable_hosts' => 'SUM(CASE WHEN object_type = \'service\' AND host_state = 2 AND state = 3 AND is_passive_checked = 1 THEN 1 ELSE 0 END)', - 'services_unknown_not_checked_on_unreachable_hosts' => 'SUM(CASE WHEN object_type = \'service\' AND host_state = 2 AND state = 3 AND is_active_checked = 0 AND is_passive_checked = 0 THEN 1 ELSE 0 END)', - 'services_ok_on_pending_hosts' => 'SUM(CASE WHEN object_type = \'service\' AND host_state = 99 AND state = 0 THEN 1 ELSE 0 END)', - 'services_ok_not_checked_on_pending_hosts' => 'SUM(CASE WHEN object_type = \'service\' AND host_state = 99 AND state = 0 AND is_active_checked = 0 AND is_passive_checked = 0 THEN 1 ELSE 0 END)', - 'services_pending_on_pending_hosts' => 'SUM(CASE WHEN object_type = \'service\' AND host_state = 99 AND state = 99 THEN 1 ELSE 0 END)', - 'services_pending_not_checked_on_pending_hosts' => 'SUM(CASE WHEN object_type = \'service\' AND host_state = 99 AND state = 99 AND is_active_checked = 0 AND is_passive_checked = 0 THEN 1 ELSE 0 END)', - 'services_warning_on_pending_hosts' => 'SUM(CASE WHEN object_type = \'service\' AND host_state = 99 AND state = 1 THEN 1 ELSE 0 END)', - 'services_warning_unhandled_on_pending_hosts' => 'SUM(CASE WHEN object_type = \'service\' AND host_state = 99 AND state = 1 AND acknowledged + in_downtime = 0 THEN 1 ELSE 0 END)', - 'services_warning_passive_on_pending_hosts' => 'SUM(CASE WHEN object_type = \'service\' AND host_state = 99 AND state = 1 AND is_passive_checked = 1 THEN 1 ELSE 0 END)', - 'services_warning_not_checked_on_pending_hosts' => 'SUM(CASE WHEN object_type = \'service\' AND host_state = 99 AND state = 1 AND is_active_checked = 0 AND is_passive_checked = 0 THEN 1 ELSE 0 END)', - 'services_critical_on_pending_hosts' => 'SUM(CASE WHEN object_type = \'service\' AND host_state = 99 AND state = 2 THEN 1 ELSE 0 END)', - 'services_critical_unhandled_on_pending_hosts' => 'SUM(CASE WHEN object_type = \'service\' AND host_state = 99 AND state = 2 AND acknowledged + in_downtime = 0 THEN 1 ELSE 0 END)', - 'services_critical_passive_on_pending_hosts' => 'SUM(CASE WHEN object_type = \'service\' AND host_state = 99 AND state = 2 AND is_passive_checked = 1 THEN 1 ELSE 0 END)', - 'services_critical_not_checked_on_pending_hosts' => 'SUM(CASE WHEN object_type = \'service\' AND host_state = 99 AND state = 2 AND is_active_checked = 0 AND is_passive_checked = 0 THEN 1 ELSE 0 END)', - 'services_unknown_on_pending_hosts' => 'SUM(CASE WHEN object_type = \'service\' AND host_state = 99 AND state = 3 THEN 1 ELSE 0 END)', - 'services_unknown_unhandled_on_pending_hosts' => 'SUM(CASE WHEN object_type = \'service\' AND host_state = 99 AND state = 3 AND acknowledged + in_downtime = 0 THEN 1 ELSE 0 END)', - 'services_unknown_passive_on_pending_hosts' => 'SUM(CASE WHEN object_type = \'service\' AND host_state = 99 AND state = 3 AND is_passive_checked = 1 THEN 1 ELSE 0 END)', - 'services_unknown_not_checked_on_pending_hosts' => 'SUM(CASE WHEN object_type = \'service\' AND host_state = 99 AND state = 3 AND is_active_checked = 0 AND is_passive_checked = 0 THEN 1 ELSE 0 END)' + 'services_ok_on_ok_hosts' => 'SUM(CASE WHEN object_type = \'service\' AND (host_state = 0 OR host_state = 99) AND state = 0 THEN 1 ELSE 0 END)', + 'services_ok_not_checked_on_ok_hosts' => 'SUM(CASE WHEN object_type = \'service\' AND (host_state = 0 OR host_state = 99) AND state = 0 AND is_active_checked = 0 AND is_passive_checked = 0 THEN 1 ELSE 0 END)', + 'services_pending_on_ok_hosts' => 'SUM(CASE WHEN object_type = \'service\' AND (host_state = 0 OR host_state = 99) AND state = 99 THEN 1 ELSE 0 END)', + 'services_pending_not_checked_on_ok_hosts' => 'SUM(CASE WHEN object_type = \'service\' AND (host_state = 0 OR host_state = 99) AND state = 99 AND is_active_checked = 0 AND is_passive_checked = 0 THEN 1 ELSE 0 END)', + 'services_warning_on_ok_hosts' => 'SUM(CASE WHEN object_type = \'service\' AND (host_state = 0 OR host_state = 99) AND state = 1 THEN 1 ELSE 0 END)', + 'services_warning_unhandled_on_ok_hosts' => 'SUM(CASE WHEN object_type = \'service\' AND (host_state = 0 OR host_state = 99) AND state = 1 AND acknowledged + in_downtime = 0 THEN 1 ELSE 0 END)', + 'services_warning_passive_on_ok_hosts' => 'SUM(CASE WHEN object_type = \'service\' AND (host_state = 0 OR host_state = 99) AND state = 1 AND is_passive_checked = 1 THEN 1 ELSE 0 END)', + 'services_warning_not_checked_on_ok_hosts' => 'SUM(CASE WHEN object_type = \'service\' AND (host_state = 0 OR host_state = 99) AND state = 1 AND is_active_checked = 0 AND is_passive_checked = 0 THEN 1 ELSE 0 END)', + 'services_critical_on_ok_hosts' => 'SUM(CASE WHEN object_type = \'service\' AND (host_state = 0 OR host_state = 99) AND state = 2 THEN 1 ELSE 0 END)', + 'services_critical_unhandled_on_ok_hosts' => 'SUM(CASE WHEN object_type = \'service\' AND (host_state = 0 OR host_state = 99) AND state = 2 AND acknowledged + in_downtime = 0 THEN 1 ELSE 0 END)', + 'services_critical_passive_on_ok_hosts' => 'SUM(CASE WHEN object_type = \'service\' AND (host_state = 0 OR host_state = 99) AND state = 2 AND is_passive_checked = 1 THEN 1 ELSE 0 END)', + 'services_critical_not_checked_on_ok_hosts' => 'SUM(CASE WHEN object_type = \'service\' AND (host_state = 0 OR host_state = 99) AND state = 2 AND is_active_checked = 0 AND is_passive_checked = 0 THEN 1 ELSE 0 END)', + 'services_unknown_on_ok_hosts' => 'SUM(CASE WHEN object_type = \'service\' AND (host_state = 0 OR host_state = 99) AND state = 3 THEN 1 ELSE 0 END)', + 'services_unknown_unhandled_on_ok_hosts' => 'SUM(CASE WHEN object_type = \'service\' AND (host_state = 0 OR host_state = 99) AND state = 3 AND acknowledged + in_downtime = 0 THEN 1 ELSE 0 END)', + 'services_unknown_passive_on_ok_hosts' => 'SUM(CASE WHEN object_type = \'service\' AND (host_state = 0 OR host_state = 99) AND state = 3 AND is_passive_checked = 1 THEN 1 ELSE 0 END)', + 'services_unknown_not_checked_on_ok_hosts' => 'SUM(CASE WHEN object_type = \'service\' AND (host_state = 0 OR host_state = 99) AND state = 3 AND is_active_checked = 0 AND is_passive_checked = 0 THEN 1 ELSE 0 END)', + 'services_ok_on_problem_hosts' => 'SUM(CASE WHEN object_type = \'service\' AND (host_state = 1 OR host_state = 2) AND state = 0 THEN 1 ELSE 0 END)', + 'services_ok_not_checked_on_problem_hosts' => 'SUM(CASE WHEN object_type = \'service\' AND (host_state = 1 OR host_state = 2) AND state = 0 AND is_active_checked = 0 AND is_passive_checked = 0 THEN 1 ELSE 0 END)', + 'services_pending_on_problem_hosts' => 'SUM(CASE WHEN object_type = \'service\' AND (host_state = 1 OR host_state = 2) AND state = 99 THEN 1 ELSE 0 END)', + 'services_pending_not_checked_on_problem_hosts' => 'SUM(CASE WHEN object_type = \'service\' AND (host_state = 1 OR host_state = 2) AND state = 99 AND is_active_checked = 0 AND is_passive_checked = 0 THEN 1 ELSE 0 END)', + 'services_warning_on_problem_hosts' => 'SUM(CASE WHEN object_type = \'service\' AND (host_state = 1 OR host_state = 2) AND state = 1 THEN 1 ELSE 0 END)', + 'services_warning_unhandled_on_problem_hosts' => 'SUM(CASE WHEN object_type = \'service\' AND (host_state = 1 OR host_state = 2) AND state = 1 AND acknowledged + in_downtime = 0 THEN 1 ELSE 0 END)', + 'services_warning_passive_on_problem_hosts' => 'SUM(CASE WHEN object_type = \'service\' AND (host_state = 1 OR host_state = 2) AND state = 1 AND is_passive_checked = 1 THEN 1 ELSE 0 END)', + 'services_warning_not_checked_on_problem_hosts' => 'SUM(CASE WHEN object_type = \'service\' AND (host_state = 1 OR host_state = 2) AND state = 1 AND is_active_checked = 0 AND is_passive_checked = 0 THEN 1 ELSE 0 END)', + 'services_critical_on_problem_hosts' => 'SUM(CASE WHEN object_type = \'service\' AND (host_state = 1 OR host_state = 2) AND state = 2 THEN 1 ELSE 0 END)', + 'services_critical_unhandled_on_problem_hosts' => 'SUM(CASE WHEN object_type = \'service\' AND (host_state = 1 OR host_state = 2) AND state = 2 AND acknowledged + in_downtime = 0 THEN 1 ELSE 0 END)', + 'services_critical_passive_on_problem_hosts' => 'SUM(CASE WHEN object_type = \'service\' AND (host_state = 1 OR host_state = 2) AND state = 2 AND is_passive_checked = 1 THEN 1 ELSE 0 END)', + 'services_critical_not_checked_on_problem_hosts' => 'SUM(CASE WHEN object_type = \'service\' AND (host_state = 1 OR host_state = 2) AND state = 2 AND is_active_checked = 0 AND is_passive_checked = 0 THEN 1 ELSE 0 END)', + 'services_unknown_on_problem_hosts' => 'SUM(CASE WHEN object_type = \'service\' AND (host_state = 1 OR host_state = 2) AND state = 3 THEN 1 ELSE 0 END)', + 'services_unknown_unhandled_on_problem_hosts' => 'SUM(CASE WHEN object_type = \'service\' AND (host_state = 1 OR host_state = 2) AND state = 3 AND acknowledged + in_downtime = 0 THEN 1 ELSE 0 END)', + 'services_unknown_passive_on_problem_hosts' => 'SUM(CASE WHEN object_type = \'service\' AND (host_state = 1 OR host_state = 2) AND state = 3 AND is_passive_checked = 1 THEN 1 ELSE 0 END)', + 'services_unknown_not_checked_on_problem_hosts' => 'SUM(CASE WHEN object_type = \'service\' AND (host_state = 1 OR host_state = 2) AND state = 3 AND is_active_checked = 0 AND is_passive_checked = 0 THEN 1 ELSE 0 END)' ) ); diff --git a/modules/monitoring/library/Monitoring/DataView/StatusSummary.php b/modules/monitoring/library/Monitoring/DataView/StatusSummary.php index 0e4a8d417..77fa3d574 100644 --- a/modules/monitoring/library/Monitoring/DataView/StatusSummary.php +++ b/modules/monitoring/library/Monitoring/DataView/StatusSummary.php @@ -88,70 +88,38 @@ class StatusSummary extends DataView 'services_flapping', - 'services_ok_on_up_hosts', - 'services_ok_not_checked_on_up_hosts', - 'services_pending_on_up_hosts', - 'services_pending_not_checked_on_up_hosts', - 'services_warning_on_up_hosts', - 'services_warning_unhandled_on_up_hosts', - 'services_warning_passive_on_up_hosts', - 'services_warning_not_checked_on_up_hosts', - 'services_critical_on_up_hosts', - 'services_critical_unhandled_on_up_hosts', - 'services_critical_passive_on_up_hosts', - 'services_critical_not_checked_on_up_hosts', - 'services_unknown_on_up_hosts', - 'services_unknown_unhandled_on_up_hosts', - 'services_unknown_passive_on_up_hosts', - 'services_unknown_not_checked_on_up_hosts', - 'services_ok_on_down_hosts', - 'services_ok_not_checked_on_down_hosts', - 'services_pending_on_down_hosts', - 'services_pending_not_checked_on_down_hosts', - 'services_warning_on_down_hosts', - 'services_warning_unhandled_on_down_hosts', - 'services_warning_passive_on_down_hosts', - 'services_warning_not_checked_on_down_hosts', - 'services_critical_on_down_hosts', - 'services_critical_unhandled_on_down_hosts', - 'services_critical_passive_on_down_hosts', - 'services_critical_not_checked_on_down_hosts', - 'services_unknown_on_down_hosts', - 'services_unknown_unhandled_on_down_hosts', - 'services_unknown_passive_on_down_hosts', - 'services_unknown_not_checked_on_down_hosts', - 'services_ok_on_unreachable_hosts', - 'services_ok_not_checked_on_unreachable_hosts', - 'services_pending_on_unreachable_hosts', - 'services_pending_not_checked_on_unreachable_hosts', - 'services_warning_on_unreachable_hosts', - 'services_warning_unhandled_on_unreachable_hosts', - 'services_warning_passive_on_unreachable_hosts', - 'services_warning_not_checked_on_unreachable_hosts', - 'services_critical_on_unreachable_hosts', - 'services_critical_unhandled_on_unreachable_hosts', - 'services_critical_passive_on_unreachable_hosts', - 'services_critical_not_checked_on_unreachable_hosts', - 'services_unknown_on_unreachable_hosts', - 'services_unknown_unhandled_on_unreachable_hosts', - 'services_unknown_passive_on_unreachable_hosts', - 'services_unknown_not_checked_on_unreachable_hosts', - 'services_ok_on_pending_hosts', - 'services_ok_not_checked_on_pending_hosts', - 'services_pending_on_pending_hosts', - 'services_pending_not_checked_on_pending_hosts', - 'services_warning_on_pending_hosts', - 'services_warning_unhandled_on_pending_hosts', - 'services_warning_passive_on_pending_hosts', - 'services_warning_not_checked_on_pending_hosts', - 'services_critical_on_pending_hosts', - 'services_critical_unhandled_on_pending_hosts', - 'services_critical_passive_on_pending_hosts', - 'services_critical_not_checked_on_pending_hosts', - 'services_unknown_on_pending_hosts', - 'services_unknown_unhandled_on_pending_hosts', - 'services_unknown_passive_on_pending_hosts', - 'services_unknown_not_checked_on_pending_hosts' + 'services_ok_on_ok_hosts', + 'services_ok_not_checked_on_ok_hosts', + 'services_pending_on_ok_hosts', + 'services_pending_not_checked_on_ok_hosts', + 'services_warning_on_ok_hosts', + 'services_warning_unhandled_on_ok_hosts', + 'services_warning_passive_on_ok_hosts', + 'services_warning_not_checked_on_ok_hosts', + 'services_critical_on_ok_hosts', + 'services_critical_unhandled_on_ok_hosts', + 'services_critical_passive_on_ok_hosts', + 'services_critical_not_checked_on_ok_hosts', + 'services_unknown_on_ok_hosts', + 'services_unknown_unhandled_on_ok_hosts', + 'services_unknown_passive_on_ok_hosts', + 'services_unknown_not_checked_on_ok_hosts', + 'services_ok_on_problem_hosts', + 'services_ok_not_checked_on_problem_hosts', + 'services_pending_on_problem_hosts', + 'services_pending_not_checked_on_problem_hosts', + 'services_warning_on_problem_hosts', + 'services_warning_unhandled_on_problem_hosts', + 'services_warning_passive_on_problem_hosts', + 'services_warning_not_checked_on_problem_hosts', + 'services_critical_on_problem_hosts', + 'services_critical_unhandled_on_problem_hosts', + 'services_critical_passive_on_problem_hosts', + 'services_critical_not_checked_on_problem_hosts', + 'services_unknown_on_problem_hosts', + 'services_unknown_unhandled_on_problem_hosts', + 'services_unknown_passive_on_problem_hosts', + 'services_unknown_not_checked_on_problem_hosts' ); } }