[Pkg-nagios-changes] [SCM] Debian packaging of icinga-web branch, master, updated. debian/1.7.1-4-14-g1c7099f

[Markus Frosch]

The following commit has been merged in the master branch:
commit 1647481fa106c66854b96c36e28317f5de2a3c11
Author: Markus Frosch <markus at lazyfrosch.de>
Date:   Mon Aug 13 16:41:58 2012 +0200

    added patch 20_pgsql_statusquery_fix
    
    The patch fixes a problem with host and servicestatus queries
    from a PgSQL IDO database.
    
    See https://dev.icinga.org/issues/2978

diff --git a/debian/patches/20_pgsql_statusquery_fix b/debian/patches/20_pgsql_statusquery_fix
new file mode 100644
index 0000000..7a816d2
--- /dev/null
+++ b/debian/patches/20_pgsql_statusquery_fix
@@ -0,0 +1,50 @@
+Description: pgsql statusquery fix
+ With the query inside the 1.7.2 release PostgreSQL
+ drops an exception due to an invalid timestamp
+ used in the SELECT.
+ .
+ The change was tested to work with MySQL and PgSQL.
+Author: Markus Frosch <markus at lazyfrosch.de>
+Forwarded: https://dev.icinga.org/issues/2978
+Last-Update: 2012-08-13
+
+--- a/app/modules/Api/config/views/host.xml
++++ b/app/modules/Api/config/views/host.xml
+@@ -14,7 +14,7 @@
+                 h.alias AS HOST_ALIAS,
+                 h.display_name AS HOST_DISPLAY_NAME,
+                 hs.current_state AS HOST_CURRENT_STATE,
+-                (CASE WHEN hs.last_state_change='0000-00-00 00:00:00' THEN ps.program_start_time ELSE hs.last_state_change END) as DURATION_START,
++                (CASE WHEN hs.last_state_change<='1970-01-01 00:00:00' THEN ps.program_start_time ELSE hs.last_state_change END) as DURATION_START,
+                 hs.last_check AS HOST_LAST_CHECK,
+                 hs.next_check AS HOST_NEXT_CHECK,
+                 ps.program_start_time AS HOST_PROGRAM_START_TIME,
+@@ -106,7 +106,7 @@
+                 h.display_name AS HOST_DISPLAY_NAME,
+                 hs.current_state AS HOST_CURRENT_STATE,
+                 hs.process_performance_data AS HOST_PROCESS_PERFORMANCE_DATA,
+-                (CASE WHEN hs.last_state_change='0000-00-00 00:00:00' THEN ps.program_start_time ELSE hs.last_state_change END) as DURATION_START,
++                (CASE WHEN hs.last_state_change<='1970-01-01 00:00:00' THEN ps.program_start_time ELSE hs.last_state_change END) as DURATION_START,
+                 hs.last_check AS HOST_LAST_CHECK,
+                 hs.next_check AS HOST_NEXT_CHECK,
+                 ps.program_start_time AS HOST_PROGRAM_START_TIME,
+--- a/app/modules/Api/config/views/service.xml
++++ b/app/modules/Api/config/views/service.xml
+@@ -18,7 +18,7 @@
+                 s.display_name AS SERVICE_DISPLAY_NAME,
+                 ss.process_performance_data AS SERVICE_PROCESS_PERFORMANCE_DATA,
+                 ss.current_state AS SERVICE_CURRENT_STATE,
+-                (CASE WHEN ss.last_state_change='0000-00-00 00:00:00' THEN ps.program_start_time ELSE ss.last_state_change END) as DURATION_START,
++                (CASE WHEN ss.last_state_change<='1970-01-01 00:00:00' THEN ps.program_start_time ELSE ss.last_state_change END) as DURATION_START,
+                 ps.program_start_time AS SERVICE_PROGRAM_START_TIME,
+                 ss.last_check AS SERVICE_LAST_CHECK,
+                 ss.next_check AS SERVICE_NEXT_CHECK,
+@@ -133,7 +133,7 @@
+                 os.name2 AS SERVICE_NAME,
+                 s.display_name AS SERVICE_DISPLAY_NAME,
+                 ss.current_state AS SERVICE_CURRENT_STATE,
+-                (CASE WHEN ss.last_state_change='0000-00-00 00:00:00' THEN ps.program_start_time ELSE ss.last_state_change END) as DURATION_START,
++                (CASE WHEN ss.last_state_change<='1970-01-01 00:00:00' THEN ps.program_start_time ELSE ss.last_state_change END) as DURATION_START,
+                 ss.process_performance_data AS SERVICE_PROCESS_PERFORMANCE_DATA,
+                 ss.last_check AS SERVICE_LAST_CHECK,
+                 ss.next_check AS SERVICE_NEXT_CHECK,
diff --git a/debian/patches/series b/debian/patches/series
index c12865f..29b62ad 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +1,2 @@
 10_db_version_fix
+20_pgsql_statusquery_fix

-- 
Debian packaging of icinga-web