java/code/src/com/redhat/rhn/common/db/datasource/xml/System_queries.xml | 49
+++++-----
java/spacewalk-java.spec | 7 +
rel-eng/packages/spacewalk-java | 2
rel-eng/packages/spacewalk-web | 2
web/modules/rhn/RHN/DB/DataSource/xml/System_queries.xml | 4
web/spacewalk-web.spec | 5 -
6 files changed, 43 insertions(+), 26 deletions(-)
New commits:
commit 0a049a0cee5dee1b9063000af23fc02c88f9cdcf
Author: Lukas Zapletal <lzap+git(a)redhat.com>
Date: Thu Nov 25 10:08:35 2010 +0100
Automatic commit of package [spacewalk-web] release [1.2.28-1].
diff --git a/rel-eng/packages/spacewalk-web b/rel-eng/packages/spacewalk-web
index 79d13ee..6056d59 100644
--- a/rel-eng/packages/spacewalk-web
+++ b/rel-eng/packages/spacewalk-web
@@ -1 +1 @@
-1.2.27-1 web/
+1.2.28-1 web/
diff --git a/web/spacewalk-web.spec b/web/spacewalk-web.spec
index 4e6d83e..c45103c 100644
--- a/web/spacewalk-web.spec
+++ b/web/spacewalk-web.spec
@@ -2,7 +2,7 @@ Name: spacewalk-web
Summary: Spacewalk Web site packages
Group: Applications/Internet
License: GPLv2
-Version: 1.2.27
+Version: 1.2.28
Release: 1%{?dist}
URL:
https://fedorahosted.org/spacewalk
Source0:
https://fedorahosted.org/releases/s/p/spacewalk/%{name}-%{version}.tar.gz
@@ -256,6 +256,9 @@ rm -rf $RPM_BUILD_ROOT
# $Id$
%changelog
+* Thu Nov 25 2010 Lukas Zapletal 1.2.28-1
+- Adding missing monitoring state (UNKNOWN)
+
* Mon Nov 15 2010 Jan Pazdziora 1.2.27-1
- bumping api version (jsherril(a)redhat.com)
commit 70be4c8c6406e48a8378d1fbbb46e190876e4cc9
Author: Lukas Zapletal <lzap+git(a)redhat.com>
Date: Thu Nov 25 10:08:21 2010 +0100
Automatic commit of package [spacewalk-java] release [1.2.114-1].
diff --git a/java/spacewalk-java.spec b/java/spacewalk-java.spec
index 8f7a89e..b2a808d 100644
--- a/java/spacewalk-java.spec
+++ b/java/spacewalk-java.spec
@@ -17,7 +17,7 @@ Name: spacewalk-java
Summary: Spacewalk Java site packages
Group: Applications/Internet
License: GPLv2
-Version: 1.2.113
+Version: 1.2.114
Release: 1%{?dist}
URL:
https://fedorahosted.org/spacewalk
Source0:
https://fedorahosted.org/releases/s/p/spacewalk/%{name}-%{version}.tar.gz
@@ -434,6 +434,11 @@ fi
%{jardir}/postgresql-jdbc.jar
%changelog
+* Thu Nov 25 2010 Lukas Zapletal 1.2.114-1
+- Fixing two queries in system overview (monitoring)
+- Replacing DECODE with ANSI compatible CASE-WHEN
+- Adding missing monitoring state (UNKNOWN)
+
* Thu Nov 18 2010 Jan Pazdziora 1.2.113-1
- Turning off checkstyle in the java spec for F14 (cherry picked from commit
2e31f06f5cbb580cc5c82ab6421d315139c1a72a) (lzap+git(a)redhat.com)
diff --git a/rel-eng/packages/spacewalk-java b/rel-eng/packages/spacewalk-java
index 65b7f78..abb6d1e 100644
--- a/rel-eng/packages/spacewalk-java
+++ b/rel-eng/packages/spacewalk-java
@@ -1 +1 @@
-1.2.113-1 java/
+1.2.114-1 java/
commit 90c046fee5ec0d35d3672456f25294edf4f5490f
Author: Lukas Zapletal <lzap+git(a)redhat.com>
Date: Thu Nov 25 10:07:37 2010 +0100
Fixing two queries in system overview (monitoring)
There were problems with ANSI LEFT OUTER JOIN syntax for PG. It was
incorrect. Now the query was rewritten to be ANSI compatible correctly.
(cherry picked from commit f8fc790513588228feb21b97b590e63fa01bf64b)
diff --git a/java/code/src/com/redhat/rhn/common/db/datasource/xml/System_queries.xml
b/java/code/src/com/redhat/rhn/common/db/datasource/xml/System_queries.xml
index 94f34e4..7f00d80 100644
--- a/java/code/src/com/redhat/rhn/common/db/datasource/xml/System_queries.xml
+++ b/java/code/src/com/redhat/rhn/common/db/datasource/xml/System_queries.xml
@@ -1189,11 +1189,12 @@ select distinct sgm.server_id as ID, 1 as virtual_host
</query>
<query name="system_overview_most_critical" params="">
- SELECT SERVER_ID AS ID, SECURITY_ERRATA, BUG_ERRATA, ENHANCEMENT_ERRATA,
OUTDATED_PACKAGES, SERVER_NAME,
+ SELECT SERVER_ID AS ID, SECURITY_ERRATA, BUG_ERRATA, ENHANCEMENT_ERRATA,
OUTDATED_PACKAGES, SERVER_NAME,
SERVER_ADMINS, GROUP_COUNT, NOTE_COUNT, MODIFIED, CHANNEL_LABELS,
HISTORY_COUNT,
LAST_CHECKIN_DAYS_AGO, PENDING_UPDATES, OS, RELEASE, SERVER_ARCH_NAME,
LAST_CHECKIN, LOCKED,
- config_files_with_differences,
- ( SELECT CASE MAX(CASE PS.state
+ config_files_with_differences, MONITORING_STATUS.ST AS MONITORING_STATUS
+ FROM rhnServerOverview OV LEFT OUTER JOIN
+ ( SELECT CP.host_id, CASE MAX(CASE PS.state
WHEN 'OK' THEN 1
WHEN 'PENDING' THEN 2
WHEN 'UNKNOWN' THEN 3
@@ -1207,19 +1208,19 @@ select distinct sgm.server_id as ID, 1 as virtual_host
FROM rhn_probe_state PS, rhnServerOverview OV
LEFT OUTER JOIN rhn_check_probe CP ON OV.server_id = CP.host_id
WHERE PS.probe_id = CP.probe_id
- GROUP BY OV.server_id ) MONITORING_STATUS
- FROM rhnServerOverview OV
+ GROUP BY CP.host_id ) MONITORING_STATUS ON OV.server_id =
MONITORING_STATUS.host_id
WHERE server_id IN (%s)
ORDER BY SECURITY_ERRATA DESC, BUG_ERRATA DESC, ENHANCEMENT_ERRATA DESC
</query>
<query name="virtual_system_overview" params="">
- SELECT VI.id,
+ SELECT VI.id,
SERVER_ID as system_id, SECURITY_ERRATA, BUG_ERRATA, ENHANCEMENT_ERRATA,
OUTDATED_PACKAGES, SERVER_NAME,
SERVER_ADMINS, GROUP_COUNT, NOTE_COUNT, OV.MODIFIED, CHANNEL_LABELS,
CHANNEL_ID, HISTORY_COUNT,
LAST_CHECKIN_DAYS_AGO, PENDING_UPDATES, OS, RELEASE, SERVER_ARCH_NAME,
LAST_CHECKIN, LOCKED,
- config_files_with_differences,
- ( SELECT CASE MAX(CASE PS.state
+ config_files_with_differences, MONITORING_STATUS.ST AS MONITORING_STATUS
+ FROM rhnVirtualInstance VI, rhnServerOverview OV LEFT OUTER JOIN
+ ( SELECT CP.host_id, CASE MAX(CASE PS.state
WHEN 'OK' THEN 1
WHEN 'PENDING' THEN 2
WHEN 'UNKNOWN' THEN 3
@@ -1233,8 +1234,7 @@ ORDER BY SECURITY_ERRATA DESC, BUG_ERRATA DESC, ENHANCEMENT_ERRATA
DESC
FROM rhn_probe_state PS, rhnServerOverview OV
LEFT OUTER JOIN rhn_check_probe CP ON OV.server_id = CP.host_id
WHERE PS.probe_id = CP.probe_id
- GROUP BY OV.server_id ) MONITORING_STATUS
- FROM rhnServerOverview OV, rhnVirtualInstance VI
+ GROUP BY CP.host_id ) MONITORING_STATUS ON OV.server_id =
MONITORING_STATUS.host_id
WHERE VI.id IN (%s)
AND ( ( VI.uuid IS NULL
AND OV.server_id = VI.host_system_id)
commit c281f5696043560230d937e6bec866c7f9c1b727
Author: Lukas Zapletal <lzap+git(a)redhat.com>
Date: Thu Nov 25 10:05:51 2010 +0100
Replacing DECODE with ANSI compatible CASE-WHEN
(cherry picked from commit baa480636bd9c63c5568fc464c1d23b6b55b9faa)
diff --git a/java/code/src/com/redhat/rhn/common/db/datasource/xml/System_queries.xml
b/java/code/src/com/redhat/rhn/common/db/datasource/xml/System_queries.xml
index 40ac62e..94f34e4 100644
--- a/java/code/src/com/redhat/rhn/common/db/datasource/xml/System_queries.xml
+++ b/java/code/src/com/redhat/rhn/common/db/datasource/xml/System_queries.xml
@@ -1151,15 +1151,24 @@ ORDER BY S.ID
SERVER_ADMINS, GROUP_COUNT, NOTE_COUNT, MODIFIED, CHANNEL_LABELS, CHANNEL_ID,
HISTORY_COUNT,
LAST_CHECKIN_DAYS_AGO, PENDING_UPDATES, OS, RELEASE, SERVER_ARCH_NAME,
LAST_CHECKIN, LOCKED,
config_files_with_differences,
- ( SELECT CASE
- MAX(CASE PS.state WHEN 'OK' THEN 1 WHEN 'PENDING' THEN
2 WHEN 'UNKNOWN' THEN 3 WHEN 'WARNING' THEN 4 WHEN 'CRITICAL' THEN
5 END)
- WHEN 1 THEN 'OK' WHEN 2 THEN 'PENDING' WHEN 4
THEN 'WARNING' WHEN 5 THEN 'CRITICAL' END ST
- FROM rhn_probe_state PS, rhnServerOverview OV
- LEFT OUTER JOIN rhn_check_probe CP ON OV.server_id = CP.host_id
- WHERE PS.probe_id = CP.probe_id
- GROUP BY OV.server_id ) MONITORING_STATUS
- FROM rhnServerOverview OV
- WHERE server_id IN (%s)
+ MONITORING_STATUS.ST AS MONITORING_STATUS
+ FROM rhnServerOverview OV LEFT OUTER JOIN
+ ( SELECT CP.host_id, CASE MAX(CASE PS.state
+ WHEN 'OK' THEN 1
+ WHEN 'PENDING' THEN 2
+ WHEN 'UNKNOWN' THEN 3
+ WHEN 'WARNING' THEN 4
+ WHEN 'CRITICAL' THEN 5 END)
+ WHEN 1 THEN 'OK'
+ WHEN 2 THEN 'PENDING'
+ WHEN 3 THEN 'UNKNOWN'
+ WHEN 4 THEN 'WARNING'
+ WHEN 5 THEN 'CRITICAL' END ST
+ FROM rhn_check_probe CP, rhn_probe_state PS
+ WHERE PS.probe_id = CP.probe_id
+ GROUP BY CP.host_id ) MONITORING_STATUS
+ ON OV.server_id = MONITORING_STATUS.host_id
+ WHERE server_id IN (%s)
ORDER BY UPPER(NVL(SERVER_NAME, '(none)')), SERVER_ID
</query>
commit 3c38e5becfd9c921ee0c896a6b299a005732a56c
Author: Lukas Zapletal <lzap+git(a)redhat.com>
Date: Thu Nov 25 10:04:58 2010 +0100
Adding missing monitoring state (UNKNOWN)
(cherry picked from commit 5e52731a3ea813ea17a3dba463a49a766772f262)
diff --git a/java/code/src/com/redhat/rhn/common/db/datasource/xml/System_queries.xml
b/java/code/src/com/redhat/rhn/common/db/datasource/xml/System_queries.xml
index 52ea2aa..40ac62e 100644
--- a/java/code/src/com/redhat/rhn/common/db/datasource/xml/System_queries.xml
+++ b/java/code/src/com/redhat/rhn/common/db/datasource/xml/System_queries.xml
@@ -1292,7 +1292,7 @@ ORDER BY NAME, VI.virtual_system_id, VI.uuid DESC
<query name="monitoring_status" params="sid">
SELECT CASE
MAX(CASE PS.state WHEN 'OK' THEN 1 WHEN 'PENDING' THEN
2 WHEN 'UNKNOWN' THEN 3 WHEN 'WARNING' THEN 4 WHEN 'CRITICAL' THEN
5 END)
- WHEN 1 THEN 'OK' WHEN 2 THEN 'PENDING' WHEN 4
THEN 'WARNING' WHEN 5 THEN 'CRITICAL' END ST
+ WHEN 1 THEN 'OK' WHEN 2 THEN 'PENDING' WHEN 3
THEN 'UNKNOWN' WHEN 4 THEN 'WARNING' WHEN 5 THEN 'CRITICAL' END
ST
FROM rhn_check_probe CP, rhn_probe_state PS
WHERE PS.probe_id = CP.probe_id
AND CP.host_id = :sid
diff --git a/web/modules/rhn/RHN/DB/DataSource/xml/System_queries.xml
b/web/modules/rhn/RHN/DB/DataSource/xml/System_queries.xml
index 4232776..d330308 100644
--- a/web/modules/rhn/RHN/DB/DataSource/xml/System_queries.xml
+++ b/web/modules/rhn/RHN/DB/DataSource/xml/System_queries.xml
@@ -1032,8 +1032,8 @@ ORDER BY UPPER(NVL(S.name, '(none)')), S.id
LAST_CHECKIN_DAYS_AGO, PENDING_UPDATES, OS, RELEASE, SERVER_ARCH_NAME,
LAST_CHECKIN, LOCKED,
( SELECT CASE
MAX(CASE PS.state WHEN 'OK' THEN 1 WHEN 'PENDING' THEN
2 WHEN 'UNKNOWN' THEN 3 WHEN 'WARNING' THEN 4 WHEN 'CRITICAL' THEN
5 END)
- WHEN 1 THEN 'OK' WHEN 2 THEN 'PENDING' WHEN 4
THEN 'WARNING' WHEN 5 THEN 'CRITICAL' END ST
- FROM rhn_probe_state PS, rhnServerOverview OV
+ WHEN 1 THEN 'OK' WHEN 2 THEN 'PENDING' WHEN 3
THEN 'UNKNOWN' WHEN 4 THEN 'WARNING' WHEN 5 THEN 'CRITICAL' END
ST
+ FROM rhn_probe_state PS
LEFT OUTER JOIN rhn_check_probe CP ON OV.server_id = CP.host_id
WHERE PS.probe_id = CP.probe_id
GROUP BY OV.server_id ) MONITORING_STATUS,