[jboss-svn-commits] JBL Code SVN: r29628 - in labs/jbossesb/trunk/product/tools/jonplugin/src/main: resources/META-INF and 1 other directory.
jboss-svn-commits at lists.jboss.org
jboss-svn-commits at lists.jboss.org
Thu Oct 15 13:52:19 EDT 2009
Author: tcunning
Date: 2009-10-15 13:52:19 -0400 (Thu, 15 Oct 2009)
New Revision: 29628
Modified:
labs/jbossesb/trunk/product/tools/jonplugin/src/main/java/org/jbosson/plugins/jbossesb/DeploymentComponent.java
labs/jbossesb/trunk/product/tools/jonplugin/src/main/java/org/jbosson/plugins/jbossesb/ESBComponent.java
labs/jbossesb/trunk/product/tools/jonplugin/src/main/java/org/jbosson/plugins/jbossesb/ESBDiscoveryComponent.java
labs/jbossesb/trunk/product/tools/jonplugin/src/main/java/org/jbosson/plugins/jbossesb/ServiceComponent.java
labs/jbossesb/trunk/product/tools/jonplugin/src/main/resources/META-INF/rhq-plugin.xml
Log:
JBESB-2881
Add processing time metric to the JON plugin.
Modified: labs/jbossesb/trunk/product/tools/jonplugin/src/main/java/org/jbosson/plugins/jbossesb/DeploymentComponent.java
===================================================================
--- labs/jbossesb/trunk/product/tools/jonplugin/src/main/java/org/jbosson/plugins/jbossesb/DeploymentComponent.java 2009-10-15 17:44:01 UTC (rev 29627)
+++ labs/jbossesb/trunk/product/tools/jonplugin/src/main/java/org/jbosson/plugins/jbossesb/DeploymentComponent.java 2009-10-15 17:52:19 UTC (rev 29628)
@@ -153,7 +153,7 @@
}
InputStream isForTempDir = new BufferedInputStream(new FileInputStream(tempFile));
- deployer.createContent(details, isForTempDir, !zip);
+ deployer.createContent(details, isForTempDir, !zip, false);
// Resource key should match the following:
// EAR: jboss.management.local:J2EEServer=Local,j2eeType=J2EEApplication,name=rhq.ear
Modified: labs/jbossesb/trunk/product/tools/jonplugin/src/main/java/org/jbosson/plugins/jbossesb/ESBComponent.java
===================================================================
--- labs/jbossesb/trunk/product/tools/jonplugin/src/main/java/org/jbosson/plugins/jbossesb/ESBComponent.java 2009-10-15 17:44:01 UTC (rev 29627)
+++ labs/jbossesb/trunk/product/tools/jonplugin/src/main/java/org/jbosson/plugins/jbossesb/ESBComponent.java 2009-10-15 17:52:19 UTC (rev 29628)
@@ -144,7 +144,7 @@
osForTempDir.close();
InputStream isForTempDir = new BufferedInputStream(new FileInputStream(tempFile));
- deployer.createContent(details, isForTempDir, !zip);
+ deployer.createContent(details, isForTempDir, !zip, false);
// Resource key should match the following:
// ESB: jboss.esb:deployment=jbossesb.esb
Modified: labs/jbossesb/trunk/product/tools/jonplugin/src/main/java/org/jbosson/plugins/jbossesb/ESBDiscoveryComponent.java
===================================================================
--- labs/jbossesb/trunk/product/tools/jonplugin/src/main/java/org/jbosson/plugins/jbossesb/ESBDiscoveryComponent.java 2009-10-15 17:44:01 UTC (rev 29627)
+++ labs/jbossesb/trunk/product/tools/jonplugin/src/main/java/org/jbosson/plugins/jbossesb/ESBDiscoveryComponent.java 2009-10-15 17:52:19 UTC (rev 29628)
@@ -14,9 +14,9 @@
*
* @author Tom Cunningham
*/
-public class ESBDiscoveryComponent extends MBeanResourceDiscoveryComponent {
- @Override
- public Set<DiscoveredResourceDetails> discoverResources(ResourceDiscoveryContext<JMXComponent> context) {
+public class ESBDiscoveryComponent<T extends JMXComponent> extends MBeanResourceDiscoveryComponent<T> {
+ @Override
+ public Set<DiscoveredResourceDetails> discoverResources(ResourceDiscoveryContext<T> context) {
Set<DiscoveredResourceDetails> jmxResources = super.discoverResources(context);
String versionNumber;
Modified: labs/jbossesb/trunk/product/tools/jonplugin/src/main/java/org/jbosson/plugins/jbossesb/ServiceComponent.java
===================================================================
--- labs/jbossesb/trunk/product/tools/jonplugin/src/main/java/org/jbosson/plugins/jbossesb/ServiceComponent.java 2009-10-15 17:44:01 UTC (rev 29627)
+++ labs/jbossesb/trunk/product/tools/jonplugin/src/main/java/org/jbosson/plugins/jbossesb/ServiceComponent.java 2009-10-15 17:52:19 UTC (rev 29628)
@@ -30,7 +30,9 @@
import org.rhq.core.domain.configuration.Configuration;
import org.rhq.core.domain.configuration.PropertySimple;
+import org.rhq.core.pluginapi.event.EventContext;
+
/**
* The ServiceComponent finds ESB service data (messages, bytes, time).
*
@@ -56,10 +58,20 @@
private static final String OVERALL_MINUTE_METRIC_NAME = "overallMessageCountByMinute";
+ EventContext eventContext;
+ public static final String NOTIFICATION_TYPE = "org.jboss.esb.message.alert";
+
+
@Override
public void start(ResourceContext<MBeanResourceComponent> context) {
super.start(context);
this.context = context;
+ /*
+ eventContext = context.getEventContext();
+ ESBMessageEventPoller ep = new ESBMessageEventPoller(NOTIFICATION_TYPE);
+ ep.setEmsBean(getEmsBean());
+ eventContext.registerEventPoller(ep, 53);
+ */
}
@Override
@@ -78,10 +90,10 @@
report.addData(new MeasurementDataNumeric(request, new Double(overallMessages.doubleValue())));
} else if (metricName.equals(OVERALL_TIME_PROCESSED_METRIC)) {
EmsAttribute attribute = getEmsBean().getAttribute(OVERALL_TIME_PROCESSED);
- Double overallTimeProcessed = (Double) attribute.refresh();
+ Long overallTimeProcessed = (Long) attribute.refresh();
if (overallTimeProcessed != null) {
- overallTimeProcessed = new Double(overallTimeProcessed.doubleValue() / 1000000);
- report.addData(new MeasurementDataNumeric(request, overallTimeProcessed));
+ Double timeProcessed = new Double(overallTimeProcessed.doubleValue() / 1000000);
+ report.addData(new MeasurementDataNumeric(request, timeProcessed));
} else {
report.addData(new MeasurementDataNumeric(request, new Double(0)));
}
Modified: labs/jbossesb/trunk/product/tools/jonplugin/src/main/resources/META-INF/rhq-plugin.xml
===================================================================
--- labs/jbossesb/trunk/product/tools/jonplugin/src/main/resources/META-INF/rhq-plugin.xml 2009-10-15 17:44:01 UTC (rev 29627)
+++ labs/jbossesb/trunk/product/tools/jonplugin/src/main/resources/META-INF/rhq-plugin.xml 2009-10-15 17:52:19 UTC (rev 29628)
@@ -10,7 +10,6 @@
xmlns:c="urn:xmlns:rhq-configuration">
<depends plugin="JMX" />
- <depends plugin="Tomcat" />
<depends plugin="JBossAS" useClasses="true"/>
<service name="ESB"
@@ -123,12 +122,13 @@
defaultOn="true" measurementType="dynamic" description="Overall Bytes"/>
<metric displayName="Overall Bytes Processed" property="bytesProcessed" units="bytes" category="utilization" displayType="summary" defaultOn="true" measurementType="dynamic" description="Overall Bytes Processed"/>
<metric displayName="Overall Bytes Failed" property="bytesFailed" units="bytes" category="utilization" displayType="summary" defaultOn="true" measurementType="dynamic" description="Overall Bytes Failed"/>
- <metric displayName="Overall Service Time Processed" property="overallTimeProcessed" units="milliseconds" defaultOn="true" category="performance"/>
+ <metric displayName="Overall Service Time Processed" property="overallTimeProcessed" units="milliseconds" category="utilization" displayType="summary" defaultOn="true" measurementType="dynamic" description="Overall Service Time Processed"/>
<help>
<![CDATA[
JBoss ESB Services are the services available within a deployment.
]]>
</help>
+
<service name="JBoss ESB Listeners"
discovery="org.jbosson.plugins.jbossesb.ESBDiscoveryComponent"
class="ListenerComponent"
More information about the jboss-svn-commits
mailing list