modules/plugins/mod-cluster/src/main/java/org/rhq/plugins/modcluster/ModClusterServerComponent.java
| 22 ++++++++++
modules/plugins/mod-cluster/src/main/resources/META-INF/rhq-plugin.xml
| 3 +
2 files changed, 25 insertions(+)
New commits:
commit 42c454258e2ead6c6ccbf6be91132094b34db020
Merge: 535d831 6db75f8
Author: Stefan Negrea <snegrea(a)redhat.com>
Date: Tue Aug 30 05:35:30 2011 -0500
Merge branch 'master' of
ssh://git.fedorahosted.org/git/rhq/rhq
commit 535d831af59702ddaf0cd85c675b98befd3065e2
Author: Stefan Negrea <snegrea(a)redhat.com>
Date: Tue Aug 30 05:35:04 2011 -0500
Add proxy information metric to make the mod_cluster component dyna group friendly for
complex queries (eg. group based on httpd proxy).
diff --git
a/modules/plugins/mod-cluster/src/main/java/org/rhq/plugins/modcluster/ModClusterServerComponent.java
b/modules/plugins/mod-cluster/src/main/java/org/rhq/plugins/modcluster/ModClusterServerComponent.java
index 0db722e..b79f751 100644
---
a/modules/plugins/mod-cluster/src/main/java/org/rhq/plugins/modcluster/ModClusterServerComponent.java
+++
b/modules/plugins/mod-cluster/src/main/java/org/rhq/plugins/modcluster/ModClusterServerComponent.java
@@ -18,7 +18,14 @@
*/
package org.rhq.plugins.modcluster;
+import java.util.Set;
+
+import org.mc4j.ems.connection.bean.EmsBean;
+
import org.rhq.core.domain.measurement.AvailabilityType;
+import org.rhq.core.domain.measurement.MeasurementDataTrait;
+import org.rhq.core.domain.measurement.MeasurementReport;
+import org.rhq.core.domain.measurement.MeasurementScheduleRequest;
import org.rhq.plugins.jmx.MBeanResourceComponent;
import org.rhq.plugins.modcluster.helper.JBossHelper;
import org.rhq.plugins.modcluster.model.ProxyInfo;
@@ -30,6 +37,21 @@ import org.rhq.plugins.modcluster.model.ProxyInfo;
@SuppressWarnings({ "rawtypes" })
public class ModClusterServerComponent extends MBeanResourceComponent {
+ @SuppressWarnings("unchecked")
+ @Override
+ protected void getValues(MeasurementReport report, Set requests, EmsBean bean) {
+ for (MeasurementScheduleRequest request : (Set<MeasurementScheduleRequest>)
requests) {
+ if (request.getName().equals("ProxyInformation")) {
+ String rawProxyInfo = JBossHelper.getRawProxyInfo(bean);
+ report.addData(new MeasurementDataTrait(request, rawProxyInfo));
+ requests.remove(request);
+ break;
+ }
+ }
+
+ super.getValues(report, requests, bean);
+ }
+
@Override
public AvailabilityType getAvailability() {
String rawProxyInfo = JBossHelper.getRawProxyInfo(getEmsBean());
diff --git a/modules/plugins/mod-cluster/src/main/resources/META-INF/rhq-plugin.xml
b/modules/plugins/mod-cluster/src/main/resources/META-INF/rhq-plugin.xml
index b0ad1f2..536e747 100644
--- a/modules/plugins/mod-cluster/src/main/resources/META-INF/rhq-plugin.xml
+++ b/modules/plugins/mod-cluster/src/main/resources/META-INF/rhq-plugin.xml
@@ -24,6 +24,9 @@
<operation name="reset" displayName="Reset the node"
description="Move this application server out of an error state." />
<operation name="refresh" displayName="Refresh
configuration" description="Refresh configuration for this application
server." />
+
+ <metric property="ProxyInformation" displayName="Proxy
Information" displayType="summary" dataType="trait" />
+
<!-- Start - Configuration for HAModClusterService -->
<service name="HA Service"
discovery="ClassNameMBeanDiscoveryComponent"