[icinga-checkins] icinga.org: icinga-api/mhein/default: * Added instances to TARGET_LOG

git at icinga.org git at icinga.org
Wed Jan 26 17:23:56 CET 2011


Module: icinga-api
Branch: mhein/default
Commit: 67f5f5d21d1a154d14aa73a2fc7f93cf29d4d047
URL:    https://git.icinga.org/?p=icinga-api.git;a=commit;h=67f5f5d21d1a154d14aa73a2fc7f93cf29d4d047

Author: Marius Hein <marius.hein at netways.de>
Date:   Wed Jan 26 17:23:42 2011 +0100

* Added instances to TARGET_LOG

---

 .../data_interfaces/IcingaApiSearchIdoMysql.php    |    1 +
 .../data_interfaces/IcingaApiSearchIdoOci.php      |    3 ++-
 .../data_interfaces/IcingaApiSearchIdoOci8.php     |    1 +
 .../data_interfaces/IcingaApiSearchIdoPgsql.php    |    1 +
 4 files changed, 5 insertions(+), 1 deletions(-)

diff --git a/objects/search/data_interfaces/IcingaApiSearchIdoMysql.php b/objects/search/data_interfaces/IcingaApiSearchIdoMysql.php
index 46fd456..851bbf8 100644
--- a/objects/search/data_interfaces/IcingaApiSearchIdoMysql.php
+++ b/objects/search/data_interfaces/IcingaApiSearchIdoMysql.php
@@ -182,6 +182,7 @@ implements IcingaApiSearchIdoInterface {
 				${FIELDS}
 			from
 				${TABLE_PREFIX}logentries le
+				${if_table:i:inner join ${TABLE_PREFIX}instances i on i.instance_id = le.instance_id}
 			${FILTER}
 			${GROUPBY}
 			${ORDERBY}
diff --git a/objects/search/data_interfaces/IcingaApiSearchIdoOci.php b/objects/search/data_interfaces/IcingaApiSearchIdoOci.php
index 03e8763..35da83c 100644
--- a/objects/search/data_interfaces/IcingaApiSearchIdoOci.php
+++ b/objects/search/data_interfaces/IcingaApiSearchIdoOci.php
@@ -187,7 +187,8 @@ class IcingaApiSearchIdoOci
 			'select
 				${FIELDS}
 			from
-				${TABLE_PREFIX}logentries le 
+				${TABLE_PREFIX}logentries le
+				${if_table:i:inner join ${TABLE_PREFIX}instances i on i.instance_id = le.instance_id} 
 			${FILTER}
 			${GROUPBY}
 			${ORDERBY}
diff --git a/objects/search/data_interfaces/IcingaApiSearchIdoOci8.php b/objects/search/data_interfaces/IcingaApiSearchIdoOci8.php
index 40b0f35..bc39833 100644
--- a/objects/search/data_interfaces/IcingaApiSearchIdoOci8.php
+++ b/objects/search/data_interfaces/IcingaApiSearchIdoOci8.php
@@ -194,6 +194,7 @@ class IcingaApiSearchIdoOci8
 				${FIELDS}
 			from
 				${TABLE_PREFIX}logentries le
+				${if_table:i:inner join ${TABLE_PREFIX}instances i on i.instance_id = le.instance_id}
 			 
 			${FILTER}
 			${GROUPBY}
diff --git a/objects/search/data_interfaces/IcingaApiSearchIdoPgsql.php b/objects/search/data_interfaces/IcingaApiSearchIdoPgsql.php
index 2245380..3ade444 100644
--- a/objects/search/data_interfaces/IcingaApiSearchIdoPgsql.php
+++ b/objects/search/data_interfaces/IcingaApiSearchIdoPgsql.php
@@ -181,6 +181,7 @@ class IcingaApiSearchIdoPgsql
 				${FIELDS}
 			from
 				${TABLE_PREFIX}logentries AS le
+				${if_table:i:inner join ${TABLE_PREFIX}instances i on i.instance_id = le.instance_id}
 			${FILTER}
 			${GROUPBY}
 			${ORDERBY}





More information about the icinga-checkins mailing list