[icinga-checkins] icinga.org: icinga-web/master: Smaller fixes in the views

git at icinga.org git at icinga.org
Fri Apr 27 11:38:38 CEST 2012


Module: icinga-web
Branch: master
Commit: a4717a2ca30ae7b119f88a926f4b710fba16deb1
URL:    https://git.icinga.org/?p=icinga-web.git;a=commit;h=a4717a2ca30ae7b119f88a926f4b710fba16deb1

Author: Jannis Mosshammer <jannis.mosshammer at netways.de>
Date:   Fri Apr 27 11:38:27 2012 +0200

Smaller fixes in the views

---

 app/modules/Api/config/views/host.xml    |    6 +++++-
 app/modules/Api/config/views/service.xml |    2 ++
 2 files changed, 7 insertions(+), 1 deletions(-)

diff --git a/app/modules/Api/config/views/host.xml b/app/modules/Api/config/views/host.xml
index 8321065..bbbdb86 100644
--- a/app/modules/Api/config/views/host.xml
+++ b/app/modules/Api/config/views/host.xml
@@ -7,7 +7,7 @@
             <query>
             <![CDATA[
             SELECT
-                h.icon_image AS SERVICE_ICON_IMAGE,
+                h.icon_image AS HOST_ICON_IMAGE,
                 i.instance_name AS INSTANCE_NAME,
                 h.host_object_id AS HOST_OBJECT_ID,
                 oh.name1 AS HOST_NAME,
@@ -16,6 +16,7 @@
                 hs.current_state AS HOST_CURRENT_STATE,
                 COALESCE(hs.last_state_change,ps.program_start_time) AS DURATION_START,
                 hs.last_check AS HOST_LAST_CHECK,
+                hs.next_check AS HOST_NEXT_CHECK,
                 ps.program_start_time AS HOST_PROGRAM_START_TIME,
                 hs.output AS HOST_OUTPUT,
                 hs.current_check_attempt AS HOST_CURRENT_CHECK_ATTEMPT,
@@ -107,6 +108,7 @@
                 hs.process_performance_data AS HOST_PROCESS_PERFORMANCE_DATA,
                 COALESCE(hs.last_state_change,ps.program_start_time) AS DURATION_START,
                 hs.last_check AS HOST_LAST_CHECK,
+                hs.next_check AS HOST_NEXT_CHECK,
                 ps.program_start_time AS HOST_PROGRAM_START_TIME,
                 hs.output AS HOST_OUTPUT,
                 hs.current_check_attempt AS HOST_CURRENT_CHECK_ATTEMPT,
@@ -150,6 +152,8 @@
                 hs.process_performance_data AS HOST_PROCESS_PERFORMANCE_DATA,
                 ss.current_state AS SERVICE_CURRENT_STATE,
                 ss.output AS SERVICE_OUTPUT,
+                hs.next_check AS HOST_NEXT_CHECK,
+                ss.next_check AS SERVICE_NEXT_CHECK
                 hs.last_check AS HOST_LAST_CHECK,
                 ss.last_check AS SERVICE_LAST_CHECK
             FROM IcingaObjects o
diff --git a/app/modules/Api/config/views/service.xml b/app/modules/Api/config/views/service.xml
index aef0bd7..3afd7dd 100644
--- a/app/modules/Api/config/views/service.xml
+++ b/app/modules/Api/config/views/service.xml
@@ -21,6 +21,7 @@
                 COALESCE(ss.last_state_change,ps.program_start_time) AS DURATION_START,
                 ps.program_start_time AS SERVICE_PROGRAM_START_TIME,
                 ss.last_check AS SERVICE_LAST_CHECK,
+                ss.next_check AS SERVICE_NEXT_CHECK,
                 ss.output AS SERVICE_OUTPUT,
                 ss.current_check_attempt AS SERVICE_CURRENT_CHECK_ATTEMPT,
                 ss.max_check_attempts AS service_max_attempt,
@@ -134,6 +135,7 @@
                 ss.current_state AS SERVICE_CURRENT_STATE,
                 ss.process_performance_data AS SERVICE_PROCESS_PERFORMANCE_DATA,
                 ss.last_check AS SERVICE_LAST_CHECK,
+                ss.next_check AS SERVICE_NEXT_CHECK,
                 ss.output AS SERVICE_OUTPUT,
                 ss.current_check_attempt AS SERVICE_CURRENT_CHECK_ATTEMPT,
                 ss.max_check_attempts AS SERVICE_MAX_CHECK_ATTEMPTS,





More information about the icinga-checkins mailing list