[icinga-checkins] icinga.org: icinga-web/master: * Updated views (fixed cv name, added urls)

git at icinga.org git at icinga.org
Tue Aug 28 13:49:39 CEST 2012


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

Author: Jannis Moßhammer <jannis.mosshammer at netways.de>
Date:   Sat Aug 25 12:19:39 2012 +0200

* Updated views (fixed cv name, added urls)

---

 app/modules/Api/config/views/host.xml    |   19 +++++++++++++++----
 app/modules/Api/config/views/service.xml |   16 +++++++++++-----
 2 files changed, 26 insertions(+), 9 deletions(-)

diff --git a/app/modules/Api/config/views/host.xml b/app/modules/Api/config/views/host.xml
old mode 100644
new mode 100755
index 35f346e..0b69a54
--- a/app/modules/Api/config/views/host.xml
+++ b/app/modules/Api/config/views/host.xml
@@ -23,8 +23,11 @@
                 hs.max_check_attempts AS HOST_MAX_CHECK_ATTEMPT,
                 hs.process_performance_data AS HOST_PROCESS_PERFORMANCE_DATA,
                 hs.max_check_attempts AS max_attempt,
+                hs.perfdata AS HOST_PERFORMANCE_DATA,
                 i.instance_id AS HOST_INSTANCE_ID,
                 h.host_id AS HOST_ID,
+                h.action_url AS HOST_ACTION_URL,
+                h.notes_url AS HOST_NOTES_URL,
                 (hs.has_been_checked-1)*-1 as HOST_IS_PENDING,
                 hs.notifications_enabled as notifications_enabled,
                 hs.problem_has_been_acknowledged as problem_acknowledged,
@@ -48,14 +51,14 @@
             <!--
                 Additional fields that are used in cronk filtering
             -->
-            <filter name="custom_variable_name" type="dql">
+            <filter name="customvariable_name" type="dql">
                 <join>h.customvariables cvh</join>
-                <select>cvh.varname AS custom_variable_name</select>
+                <select>cvh.varname AS customvariable_name</select>
             </filter>
 
-            <filter name="custom_variable_value" type="dql">
+            <filter name="customvariable_value" type="dql">
                 <join>h.customvariables cvh</join>
-                <select>cvh.varvalue AS custom_variable_value</select>
+                <select>cvh.varvalue AS customvariable_value</select>
             </filter>
 
             <filter name="hostgroup_name" type="dql">
@@ -92,11 +95,14 @@
                 hs.last_check AS HOST_LAST_CHECK,
                 hs.next_check AS HOST_NEXT_CHECK,
                 ps.program_start_time AS HOST_PROGRAM_START_TIME,
+                hs.perfdata AS HOST_PERFORMANCE_DATA,
                 hs.output AS HOST_OUTPUT,
                 hs.current_check_attempt AS HOST_CURRENT_CHECK_ATTEMPT,
                 hs.max_check_attempts AS HOST_MAX_CHECK_ATTEMPT,
                 i.instance_id AS HOST_INSTANCE_ID,
                 h.host_id AS HOST_ID,
+                h.action_url AS HOST_ACTION_URL,
+                h.notes_url AS HOST_NOTES_URL,
                 hs.notifications_enabled as notifications_enabled,
                 hs.problem_has_been_acknowledged as problem_acknowledged,
                 hs.scheduled_downtime_depth as scheduled_downtime_depth,
@@ -135,11 +141,16 @@
                 COALESCE(ss.last_state_change,hs.last_state_change) AS LAST_STATE_CHANGE,
                 COALESCE(ss.output, hs.output) AS OUTPUT,
                 hs.process_performance_data AS HOST_PROCESS_PERFORMANCE_DATA,
+                hs.perfdata AS HOST_PERFORMANCE_DATA,                
                 ss.current_state AS SERVICE_CURRENT_STATE,
                 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
+                h.action_url AS HOST_ACTION_URL,
+                h.notes_url AS HOST_NOTES_URL,
+                s.action_url AS SERVICE_ACTION_URL,
+                s.notes_url AS SERVICE_NOTES_URL
             FROM IcingaObjects o
             INNER JOIN o.instance i
             LEFT JOIN o.host h
diff --git a/app/modules/Api/config/views/service.xml b/app/modules/Api/config/views/service.xml
old mode 100644
new mode 100755
index daea5c2..06fe83f
--- a/app/modules/Api/config/views/service.xml
+++ b/app/modules/Api/config/views/service.xml
@@ -23,6 +23,7 @@
                 ss.last_check AS SERVICE_LAST_CHECK,
                 ss.next_check AS SERVICE_NEXT_CHECK,
                 ss.output AS SERVICE_OUTPUT,
+                ss.perfdata AS SERVICE_PERFORMANCE_DATA,                
                 ss.current_check_attempt AS SERVICE_CURRENT_CHECK_ATTEMPT,
                 ss.max_check_attempts AS service_max_attempt,
                 i.instance_id AS SERVICE_INSTANCE_ID,
@@ -30,6 +31,8 @@
                 ss.notifications_enabled as notifications_enabled,
                 ss.problem_has_been_acknowledged as problem_acknowledged,
                 ss.scheduled_downtime_depth as scheduled_downtime_depth,
+                s.action_url AS SERVICE_ACTION_URL,
+                s.notes_url AS SERVICE_NOTES_URL,
                 ss.has_been_checked as service_has_been_checked
             FROM IcingaServices s
             INNER JOIN s.instance i
@@ -51,14 +54,14 @@
             <!--
                 Additional fields that are used in cronk filtering
             -->
-            <filter name="custom_variable_name" type="dql">
+            <filter name="customvariable_name" type="dql">
                 <join>s.customvariables cvs</join>
-                <select>cvs.varname AS custom_variable_name</select>
+                <select>cvs.varname AS customvariable_name</select>
             </filter>
 
-            <filter name="custom_variable_value" type="dql">
+            <filter name="customvariable_value" type="dql">
                 <join>s.customvariables cvs</join>
-                <select>cvs.varvalue AS custom_variable_value</select>
+                <select>cvs.varvalue AS customvariable_value</select>
             </filter>
 
             <filter name="hostgroup_name" type="dql">
@@ -101,13 +104,16 @@
                 ss.output AS SERVICE_OUTPUT,
                 ss.current_check_attempt AS SERVICE_CURRENT_CHECK_ATTEMPT,
                 ss.max_check_attempts AS SERVICE_MAX_CHECK_ATTEMPTS,
+                ss.perfdata AS SERVICE_PERFORMANCE_DATA,                
                 ss.max_check_attempts AS service_max_attempt,
                 i.instance_id AS SERVICE_INSTANCE_ID,
                 s.service_id AS SERVICE_ID,
                 ss.notifications_enabled as notifications_enabled,
                 ss.problem_has_been_acknowledged as problem_acknowledged,
                 ss.scheduled_downtime_depth as scheduled_downtime_depth,
-                ss.has_been_checked as service_has_been_checked
+                ss.has_been_checked as service_has_been_checked,
+                s.action_url AS SERVICE_ACTION_URL,
+                s.notes_url AS SERVICE_NOTES_URL
             FROM IcingaServices s
             INNER JOIN s.instance i
             INNER JOIN s.status ss





More information about the icinga-checkins mailing list