[icinga-checkins] icinga.org: icinga-web/feature/datapermissions-wip: Updated IcingaHost and IcingaService view credentials

git at icinga.org git at icinga.org
Tue Feb 19 17:23:59 CET 2013


Module: icinga-web
Branch: feature/datapermissions-wip
Commit: bdf8b17b84c5839710c1860d850c18903e4443de
URL:    https://git.icinga.org/?p=icinga-web.git;a=commit;h=bdf8b17b84c5839710c1860d850c18903e4443de

Author: Markus Frosch <markus at lazyfrosch.de>
Date:   Fri Feb 15 14:34:18 2013 +0100

Updated IcingaHost and IcingaService view credentials

They are not using the MultiLike Extender

---

 app/modules/Api/config/views/histories.xml     |   27 ++++++------------
 app/modules/Api/config/views/host.xml          |    9 ++----
 app/modules/Api/config/views/hostgroups.xml    |    9 ++----
 app/modules/Api/config/views/misc.xml          |   36 ++++++++----------------
 app/modules/Api/config/views/notifications.xml |   18 ++++--------
 app/modules/Api/config/views/service.xml       |   18 ++++--------
 app/modules/Api/config/views/servicegroups.xml |   18 ++++--------
 7 files changed, 45 insertions(+), 90 deletions(-)

diff --git a/app/modules/Api/config/views/histories.xml b/app/modules/Api/config/views/histories.xml
index 41c2518..6333b59 100644
--- a/app/modules/Api/config/views/histories.xml
+++ b/app/modules/Api/config/views/histories.xml
@@ -29,12 +29,9 @@
             ]]>
             </query>
 
-            <credential name="IcingaHost" type="dql">
-                <andwhere>
-                    <![CDATA[
-                        oh.name1 LIKE ${credential_value}
-                    ]]>
-                </andwhere>
+            <credential name="IcingaHost" type="MultiLike">
+                <parameter name="target">IcingaHost</parameter>
+                <parameter name="column">oh.name1</parameter>
             </credential>
 
             <credential name="IcingaHostgroup" type="dql">
@@ -105,20 +102,14 @@
             ]]>
             </query>
 
-            <credential name="IcingaHost" type="dql">
-                <andwhere>
-                    <![CDATA[
-                        oh.name1 LIKE ${credential_value}
-                    ]]>
-                </andwhere>
+            <credential name="IcingaHost" type="MultiLike">
+                <parameter name="target">IcingaHost</parameter>
+                <parameter name="column">oh.name1</parameter>
             </credential>
 
-            <credential name="IcingaService" type="dql">
-                <andwhere>
-                    <![CDATA[
-                        os.name2 LIKE ${credential_value}
-                    ]]>
-                </andwhere>
+            <credential name="IcingaService" type="MultiLike">
+                <parameter name="target">IcingaService</parameter>
+                <parameter name="column">os.name2</parameter>
             </credential>
 
             <credential name="IcingaServiceGroup" type="dql">
diff --git a/app/modules/Api/config/views/host.xml b/app/modules/Api/config/views/host.xml
old mode 100755
new mode 100644
index 51ca35d..ff32542
--- a/app/modules/Api/config/views/host.xml
+++ b/app/modules/Api/config/views/host.xml
@@ -49,12 +49,9 @@
             </query>
             <unique_field>h.host_object_id</unique_field>
 
-            <credential name="IcingaHost" type="dql">
-                <andwhere>
-                    <![CDATA[
-                        oh.name1 LIKE ${credential_value}
-                    ]]>
-                </andwhere>
+            <credential name="IcingaHost" type="MultiLike">
+                <parameter name="target">IcingaHost</parameter>
+                <parameter name="column">oh.name1</parameter>
             </credential>
 
             <credential name="IcingaHostgroup" type="dql">
diff --git a/app/modules/Api/config/views/hostgroups.xml b/app/modules/Api/config/views/hostgroups.xml
old mode 100755
new mode 100644
index fef81bd..b9ff657
--- a/app/modules/Api/config/views/hostgroups.xml
+++ b/app/modules/Api/config/views/hostgroups.xml
@@ -34,12 +34,9 @@
 
             </query>
 
-            <credential name="IcingaHost" type="dql">
-                <andwhere>
-                    <![CDATA[
-                        oh.name1 LIKE ${credential_value}
-                    ]]>
-                </andwhere>
+            <credential name="IcingaHost" type="MultiLike">
+                <parameter name="target">IcingaHost</parameter>
+                <parameter name="column">oh.name1</parameter>
             </credential>
 
             <credential name="IcingaHostgroup" type="dql">
diff --git a/app/modules/Api/config/views/misc.xml b/app/modules/Api/config/views/misc.xml
old mode 100755
new mode 100644
index 7b47569..b447dd5
--- a/app/modules/Api/config/views/misc.xml
+++ b/app/modules/Api/config/views/misc.xml
@@ -70,20 +70,14 @@
             ]]>
             </query>
 
