From 9e6ec12a10250ebc247a825dce41164315a1b598 Mon Sep 17 00:00:00 2001 From: "Alexander A. Klimov" Date: Wed, 16 Dec 2015 13:57:41 +0100 Subject: [PATCH] Revert "Hostgroup listing: preserve URL params in links to hosts and services lists" This reverts commit a63bc649f7e2657af24a65b2ad523fb742059fb6. --- .../views/scripts/list/hostgroups.phtml | 60 +++++++++---------- 1 file changed, 29 insertions(+), 31 deletions(-) diff --git a/modules/monitoring/application/views/scripts/list/hostgroups.phtml b/modules/monitoring/application/views/scripts/list/hostgroups.phtml index 0535bf422..e90b9fd7b 100644 --- a/modules/monitoring/application/views/scripts/list/hostgroups.phtml +++ b/modules/monitoring/application/views/scripts/list/hostgroups.phtml @@ -29,9 +29,7 @@ if (! $this->compact): ?> -filterEditor->getFilter()->getUrlParams()->toArray(false); -foreach ($hostgroups->peekAhead($this->compact) as $hostgroup): ?> +peekAhead($this->compact) as $hostgroup): ?> hosts_total ?> @@ -55,11 +53,11 @@ foreach ($hostgroups->peekAhead($this->compact) as $hostgroup): ?> ->add( StateBadges::STATE_UP, $hostgroup->hosts_up, - array_merge($currentFilter, array( + array( 'host_state' => 0, 'hostgroup_name' => $hostgroup->hostgroup_name, 'sort' => 'host_severity' - )), + ), 'List %u host that is currently in state UP in the host group "%s"', 'List %u hosts which are currently in state UP in the host group "%s"', array($hostgroup->hosts_up, $hostgroup->hostgroup_alias) @@ -67,13 +65,13 @@ foreach ($hostgroups->peekAhead($this->compact) as $hostgroup): ?> ->add( StateBadges::STATE_DOWN, $hostgroup->hosts_down_unhandled, - array_merge($currentFilter, array( + array( 'host_state' => 1, 'host_acknowledged' => 0, 'host_in_downtime' => 0, 'hostgroup_name' => $hostgroup->hostgroup_name, 'sort' => 'host_severity' - )), + ), 'List %u host that is currently in state DOWN in the host group "%s"', 'List %u hosts which are currently in state DOWN in the host group "%s"', array($hostgroup->hosts_down_unhandled, $hostgroup->hostgroup_alias) @@ -81,12 +79,12 @@ foreach ($hostgroups->peekAhead($this->compact) as $hostgroup): ?> ->add( StateBadges::STATE_DOWN_HANDLED, $hostgroup->hosts_down_handled, - array_merge($currentFilter, array( + array( 'host_state' => 1, 'host_handled' => 1, 'hostgroup_name' => $hostgroup->hostgroup_name, 'sort' => 'host_severity' - )), + ), 'List %u host that is currently in state DOWN (Acknowledged) in the host group "%s"', 'List %u hosts which are currently in state DOWN (Acknowledged) in the host group "%s"', array($hostgroup->hosts_down_handled, $hostgroup->hostgroup_alias) @@ -94,13 +92,13 @@ foreach ($hostgroups->peekAhead($this->compact) as $hostgroup): ?> ->add( StateBadges::STATE_UNREACHABLE, $hostgroup->hosts_unreachable_unhandled, - array_merge($currentFilter, array( + array( 'host_state' => 2, 'host_acknowledged' => 0, 'host_in_downtime' => 0, 'hostgroup_name' => $hostgroup->hostgroup_name, 'sort' => 'host_severity' - )), + ), 'List %u host that is currently in state UNREACHABLE in the host group "%s"', 'List %u hosts which are currently in state UNREACHABLE in the host group "%s"', array($hostgroup->hosts_unreachable_unhandled, $hostgroup->hostgroup_alias) @@ -108,12 +106,12 @@ foreach ($hostgroups->peekAhead($this->compact) as $hostgroup): ?> ->add( StateBadges::STATE_UNREACHABLE_HANDLED, $hostgroup->hosts_unreachable_handled, - array_merge($currentFilter, array( + array( 'host_state' => 2, 'host_handled' => 1, 'hostgroup_name' => $hostgroup->hostgroup_name, 'sort' => 'host_severity' - )), + ), 'List %u host that is currently in state UNREACHABLE (Acknowledged) in the host group "%s"', 'List %u hosts which are currently in state UNREACHABLE (Acknowledged) in the host group "%s"', array($hostgroup->hosts_unreachable_handled, $hostgroup->hostgroup_alias) @@ -121,11 +119,11 @@ foreach ($hostgroups->peekAhead($this->compact) as $hostgroup): ?> ->add( StateBadges::STATE_PENDING, $hostgroup->hosts_pending, - array_merge($currentFilter, array( + array( 'host_state' => 99, 'hostgroup_name' => $hostgroup->hostgroup_name, 'sort' => 'host_severity' - )), + ), 'List %u host that is currently in state PENDING in the host group "%s"', 'List %u hosts which are currently in state PENDING in the host group "%s"', array($hostgroup->hosts_pending, $hostgroup->hostgroup_alias) @@ -152,11 +150,11 @@ foreach ($hostgroups->peekAhead($this->compact) as $hostgroup): ?> ->add( StateBadges::STATE_OK, $hostgroup->services_ok, - array_merge($currentFilter, array( + array( 'service_state' => 0, 'hostgroup_name' => $hostgroup->hostgroup_name, 'sort' => 'service_severity' - )), + ), 'List %u service that is currently in state OK on hosts in the host group "%s"', 'List %u services which are currently in state OK on hosts in the host group "%s"', array($hostgroup->services_ok, $hostgroup->hostgroup_alias) @@ -164,14 +162,14 @@ foreach ($hostgroups->peekAhead($this->compact) as $hostgroup): ?> ->add( StateBadges::STATE_CRITICAL, $hostgroup->services_critical_unhandled, - array_merge($currentFilter, array( + array( 'service_state' => 2, 'service_acknowledged' => 0, 'service_in_downtime' => 0, 'host_problem' => 0, 'hostgroup_name' => $hostgroup->hostgroup_name, 'sort' => 'service_severity' - )), + ), 'List %u service that is currently in state CRITICAL on hosts in the host group "%s"', 'List %u services which are currently in state CRITICAL on hosts in the host group "%s"', array($hostgroup->services_critical_unhandled, $hostgroup->hostgroup_alias) @@ -179,12 +177,12 @@ foreach ($hostgroups->peekAhead($this->compact) as $hostgroup): ?> ->add( StateBadges::STATE_CRITICAL_HANDLED, $hostgroup->services_critical_handled, - array_merge($currentFilter, array( + array( 'service_state' => 2, 'service_handled' => 1, 'hostgroup_name' => $hostgroup->hostgroup_name, 'sort' => 'service_severity' - )), + ), 'List %u service that is currently in state CRITICAL (Acknowledged) on hosts in the host group "%s"', 'List %u services which are currently in state CRITICAL (Acknowledged) on hosts in the host group "%s"', array($hostgroup->services_critical_unhandled, $hostgroup->hostgroup_alias) @@ -192,14 +190,14 @@ foreach ($hostgroups->peekAhead($this->compact) as $hostgroup): ?> ->add( StateBadges::STATE_UNKNOWN, $hostgroup->services_unknown_unhandled, - array_merge($currentFilter, array( + array( 'service_state' => 3, 'service_acknowledged' => 0, 'service_in_downtime' => 0, 'host_problem' => 0, 'hostgroup_name' => $hostgroup->hostgroup_name, 'sort' => 'service_severity' - )), + ), 'List %u service that is currently in state UNKNOWN on hosts in the host group "%s"', 'List %u services which are currently in state UNKNOWN on hosts in the host group "%s"', array($hostgroup->services_unknown_unhandled, $hostgroup->hostgroup_alias) @@ -207,12 +205,12 @@ foreach ($hostgroups->peekAhead($this->compact) as $hostgroup): ?> ->add( StateBadges::STATE_UNKNOWN_HANDLED, $hostgroup->services_unknown_handled, - array_merge($currentFilter, array( + array( 'service_state' => 3, 'service_handled' => 1, 'hostgroup_name' => $hostgroup->hostgroup_name, 'sort' => 'service_severity' - )), + ), 'List %u service that is currently in state UNKNOWN (Acknowledged) on hosts in the host group "%s"', 'List %u services which are currently in state UNKNOWN (Acknowledged) on hosts in the host group "%s"', array($hostgroup->services_unknown_handled, $hostgroup->hostgroup_alias) @@ -221,14 +219,14 @@ foreach ($hostgroups->peekAhead($this->compact) as $hostgroup): ?> ->add( StateBadges::STATE_WARNING, $hostgroup->services_warning_unhandled, - array_merge($currentFilter, array( + array( 'service_state' => 1, 'service_acknowledged' => 0, 'service_in_downtime' => 0, 'host_problem' => 0, 'hostgroup_name' => $hostgroup->hostgroup_name, 'sort' => 'service_severity' - )), + ), 'List %u service that is currently in state WARNING on hosts in the host group "%s"', 'List %u services which are currently in state WARNING on hosts in the host group "%s"', array($hostgroup->services_warning_unhandled, $hostgroup->hostgroup_alias) @@ -236,12 +234,12 @@ foreach ($hostgroups->peekAhead($this->compact) as $hostgroup): ?> ->add( StateBadges::STATE_WARNING_HANDLED, $hostgroup->services_warning_handled, - array_merge($currentFilter, array( + array( 'service_state' => 1, 'service_handled' => 1, 'hostgroup_name' => $hostgroup->hostgroup_name, 'sort' => 'service_severity' - )), + ), 'List %u service that is currently in state WARNING (Acknowledged) on hosts in the host group "%s"', 'List %u services which are currently in state WARNING (Acknowledged) on hosts in the host group "%s"', array($hostgroup->services_warning_handled, $hostgroup->hostgroup_alias) @@ -249,11 +247,11 @@ foreach ($hostgroups->peekAhead($this->compact) as $hostgroup): ?> ->add( StateBadges::STATE_PENDING, $hostgroup->services_pending, - array_merge($currentFilter, array( + array( 'service_state' => 99, 'hostgroup_name' => $hostgroup->hostgroup_name, 'sort' => 'service_severity' - )), + ), 'List %u service that is currently in state PENDING on hosts in the host group "%s"', 'List %u services which are currently in state PENDING on hosts in the host group "%s"', array($hostgroup->services_pending, $hostgroup->hostgroup_alias)