[icinga-checkins] icinga.org: icinga-reports/master: added "is_active" to hostgroup services

[git at icinga.org]

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

Author: Christoph Niemann <christoph.niemann at netways.de>
Date:   Tue Aug 23 14:17:05 2016 +0200

added "is_active" to hostgroup services

---

 .../templates/sub/host/availabilityInGivenTime.data      |   14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/reports/resources/icinga/templates/sub/host/availabilityInGivenTime.data b/reports/resources/icinga/templates/sub/host/availabilityInGivenTime.data
index 298b6b0..0fc53d3 100644
--- a/reports/resources/icinga/templates/sub/host/availabilityInGivenTime.data
+++ b/reports/resources/icinga/templates/sub/host/availabilityInGivenTime.data
@@ -62,15 +62,15 @@ WHERE objects.object_id = $P{p_host_object_id}]]>
 	</parameter>
 	<queryString>
 		<![CDATA[select name1,
-  address,
+       name2,
+	address,
   service_object_id,
   timestampdiff(second, $P{p_date_start}, $P{p_date_end}) as period
-from icinga_objects,
-  icinga_hosts,
-  icinga_services
-where icinga_objects.object_id  = icinga_hosts.host_object_id
-and icinga_hosts.host_object_id = icinga_services.host_object_id
-and object_id                      = $P{p_host_object_id}]]>
+from icinga_services
+	join icinga_objects on  icinga_services.service_object_id = icinga_objects.object_id
+	join icinga_hosts on icinga_services.host_object_id = icinga_hosts.host_object_id
+where icinga_services.host_object_id = $P{p_host_object_id}
+and is_active = 1]]>
 	</queryString>
 	<field name="name1" class="java.lang.String">
 		<fieldDescription><![CDATA[]]></fieldDescription>