From 2dc6d5467d68a02dd0ae38bf80f4f3aeef2b41d0 Mon Sep 17 00:00:00 2001
From: Eric Lippmann <eric.lippmann@netways.de>
Date: Wed, 20 May 2015 16:06:45 +0200
Subject: [PATCH] monitoring: Don't select unnecessary columns in the host
 group summary

refs #8241
---
 .../controllers/ListController.php            | 34 +++++++------------
 1 file changed, 13 insertions(+), 21 deletions(-)

diff --git a/modules/monitoring/application/controllers/ListController.php b/modules/monitoring/application/controllers/ListController.php
index 5905e77a2..536fa3ecf 100644
--- a/modules/monitoring/application/controllers/ListController.php
+++ b/modules/monitoring/application/controllers/ListController.php
@@ -522,37 +522,29 @@ class Monitoring_ListController extends Controller
         $this->setAutorefreshInterval(12);
 
         $query = $this->backend->select()->from('hostgroupsummary', array(
-            'hostgroup_name',
             'hostgroup_alias',
-            'hosts_up',
-            'hosts_unreachable_handled',
-            'hosts_unreachable_unhandled',
+            'hostgroup_name',
             'hosts_down_handled',
+            'hosts_down_last_state_change_handled',
+            'hosts_down_last_state_change_unhandled',
             'hosts_down_unhandled',
             'hosts_pending',
-            'hosts_up_last_state_change',
             'hosts_pending_last_state_change',
-            'hosts_down_last_state_change_handled',
+            'hosts_unreachable_handled',
             'hosts_unreachable_last_state_change_handled',
-            'hosts_down_last_state_change_unhandled',
             'hosts_unreachable_last_state_change_unhandled',
-            'services_ok',
-            'services_unknown_handled',
-            'services_unknown_unhandled',
+            'hosts_unreachable_unhandled',
+            'hosts_up',
+            'hosts_up_last_state_change',
             'services_critical_handled',
             'services_critical_unhandled',
-            'services_warning_handled',
-            'services_warning_unhandled',
+            'services_ok',
             'services_pending',
-            'services_ok_last_state_change',
-            'services_pending_last_state_change',
-            'services_warning_last_state_change_handled',
-            'services_critical_last_state_change_handled',
-            'services_unknown_last_state_change_handled',
-            'services_warning_last_state_change_unhandled',
-            'services_critical_last_state_change_unhandled',
-            'services_unknown_last_state_change_unhandled',
-            'services_total'
+            'services_total',
+            'services_unknown_handled',
+            'services_unknown_unhandled',
+            'services_warning_handled',
+            'services_warning_unhandled'
         ))->order('hostgroup_alias');
         // TODO(el): Can't default to the sort rules of the data view because it's meant for both host groups and
         // service groups. We should separate them.