From e6949eaab4d56e4b770b30ce67e291426ca68fb8 Mon Sep 17 00:00:00 2001
From: Eric Lippmann <eric.lippmann@netways.de>
Date: Tue, 10 Mar 2015 14:17:09 +0100
Subject: [PATCH] Reorder columns to select in the Service object

refs #8614
---
 .../library/Monitoring/Object/Service.php     | 72 +++++++++----------
 1 file changed, 36 insertions(+), 36 deletions(-)

diff --git a/modules/monitoring/library/Monitoring/Object/Service.php b/modules/monitoring/library/Monitoring/Object/Service.php
index 9599a51cbf..fc317fc8dd 100644
--- a/modules/monitoring/library/Monitoring/Object/Service.php
+++ b/modules/monitoring/library/Monitoring/Object/Service.php
@@ -106,56 +106,56 @@ public function getName()
     protected function getDataView()
     {
         return $this->backend->select()->from('serviceStatus', array(
-            'host_name',
-            'host_display_name',
-            'host_state',
-            'host_last_state_change',
+            'host_acknowledged',
+            'host_active_checks_enabled',
             'host_address',
+            'host_alias',
+            'host_display_name',
+            'host_display_name',
             'host_handled',
-            'service_description',
-            'service_display_name',
-            'service_state',
-            'service_in_downtime',
-            'service_acknowledged',
-            'service_handled',
-            'service_output',
-            'service_last_state_change',
-            'service_long_output',
-            'service_is_flapping',
-            'service_state_type',
-            'service_last_check',
-            'service_notifications_enabled',
-            'service_notifications_enabled_changed',
-            'service_action_url',
-            'service_notes_url',
-            'service_next_check',
-            'service_attempt',
-            'service_last_notification',
-            'service_check_command',
-            'service_check_source',
-            'service_current_notification_number',
-            'host_acknowledged',
             'host_in_downtime',
+            'host_last_state_change',
+            'host_name',
             'host_notifications_enabled',
-            'host_display_name',
-            'host_alias',
-            'host_active_checks_enabled',
             'host_passive_checks_enabled',
-            'service_perfdata',
+            'host_state',
+            'service_acknowledged',
+            'service_action_url',
             'service_active_checks_enabled',
             'service_active_checks_enabled_changed',
-            'service_passive_checks_enabled',
-            'service_passive_checks_enabled_changed',
+            'service_attempt',
+            'service_check_command',
             'service_check_execution_time',
             'service_check_latency',
-            'service_obsessing',
-            'service_obsessing_changed',
+            'service_check_source',
+            'service_current_notification_number',
+            'service_description',
+            'service_display_name',
             'service_event_handler_enabled',
             'service_event_handler_enabled_changed',
             'service_flap_detection_enabled',
             'service_flap_detection_enabled_changed',
+            'service_handled',
+            'service_in_downtime',
+            'service_is_flapping',
+            'service_last_check',
+            'service_last_notification',
+            'service_last_state_change',
+            'service_long_output',
+            'service_next_check',
+            'service_notes_url',
+            'service_notifications_enabled',
+            'service_notifications_enabled_changed',
+            'service_obsessing',
+            'service_obsessing_changed',
+            'service_output',
+            'service_passive_checks_enabled',
+            'service_passive_checks_enabled_changed',
+            'service_percent_state_change',
+            'service_perfdata',
             'service_process_perfdata' => 'service_process_performance_data',
-            'service_percent_state_change'
+            'service_state',
+            'service_state_type'
         ))
             ->where('host_name', $this->host->getName())
             ->where('service_description', $this->service);