[icinga-checkins] icinga.org: icinga-api/master: * removed contactgroup and contact filter from status-summary queries

git at icinga.org git at icinga.org
Tue Oct 27 09:58:45 CET 2009


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

Author: Christian Doebler <christian.doebler at netways.de>
Date:   Tue Oct 27 09:58:04 2009 +0100

* removed contactgroup and contact filter from status-summary queries

---

 objects/search/IcingaApiSearchIdo.php |   24 ++++++++++++------------
 1 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/objects/search/IcingaApiSearchIdo.php b/objects/search/IcingaApiSearchIdo.php
index da5d5ff..be321d5 100644
--- a/objects/search/IcingaApiSearchIdo.php
+++ b/objects/search/IcingaApiSearchIdo.php
@@ -171,11 +171,11 @@ class IcingaApiSearchIdo
 			inner join ${TABLE_PREFIX}objects oh on oh.object_id = hs.host_object_id
 			inner join ${TABLE_PREFIX}hosts h on h.host_object_id = oh.object_id
 			inner join ${TABLE_PREFIX}instances i on i.instance_id = h.instance_id
-			inner join ${TABLE_PREFIX}host_contactgroups hcg on hcg.host_id = h.host_id
-			inner join ${TABLE_PREFIX}contactgroups cg on cg.contactgroup_object_id = hcg.contactgroup_object_id
-			inner join ${TABLE_PREFIX}objects ocg on ocg.object_id = hcg.contactgroup_object_id
-			inner join ${TABLE_PREFIX}contactgroup_members cgm on cgm.contactgroup_id = cg.contactgroup_id
-			inner join ${TABLE_PREFIX}objects oc on oc.object_id = cgm.contact_object_id
+			-- inner join ${TABLE_PREFIX}host_contactgroups hcg on hcg.host_id = h.host_id
+			-- inner join ${TABLE_PREFIX}contactgroups cg on cg.contactgroup_object_id = hcg.contactgroup_object_id
+			-- inner join ${TABLE_PREFIX}objects ocg on ocg.object_id = hcg.contactgroup_object_id
+			-- inner join ${TABLE_PREFIX}contactgroup_members cgm on cgm.contactgroup_id = cg.contactgroup_id
+			-- inner join ${TABLE_PREFIX}objects oc on oc.object_id = cgm.contact_object_id
 			where 1
 				${FILTER}
 			group by
@@ -190,13 +190,13 @@ class IcingaApiSearchIdo
 			inner join ${TABLE_PREFIX}objects os on os.object_id = ss.service_object_id
 			inner join ${TABLE_PREFIX}services s on s.service_object_id = os.object_id
 			inner join ${TABLE_PREFIX}instances i on i.instance_id = s.instance_id
-			inner join ${TABLE_PREFIX}service_contactgroups scg on scg.service_id = s.service_id
-			inner join ${TABLE_PREFIX}contactgroups cg on cg.contactgroup_object_id = scg.contactgroup_object_id
-			inner join ${TABLE_PREFIX}contactgroup_members cgm on cgm.contactgroup_id = cg.contactgroup_id
-			inner join ${TABLE_PREFIX}objects oc on oc.object_id = cgm.contact_object_id
-			inner join ${TABLE_PREFIX}objects ocg on ocg.object_id = scg.contactgroup_object_id
-			inner join ${TABLE_PREFIX}hoststatus hs on hs.host_object_id = s.host_object_id
-			inner join ${TABLE_PREFIX}objects oh on oh.object_id = s.host_object_id
+			-- inner join ${TABLE_PREFIX}service_contactgroups scg on scg.service_id = s.service_id
+			-- inner join ${TABLE_PREFIX}contactgroups cg on cg.contactgroup_object_id = scg.contactgroup_object_id
+			-- inner join ${TABLE_PREFIX}contactgroup_members cgm on cgm.contactgroup_id = cg.contactgroup_id
+			-- inner join ${TABLE_PREFIX}objects oc on oc.object_id = cgm.contact_object_id
+			-- inner join ${TABLE_PREFIX}objects ocg on ocg.object_id = scg.contactgroup_object_id
+			-- inner join ${TABLE_PREFIX}hoststatus hs on hs.host_object_id = s.host_object_id
+			-- inner join ${TABLE_PREFIX}objects oh on oh.object_id = s.host_object_id
 			where 1
 				${FILTER}
 			group by





More information about the icinga-checkins mailing list