java/code/src/com/redhat/rhn/common/db/datasource/xml/System_queries.xml
| 117 ++++------
java/code/src/com/redhat/rhn/frontend/taglibs/list/decorators/SystemHealthIconDecorator.java
| 61 -----
java/code/src/com/redhat/rhn/manager/system/SystemManager.java
| 14 -
java/code/webapp/WEB-INF/pages/common/fragments/systems/system_listdisplay.jspf
| 1
4 files changed, 56 insertions(+), 137 deletions(-)
New commits:
commit 834321796d96c5f8d851b92e09e064f4aa216194
Author: Tomas Lestach <tlestach(a)redhat.com>
Date: Tue Sep 18 14:49:57 2012 +0200
virtual_system_overview does not need system health information
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 65060ca..576b0cb 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
@@ -1302,22 +1302,8 @@ ORDER BY SECURITY_ERRATA DESC, BUG_ERRATA DESC, ENHANCEMENT_ERRATA
DESC
SERVER_ID as system_id, SECURITY_ERRATA, BUG_ERRATA, ENHANCEMENT_ERRATA,
OUTDATED_PACKAGES, SERVER_NAME,
SERVER_ADMINS, GROUP_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, 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
- 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
+ config_files_with_differences
+ FROM rhnVirtualInstance VI, rhnServerOverview OV
WHERE VI.id IN (%s)
AND ( ( VI.uuid IS NULL
AND OV.server_id = VI.host_system_id)
commit c4f4499b0e7fcc2dc128b897ecc8f952e8b837f8
Author: Tomas Lestach <tlestach(a)redhat.com>
Date: Tue Sep 18 14:45:16 2012 +0200
use system_monitoring elaborator in most_critical_systems query
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 fd715b8..65060ca 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
@@ -516,6 +516,7 @@ ORDER BY UPPER(COALESCE(X.name, '(none)')), X.id
<mode name="most_critical_systems"
class="com.redhat.rhn.frontend.dto.SystemOverview">
<query name="available_to_user_with_errata" />
<elaborator name="system_overview_most_critical" />
+ <elaborator name="system_monitoring" />
</mode>
<query name="available_to_uid" params="formvar_uid">
@@ -1290,22 +1291,8 @@ select VI.host_system_id as ID, 1 as virtual_host
SELECT SERVER_ID AS ID, SECURITY_ERRATA, BUG_ERRATA, ENHANCEMENT_ERRATA,
OUTDATED_PACKAGES, SERVER_NAME,
SERVER_ADMINS, GROUP_COUNT, MODIFIED, CHANNEL_LABELS, HISTORY_COUNT,
LAST_CHECKIN_DAYS_AGO, PENDING_UPDATES, OS, RELEASE, SERVER_ARCH_NAME,
LAST_CHECKIN, LOCKED,
- 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
- 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
+ config_files_with_differences
+ FROM rhnServerOverview
WHERE server_id IN (%s)
ORDER BY SECURITY_ERRATA DESC, BUG_ERRATA DESC, ENHANCEMENT_ERRATA DESC
</query>
commit 88bddba5d0d01d1114f6d9cd8acd766ab72da77e
Author: Tomas Lestach <tlestach(a)redhat.com>
Date: Tue Sep 18 14:12:09 2012 +0200
remove SystemHealthIconDecorator and appropriate query
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 b0ca060..fd715b8 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
@@ -1393,17 +1393,6 @@ ORDER BY NAME, VI.virtual_system_id, VI.uuid DESC
<elaborator name="virtual_system_entitlements" />
</mode>
-<mode name="monitoring_status">
- <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 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
- </query>
-</mode>
-
<query name="system_package_data_from_set" params="user_id,
package_set_label">
select * from (
SELECT DISTINCT S.id SYSTEM_ID, S.name SYSTEM_NAME, PN.name || '-' ||
PE.evr.as_vre_simple() NVRE
diff --git
a/java/code/src/com/redhat/rhn/frontend/taglibs/list/decorators/SystemHealthIconDecorator.java
b/java/code/src/com/redhat/rhn/frontend/taglibs/list/decorators/SystemHealthIconDecorator.java
deleted file mode 100644
index a8c0f01..0000000
---
a/java/code/src/com/redhat/rhn/frontend/taglibs/list/decorators/SystemHealthIconDecorator.java
+++ /dev/null
@@ -1,61 +0,0 @@
-/**
- * Copyright (c) 2009--2010 Red Hat, Inc.
- *
- * This software is licensed to you under the GNU General Public License,
- * version 2 (GPLv2). There is NO WARRANTY for this software, express or
- * implied, including the implied warranties of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE. You should have received a copy of GPLv2
- * along with this software; if not, see
- *
http://www.gnu.org/licenses/old-licenses/gpl-2.0.txt.
- *
- * Red Hat trademarks are not licensed under GPLv2. No permission is
- * granted to use or replicate Red Hat trademarks that are incorporated
- * in this software or its documentation.
- */
-package com.redhat.rhn.frontend.taglibs.list.decorators;
-
-import com.redhat.rhn.common.db.datasource.DataResult;
-import com.redhat.rhn.frontend.dto.SystemOverview;
-import com.redhat.rhn.frontend.struts.RequestContext;
-import com.redhat.rhn.frontend.taglibs.list.ListTag;
-import com.redhat.rhn.manager.system.SystemManager;
-
-import java.util.HashMap;
-import java.util.List;
-
-import javax.servlet.http.HttpServletRequest;
-
-
-/**
- * ElaborationDecorator
- * @version $Rev$
- */
-public class SystemHealthIconDecorator extends BaseListDecorator {
-
-
- /**
- * {@inheritDoc}
- */
- public void setCurrentList(ListTag current) {
- super.setCurrentList(current);
- if (current != null) {
- elaborateContents();
- }
- }
-
- private void elaborateContents() {
- List<SystemOverview> systems = getCurrentList().getPageData();
-
- RequestContext context = new RequestContext(
- (HttpServletRequest)getCurrentList().getContext().getRequest());
-
- for (SystemOverview next : systems) {
- DataResult result = SystemManager.getMonitoringStatus(
- context.getLoggedInUser(), next.getId().longValue());
- if (result != null && result.size() == 1) {
- next.setMonitoringStatus((String)
- ((HashMap) result.get(0)).values().iterator().next());
- }
- }
- }
-}
diff --git a/java/code/src/com/redhat/rhn/manager/system/SystemManager.java
b/java/code/src/com/redhat/rhn/manager/system/SystemManager.java
index 3a73472..2689fb6 100644
--- a/java/code/src/com/redhat/rhn/manager/system/SystemManager.java
+++ b/java/code/src/com/redhat/rhn/manager/system/SystemManager.java
@@ -2226,20 +2226,6 @@ public class SystemManager extends BaseManager {
}
/**
- * gets the monitoring status for a particular system
- * @param user the user to check for
- * @param sid the system id to check for
- * @return DataResult with the monitoring string
- */
- public static DataResult getMonitoringStatus(User user, Long sid) {
- SelectMode m = ModeFactory.getMode("System_queries",
"monitoring_status");
- Map params = new HashMap();
- params.put("uid", user.getId());
- params.put("sid", sid);
- return m.execute(params);
- }
-
- /**
* Return the system names and IDs that are selected in the SSM for the given user,
* which also have been subscribed to the given channel.
*
diff --git
a/java/code/webapp/WEB-INF/pages/common/fragments/systems/system_listdisplay.jspf
b/java/code/webapp/WEB-INF/pages/common/fragments/systems/system_listdisplay.jspf
index 43f9c3c..e18c28b 100644
--- a/java/code/webapp/WEB-INF/pages/common/fragments/systems/system_listdisplay.jspf
+++ b/java/code/webapp/WEB-INF/pages/common/fragments/systems/system_listdisplay.jspf
@@ -23,7 +23,6 @@
<rl:decorator name="ElaborationDecorator"/>
<c:if test = "${empty noSystemIcons}">
<rl:decorator name="SystemIconDecorator"/>
- <rl:decorator name="SystemHealthIconDecorator"/>
</c:if>
<rl:decorator name="PageSizeDecorator"/>
commit 3424f669400c2a604903be5acfaf2d21d835de4f
Author: Tomas Lestach <tlestach(a)redhat.com>
Date: Mon Sep 17 15:51:41 2012 +0200
extract system_monitoring elaborator from system_overview
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 5be9919..b0ca060 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
@@ -37,6 +37,7 @@ select * from (
ORDER BY UPPER(COALESCE(X.name, '(none)')), X.id
</query>
<elaborator name="system_overview" />
+ <elaborator name="system_monitoring" />
</mode>
<mode name="find_by_name"
class="com.redhat.rhn.frontend.dto.SystemOverview">
@@ -51,6 +52,7 @@ ORDER BY UPPER(COALESCE(X.name, '(none)')), X.id
and S.name = :name
</query>
<elaborator name="system_overview" />
+ <elaborator name="system_monitoring" />
</mode>
@@ -70,6 +72,7 @@ SELECT S.id,
ORDER BY UPPER(COALESCE(S.NAME, '(none)')), S.ID
</query>
<elaborator name="system_overview" />
+ <elaborator name="system_monitoring" />
<elaborator name="is_virtual_guest" />
<elaborator name="is_virtual_host" />
</mode>
@@ -98,6 +101,7 @@ SELECT DISTINCT S.id,
ORDER BY UPPER(COALESCE(X.server_name, '(none)')), X.id
</query>
<elaborator name="system_overview" />
+ <elaborator name="system_monitoring" />
</mode>
<mode name="custom_vals">
@@ -211,6 +215,7 @@ SELECT S.id as id,
ORDER BY UPPER(COALESCE(S.NAME, '(none)')), S.ID
</query>
<elaborator name="system_overview" />
+ <elaborator name="system_monitoring" />
</mode>
<mode name="count_systems_subscribed_to_channel">
@@ -254,6 +259,7 @@ SELECT
ORDER BY UPPER(COALESCE(S.NAME, '(none)')), S.ID
</query>
<elaborator name="system_overview" />
+ <elaborator name="system_monitoring" />
<elaborator name="entitlements"/>
</mode>
@@ -344,6 +350,7 @@ SELECT SGM.server_id AS ID, S.name AS NAME,
ORDER BY UPPER(COALESCE(S.NAME, '(none)')), S.ID
</query>
<elaborator name="system_overview" />
+ <elaborator name="system_monitoring" />
<elaborator name="entitlements"/>
</mode>
@@ -361,6 +368,7 @@ SELECT S.id, S.name,
ORDER BY UPPER(COALESCE(S.NAME, '(none)')), S.ID
</query>
<elaborator name="system_overview" />
+ <elaborator name="system_monitoring" />
<elaborator name="entitlements"/>
</mode>
@@ -378,6 +386,7 @@ SELECT S.id, S.name
ORDER BY UPPER(COALESCE(S.NAME, '(none)')), S.ID
</query>
<elaborator name="system_overview" />
+ <elaborator name="system_monitoring" />
</mode>
<mode name="systems_with_needed_package"
class="com.redhat.rhn.frontend.dto.SystemOverview">
@@ -391,6 +400,7 @@ SELECT S.ID
ORDER BY UPPER(COALESCE(S.NAME, '(none)')), S.ID
</query>
<elaborator name="system_overview" />
+ <elaborator name="system_monitoring" />
</mode>
<mode name="target_systems_for_channel"
class="com.redhat.rhn.frontend.dto.SystemOverview">
@@ -409,6 +419,7 @@ SELECT ES.id, S.name, 1 as selectable
AND EXISTS (SELECT 1 FROM rhnUserServerPerms USP WHERE USP.user_id = :user_id AND
USP.server_id = ES.id)
</query>
<elaborator name="system_overview" />
+ <elaborator name="system_monitoring" />
<elaborator name="entitlements"/>
</mode>
@@ -462,6 +473,7 @@ ORDER BY UPPER(COALESCE(X.name, '(none)')), X.id
<mode name="visible_to_user_from_sysid_list"
class="com.redhat.rhn.frontend.dto.SystemSearchResult">
<query name="available_to_user_from_sysid_list" />
<elaborator name="system_overview" />
+ <elaborator name="system_monitoring" />
<elaborator name="entitlements"/>
<elaborator name="is_virtual_guest" />
<elaborator name="is_virtual_host" />
@@ -471,6 +483,7 @@ ORDER BY UPPER(COALESCE(X.name, '(none)')), X.id
<mode name="visible_to_user"
class="com.redhat.rhn.frontend.dto.SystemOverview">
<query name="available_to_user" />
<elaborator name="system_overview" />
+ <elaborator name="system_monitoring" />
<elaborator name="entitlements"/>
<elaborator name="is_virtual_guest" />
<elaborator name="is_virtual_host" />
@@ -565,6 +578,7 @@ where a.user_id = :formvar_uid
ORDER BY UPPER(COALESCE(S.name, '(none)')), S.id
</query>
<elaborator name="system_overview" />
+ <elaborator name="system_monitoring" />
<elaborator name="entitlements" />
</mode>
@@ -619,6 +633,7 @@ SELECT SA.server_id as id,
WHERE errata_id = :eid)
</elaborator>
<elaborator name="system_overview" />
+ <elaborator name="system_monitoring" />
<elaborator name="entitlements" />
</mode>
@@ -639,11 +654,13 @@ SELECT SA.server_id as id,
ORDER BY UPPER(COALESCE(S.NAME, '(none)')), S.ID
</query>
<elaborator name="system_overview" />
+ <elaborator name="system_monitoring" />
</mode>
<mode name="in_set"
class="com.redhat.rhn.frontend.dto.SystemOverview">
<query name="in_set" />
<elaborator name="system_overview" />
+ <elaborator name="system_monitoring" />
<elaborator name="entitlements" />
<elaborator name="is_virtual_guest" />
<elaborator name="is_virtual_host" />
@@ -715,6 +732,7 @@ select * from (
ORDER BY UPPER(COALESCE(X.NAME, '(none)')), X.ID
</query>
<elaborator name="system_overview" />
+ <elaborator name="system_monitoring" />
<elaborator name="entitlements" />
<elaborator name="is_virtual_guest" />
<elaborator name="is_virtual_host" />
@@ -734,6 +752,7 @@ SELECT S.ID, S.NAME,
ORDER BY UPPER(COALESCE(S.NAME, '(none)')), S.ID
</query>
<elaborator name="system_overview" />
+ <elaborator name="system_monitoring" />
<elaborator name="is_virtual_guest" />
<elaborator name="is_virtual_host" />
</mode>
@@ -756,6 +775,7 @@ SELECT S.ID, S.NAME,
ORDER BY UPPER(COALESCE(S.NAME, '(none)')), S.ID
</query>
<elaborator name="system_overview" />
+ <elaborator name="system_monitoring" />
<elaborator name="entitlements" />
<elaborator name="is_virtual_guest" />
<elaborator name="is_virtual_host" />
@@ -787,6 +807,7 @@ SELECT DISTINCT S.id, S.NAME,
<mode name="having_errata_with_keyword_applied_since_last_reboot"
class="com.redhat.rhn.frontend.dto.SystemOverview">
<query
name="having_errata_with_keyword_applied_since_last_reboot_list"/>
<elaborator name="system_overview" />
+ <elaborator name="system_monitoring" />
<elaborator name="entitlements" />
<elaborator name="is_virtual_guest" />
<elaborator name="is_virtual_host" />
@@ -831,6 +852,7 @@ SELECT S.id, S.NAME,
ORDER BY UPPER(COALESCE(S.NAME, '(none)')), S.ID
</query>
<elaborator name="system_overview" />
+ <elaborator name="system_monitoring" />
<elaborator name="entitlements" />
<elaborator name="is_virtual_guest" />
<elaborator name="is_virtual_host" />
@@ -852,6 +874,7 @@ SELECT S.id, S.NAME,
ORDER BY SI.checkin DESC
</query>
<elaborator name="system_overview" />
+ <elaborator name="system_monitoring" />
<elaborator name="entitlements" />
</mode>
@@ -877,6 +900,7 @@ SELECT S.id, S.NAME, S.info, S.created,
ORDER BY S.created DESC
</query>
<elaborator name="system_overview" />
+ <elaborator name="system_monitoring" />
<elaborator name="entitlements" />
<elaborator name="is_virtual_guest" />
<elaborator name="is_virtual_host" />
@@ -905,6 +929,7 @@ SELECT S.id, S.NAME, S.info, S.created,
ORDER BY S.created DESC
</query>
<elaborator name="system_overview" />
+ <elaborator name="system_monitoring" />
<elaborator name="entitlements" />
</mode>
@@ -920,6 +945,7 @@ SELECT PI.server_id ID, S.name,
AND S.id = PI.server_id
</query>
<elaborator name="system_overview"/>
+ <elaborator name="system_monitoring" />
<elaborator name="entitlements" />
<elaborator name="is_virtual_guest" />
<elaborator name="is_virtual_host" />
@@ -1051,6 +1077,7 @@ SELECT SP.proxy_server_id ID, S.name, (SP.position + 1) AS position,
SP.hostname
ORDER BY SP.position
</query>
<elaborator name="system_overview"/>
+ <elaborator name="system_monitoring" />
</mode>
<!-- TO_CHAR(A.earliest_action, 'YYYY-MM-DD HH24:MI:SS') AS DISPLAY_DATE
-->
@@ -1076,6 +1103,7 @@ ORDER BY SP.position
ORDER BY UPPER(COALESCE(S.name, '(none)')), S.ID
</query>
<elaborator name="system_overview" />
+ <elaborator name="system_monitoring" />
</mode>
<mode name="systems_failed_action"
class="com.redhat.rhn.frontend.dto.ActionedSystem">
@@ -1096,6 +1124,7 @@ ORDER BY UPPER(COALESCE(S.name, '(none)')), S.ID
ORDER BY UPPER(COALESCE(S.name, '(none)')), S.ID
</query>
<elaborator name="system_overview" />
+ <elaborator name="system_monitoring" />
</mode>
<mode name="systems_completed_action"
class="com.redhat.rhn.frontend.dto.ActionedSystem">
@@ -1116,6 +1145,7 @@ ORDER BY UPPER(COALESCE(S.name, '(none)')), S.ID
ORDER BY UPPER(COALESCE(S.name, '(none)')), S.ID
</query>
<elaborator name="system_overview" />
+ <elaborator name="system_monitoring" />
</mode>
<mode name="systems_in_set_with_no_base_channel"
class="com.redhat.rhn.frontend.dto.EssentialServerDto">
@@ -1212,28 +1242,30 @@ ORDER BY S.ID
SELECT /*+ RULE */ SERVER_ID AS ID, OUTDATED_PACKAGES, SERVER_NAME, security_errata,
bug_errata, enhancement_errata,
SERVER_ADMINS, GROUP_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,
- 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
+ config_files_with_differences
+ FROM rhnServerOverview
WHERE server_id IN (%s)
ORDER BY UPPER(COALESCE(SERVER_NAME, '(none)')), SERVER_ID
</query>
+<query name="system_monitoring" params="">
+ SELECT CP.host_id AS 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 MONITORING_STATUS
+ FROM rhn_check_probe CP, rhn_probe_state PS
+ WHERE PS.probe_id = CP.probe_id
+ AND CP.host_id IN (%s)
+ GROUP BY CP.host_id
+</query>
<query name="is_virtual_guest" params="">
SELECT vi.virtual_system_id as ID, 1 as virtual_guest FROM rhnVirtualInstance vi WHERE
vi.virtual_system_id in (%s)
@@ -1955,6 +1987,7 @@ SELECT S.id,
ORDER BY UPPER(COALESCE(S.NAME, '(none)')), S.ID
</query>
<elaborator name="system_overview" />
+ <elaborator name="system_monitoring" />
</mode>
</datasource_modes>