[icinga-checkins] icinga.org: icinga-api/cdoebler/default: * fixed queries for host-execution time and host latency for mysql, oci and pgsql

git at icinga.org git at icinga.org
Thu Jan 21 11:08:31 CET 2010


Module: icinga-api
Branch: cdoebler/default
Commit: 233b947ac614ae2a38387fb03978391b665d287b
URL:    https://git.icinga.org/?p=icinga-api.git;a=commit;h=233b947ac614ae2a38387fb03978391b665d287b

Author: Christian Doebler <christian.doebler at netways.de>
Date:   Thu Jan 21 11:07:44 2010 +0100

* fixed queries for host-execution time and host latency for mysql, oci and pgsql

---

 .../data_interfaces/IcingaApiSearchIdoMysql.php    |   12 ++++++------
 .../data_interfaces/IcingaApiSearchIdoOci.php      |   12 ++++++------
 .../data_interfaces/IcingaApiSearchIdoPgsql.php    |   12 ++++++------
 3 files changed, 18 insertions(+), 18 deletions(-)

diff --git a/objects/search/data_interfaces/IcingaApiSearchIdoMysql.php b/objects/search/data_interfaces/IcingaApiSearchIdoMysql.php
index 358b189..59c0a03 100644
--- a/objects/search/data_interfaces/IcingaApiSearchIdoMysql.php
+++ b/objects/search/data_interfaces/IcingaApiSearchIdoMysql.php
@@ -423,12 +423,12 @@ class IcingaApiSearchIdoMysql
 		'HOST_PROBLEM_HAS_BEEN_ACKNOWLEDGED' => array('hs', 'problem_has_been_acknowledged'),
 		'HOST_SCHEDULED_DOWNTIME_DEPTH' => array('hs', 'scheduled_downtime_depth'),
 		'HOST_STATUS_UPDATE_TIME' => array('hs', 'status_update_time'),
-		'HOST_EXECUTION_TIME_MIN' => array('min(hs', 'execution_time)'),
-		'HOST_EXECUTION_TIME_AVG' => array('avg(hs', 'execution_time)'),
-		'HOST_EXECUTION_TIME_MAX' => array('max(hs', 'execution_time)'),
-		'HOST_LATENCY_MIN' => array('min(hs', 'latency)'),
-		'HOST_LATENCY_AVG' => array('avg(hs', 'latency)'),
-		'HOST_LATENCY_MAX' => array('max(hs', 'latency)'),
+		'HOST_EXECUTION_TIME_MIN' => array('hs', 'execution_time', 'min(%s)'),
+		'HOST_EXECUTION_TIME_AVG' => array('hs', 'execution_time', 'avg(%s)'),
+		'HOST_EXECUTION_TIME_MAX' => array('hs', 'execution_time', 'max(%s)'),
+		'HOST_LATENCY_MIN' => array('hs', 'latency', 'min(%s)'),
+		'HOST_LATENCY_AVG' => array('hs', 'latency', 'avg(%s)'),
+		'HOST_LATENCY_MAX' => array('hs', 'latency', 'max(%s)'),
 		'HOST_ALL' => array('h', '*'),
 		'HOST_STATUS_ALL' => array('hs', '*'),
 		'HOST_STATE' => array('hs', 'current_state'),
diff --git a/objects/search/data_interfaces/IcingaApiSearchIdoOci.php b/objects/search/data_interfaces/IcingaApiSearchIdoOci.php
index 6be2bbe..572605f 100644
--- a/objects/search/data_interfaces/IcingaApiSearchIdoOci.php
+++ b/objects/search/data_interfaces/IcingaApiSearchIdoOci.php
@@ -431,12 +431,12 @@ class IcingaApiSearchIdoOci
 		'HOST_PROBLEM_HAS_BEEN_ACKNOWLEDGED' => array('hs', 'problem_has_been_acknowledged'),
 		'HOST_SCHEDULED_DOWNTIME_DEPTH' => array('hs', 'scheduled_downtime_depth'),
 		'HOST_STATUS_UPDATE_TIME' => array('hs', 'status_update_time'),
-		'HOST_EXECUTION_TIME_MIN' => array('min(hs', 'execution_time)'),
-		'HOST_EXECUTION_TIME_AVG' => array('avg(hs', 'execution_time)'),
-		'HOST_EXECUTION_TIME_MAX' => array('max(hs', 'execution_time)'),
-		'HOST_LATENCY_MIN' => array('min(hs', 'latency)'),
-		'HOST_LATENCY_AVG' => array('avg(hs', 'latency)'),
-		'HOST_LATENCY_MAX' => array('max(hs', 'latency)'),
+		'HOST_EXECUTION_TIME_MIN' => array('hs', 'execution_time', 'min(%s)'),
+		'HOST_EXECUTION_TIME_AVG' => array('hs', 'execution_time', 'avg(%s)'),
+		'HOST_EXECUTION_TIME_MAX' => array('hs', 'execution_time', 'max(%s)'),
+		'HOST_LATENCY_MIN' => array('hs', 'latency', 'min(%s)'),
+		'HOST_LATENCY_AVG' => array('hs', 'latency', 'avg(%s)'),
+		'HOST_LATENCY_MAX' => array('hs', 'latency', 'max(%s)'),
 		'HOST_ALL' => array('h', '*'),
 		'HOST_STATUS_ALL' => array('hs', '*'),
 		'HOST_STATE' => array('hs', 'current_state'),
diff --git a/objects/search/data_interfaces/IcingaApiSearchIdoPgsql.php b/objects/search/data_interfaces/IcingaApiSearchIdoPgsql.php
index c562986..9a07a19 100644
--- a/objects/search/data_interfaces/IcingaApiSearchIdoPgsql.php
+++ b/objects/search/data_interfaces/IcingaApiSearchIdoPgsql.php
@@ -424,12 +424,12 @@ class IcingaApiSearchIdoPgsql
 		'HOST_PROBLEM_HAS_BEEN_ACKNOWLEDGED' => array('hs', 'problem_has_been_acknowledged'),
 		'HOST_SCHEDULED_DOWNTIME_DEPTH' => array('hs', 'scheduled_downtime_depth'),
 		'HOST_STATUS_UPDATE_TIME' => array('hs', 'status_update_time'),
-		'HOST_EXECUTION_TIME_MIN' => array('min(hs', 'execution_time)'),
-		'HOST_EXECUTION_TIME_AVG' => array('avg(hs', 'execution_time)'),
-		'HOST_EXECUTION_TIME_MAX' => array('max(hs', 'execution_time)'),
-		'HOST_LATENCY_MIN' => array('min(hs', 'latency)'),
-		'HOST_LATENCY_AVG' => array('avg(hs', 'latency)'),
-		'HOST_LATENCY_MAX' => array('max(hs', 'latency)'),
+		'HOST_EXECUTION_TIME_MIN' => array('hs', 'execution_time', 'min(%s)'),
+		'HOST_EXECUTION_TIME_AVG' => array('hs', 'execution_time', 'avg(%s)'),
+		'HOST_EXECUTION_TIME_MAX' => array('hs', 'execution_time', 'max(%s)'),
+		'HOST_LATENCY_MIN' => array('hs', 'latency', 'min(%s)'),
+		'HOST_LATENCY_AVG' => array('hs', 'latency', 'avg(%s)'),
+		'HOST_LATENCY_MAX' => array('hs', 'latency', 'max(%s)'),
 		'HOST_ALL' => array('h', '*'),
 		'HOST_STATUS_ALL' => array('hs', '*'),
 		'HOST_STATE' => array('hs', 'current_state'),





More information about the icinga-checkins mailing list