-            <credential name="IcingaHost" type="dql">
-                <andwhere>
-                    <![CDATA[
-                        o.name1 LIKE ${credential_value}
-                    ]]>
-                </andwhere>
+            <credential name="IcingaHost" type="MultiLike">
+                <parameter name="target">IcingaHost</parameter>
+                <parameter name="column">o.name1</parameter>
             </credential>
 
-            <credential name="IcingaService" type="dql">
-                <andwhere>
-                    <![CDATA[
-                        o.name2 LIKE ${credential_value}
-                    ]]>
-                </andwhere>
+            <credential name="IcingaService" type="MultiLike">
+                <parameter name="target">IcingaService</parameter>
+                <parameter name="column">o.name2</parameter>
             </credential>
 
             <credential name="IcingaServiceGroup" type="dql">
@@ -205,20 +199,14 @@
             ]]>
             </query>
 
-            <credential name="IcingaHost" type="dql">
-                <andwhere>
-                    <![CDATA[
-                        o.name1 LIKE ${credential_value}
-                    ]]>
-                </andwhere>
+            <credential name="IcingaHost" type="MultiLike">
+                <parameter name="target">IcingaHost</parameter>
+                <parameter name="column">o.name1</parameter>
             </credential>
 
-            <credential name="IcingaService" type="dql">
-                <andwhere>
-                    <![CDATA[
-                        o.name2 LIKE ${credential_value}
-                    ]]>
-                </andwhere>
+            <credential name="IcingaService" type="MultiLike">
+                <parameter name="target">IcingaService</parameter>
+                <parameter name="column">o.name2</parameter>
             </credential>
 
             <credential name="IcingaServiceGroup" type="dql">
diff --git a/app/modules/Api/config/views/notifications.xml b/app/modules/Api/config/views/notifications.xml
index 0777196..75bc0f1 100644
--- a/app/modules/Api/config/views/notifications.xml
+++ b/app/modules/Api/config/views/notifications.xml
@@ -27,20 +27,14 @@
             ]]>
             </query>
 
-            <credential name="IcingaHost" type="dql">
-                <andwhere>
-                    <![CDATA[
-                        o.name1 LIKE ${credential_value}
-                    ]]>
-                </andwhere>
+            <credential name="IcingaHost" type="MultiLike">
+                <parameter name="target">IcingaHost</parameter>
+                <parameter name="column">o.name1</parameter>
             </credential>
 
-            <credential name="IcingaService" type="dql">
-                <andwhere>
-                    <![CDATA[
-                        o.name2 LIKE ${credential_value}
-                    ]]>
-                </andwhere>
+            <credential name="IcingaService" type="MultiLike">
+                <parameter name="target">IcingaService</parameter>
+                <parameter name="column">o.name2</parameter>
             </credential>
 
             <credential name="IcingaContactgroup" type="dql">
diff --git a/app/modules/Api/config/views/service.xml b/app/modules/Api/config/views/service.xml
old mode 100755
new mode 100644
index 645e1ab..6a9cbcc
--- a/app/modules/Api/config/views/service.xml
+++ b/app/modules/Api/config/views/service.xml
@@ -54,20 +54,14 @@
             ]]>
             </query>
 
-            <credential name="IcingaHost" type="dql">
-                <andwhere>
-                    <![CDATA[
-                        oh.name1 LIKE ${credential_value}
-                    ]]>
-                </andwhere>
+            <credential name="IcingaHost" type="MultiLike">
+                <parameter name="target">IcingaHost</parameter>
+                <parameter name="column">oh.name1</parameter>
             </credential>
 
-            <credential name="IcingaService" type="dql">
-                <andwhere>
-                    <![CDATA[
-                        os.name2 LIKE ${credential_value}
-                    ]]>
-                </andwhere>
+            <credential name="IcingaService" type="MultiLike">
+                <parameter name="target">IcingaService</parameter>
+                <parameter name="column">os.name2</parameter>
             </credential>
 
             <credential name="IcingaServiceGroup" type="dql">
diff --git a/app/modules/Api/config/views/servicegroups.xml b/app/modules/Api/config/views/servicegroups.xml
index 6ce1441..75721b7 100644
--- a/app/modules/Api/config/views/servicegroups.xml
+++ b/app/modules/Api/config/views/servicegroups.xml
@@ -61,20 +61,14 @@
                 ]]>
            </query>
 
-            <credential name="IcingaHost" type="dql">
-                <andwhere>
-                    <![CDATA[
-                        o.name1 LIKE ${credential_value}
-                    ]]>
-                </andwhere>
+            <credential name="IcingaHost" type="MultiLike">
+                <parameter name="target">IcingaHost</parameter>
+                <parameter name="column">o.name1</parameter>
             </credential>
 
-            <credential name="IcingaService" type="dql">
-                <andwhere>
-                    <![CDATA[
-                        o.name2 LIKE ${credential_value}
-                    ]]>
-                </andwhere>
+            <credential name="IcingaService" type="MultiLike">
+                <parameter name="target">IcingaService</parameter>
+                <parameter name="column">o.name2</parameter>
             </credential>
 
             <credential name="IcingaServicegroup" type="dql">





More information about the icinga-checkins mailing list