modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/BaseServerComponent.java | 13 +++++++--- modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/ManagedASComponent.java | 2 - modules/plugins/jboss-as-7/src/main/resources/META-INF/rhq-plugin.xml | 6 ++-- 3 files changed, 14 insertions(+), 7 deletions(-)
New commits: commit c40a23fe09b9f1ae3debafaef01506bf3ea5f708 Author: Heiko W. Rupp hwr@redhat.com Date: Thu Feb 9 12:48:08 2012 +0100
BZ 734488 provide server start time - improvements.
diff --git a/modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/BaseServerComponent.java b/modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/BaseServerComponent.java index 1886962..34d849c 100644 --- a/modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/BaseServerComponent.java +++ b/modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/BaseServerComponent.java @@ -26,6 +26,7 @@ import java.net.ConnectException; import java.security.NoSuchAlgorithmException; import java.util.ArrayList; import java.util.Date; +import java.util.HashSet; import java.util.List; import java.util.Properties; import java.util.Set; @@ -258,12 +259,16 @@ public class BaseServerComponent extends BaseComponent implements MeasurementFac public void getValues(MeasurementReport report, Set metrics) throws Exception {
Set<MeasurementScheduleRequest> requests = metrics; + Set<MeasurementScheduleRequest> leftovers = new HashSet<MeasurementScheduleRequest>(requests.size());
for (MeasurementScheduleRequest request: requests) { if (request.getName().equals("startTime")) { String path = getPath(); if (context.getResourceType().getName().contains("Host Controller")) { - path = "host=master," + path ; // TODO is the local controller always on host=master?? AS7-3678 + if (path!=null) + path = "host=master," + path ; // TODO is the local controller always on host=master?? AS7-3678 + else + path = "host=master"; } Address address = new Address(path); address.add("core-service","platform-mbean"); @@ -276,11 +281,13 @@ public class BaseServerComponent extends BaseComponent implements MeasurementFac MeasurementDataTrait data = new MeasurementDataTrait(request,new Date(startTime).toString()); report.addData(data); } - + } + else { + leftovers.add(request); } }
- super.getValues(report, metrics); + super.getValues(report, leftovers); }
} diff --git a/modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/ManagedASComponent.java b/modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/ManagedASComponent.java index 1935126..3873dfc 100644 --- a/modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/ManagedASComponent.java +++ b/modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/ManagedASComponent.java @@ -81,7 +81,7 @@ public class ManagedASComponent extends BaseComponent { for (MeasurementScheduleRequest request: requests) { if (request.getName().equals("startTime")) { String path = getPath(); - path = path.replace("server-config=","server="); + path = path.replace("server-config","server"); Address address = new Address(path); address.add("core-service","platform-mbean"); address.add("type","runtime"); diff --git a/modules/plugins/jboss-as-7/src/main/resources/META-INF/rhq-plugin.xml b/modules/plugins/jboss-as-7/src/main/resources/META-INF/rhq-plugin.xml index bfce241..a3552a4 100644 --- a/modules/plugins/jboss-as-7/src/main/resources/META-INF/rhq-plugin.xml +++ b/modules/plugins/jboss-as-7/src/main/resources/META-INF/rhq-plugin.xml @@ -189,7 +189,7 @@ <metric property="release-version" dataType="trait" displayName="Version of the server" displayType="summary"/> <metric property="product-name" dataType="trait" displayName="Name of the product"/> <metric property="product-version" dataType="trait" displayName="Version of the product" displayType="summary"/> - <metric property="startTime" dataType="trait" displayName="Start time of the server"/> + <metric property="startTime" dataType="trait" displayName="Start time of the server" defaultOn="true"/>
<event name="logEntry" description="an entry in a log file"/>
@@ -363,7 +363,7 @@
<metric property="status" dataType="trait" displayName="Server state" description="Detailed server state" displayType="summary"/> - <metric property="startTime" dataType="trait" displayName="Start time of the server"/> + <metric property="startTime" dataType="trait" displayName="Start time of the server" defaultOn="true"/>
<event name="logEntry" description="an entry in a log file"/>
@@ -519,7 +519,7 @@ <metric property="release-version" dataType="trait" displayName="Version of the server" displayType="summary"/> <metric property="product-name" dataType="trait" displayName="Name of the product"/> <metric property="product-version" dataType="trait" displayName="Version of the product" displayType="summary"/> - <metric property="startTime" dataType="trait" displayName="Start time of the server"/> + <metric property="startTime" dataType="trait" displayName="Start time of the server" defaultOn="true"/>
<event name="logEntry" description="an entry in a log file"/>
rhq-commits@lists.fedorahosted.org