[jboss-svn-commits] JBL Code SVN: r22992 - 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
Mon Sep 22 16:01:51 EDT 2008
Author: tcunning
Date: 2008-09-22 16:01:51 -0400 (Mon, 22 Sep 2008)
New Revision: 22992
Modified:
labs/jbossesb/trunk/product/tools/jonplugin/src/main/java/org/jbosson/plugins/jbossesb/ActionComponent.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/ServiceComponent.java
labs/jbossesb/trunk/product/tools/jonplugin/src/main/java/org/jbosson/plugins/jbossesb/ServiceDiscoveryComponent.java
labs/jbossesb/trunk/product/tools/jonplugin/src/main/resources/META-INF/rhq-plugin.xml
Log:
JBESB-2039
Add per-minute metrics and metric totals.
Modified: labs/jbossesb/trunk/product/tools/jonplugin/src/main/java/org/jbosson/plugins/jbossesb/ActionComponent.java
===================================================================
--- labs/jbossesb/trunk/product/tools/jonplugin/src/main/java/org/jbosson/plugins/jbossesb/ActionComponent.java 2008-09-22 16:00:25 UTC (rev 22991)
+++ labs/jbossesb/trunk/product/tools/jonplugin/src/main/java/org/jbosson/plugins/jbossesb/ActionComponent.java 2008-09-22 20:01:51 UTC (rev 22992)
@@ -45,7 +45,8 @@
private static final String PROCESSING_TIME = "processing time";
private static final String OVERALL_BYTES_PROCESSED = "processed bytes";
private static final String OVERALL_BYTES_FAILED = "failed bytes";
-
+
+ private static final String OVERALL_METRIC_NAME = "overallMessagesCount";
private static final String SUCCESS_METRIC_NAME = "successProcessedCount";
private static final String FAILED_METRIC_NAME = "failedProcessedCount";
private static final String PROCESSINGTIME_METRIC_NAME = "processingTime";
@@ -99,7 +100,8 @@
actionName = actionName.trim();
//Object entityStatistics = operation.invoke(context.getResourceKey());
- for (MeasurementScheduleRequest request : requests) {
+ int counter = 0;
+ for (MeasurementScheduleRequest request : requests) {
String metricName = request.getName();
if (metricName.equals (SUCCESS_METRIC_NAME)) {
EmsAttribute attribute = this.bean.getAttribute(actionName + " " + SUCCESS_PROCESSED);
@@ -107,6 +109,7 @@
if (attribute != null) {
processed = (Integer) attribute.refresh();
}
+ counter += processed.intValue();
report.addData(new MeasurementDataNumeric(request, new Double(processed.doubleValue())));
} else if (metricName.equals(FAILED_METRIC_NAME)) {
EmsAttribute attribute = this.bean.getAttribute(actionName + " " + FAILED_PROCESSED);
@@ -114,6 +117,7 @@
if (attribute != null) {
processed = (Integer) attribute.refresh();
}
+ counter += processed.intValue();
report.addData(new MeasurementDataNumeric(request, new Double(processed.doubleValue())));
} else if (metricName.equals(PROCESSINGTIME_METRIC_NAME)) {
EmsAttribute attribute = this.bean.getAttribute(actionName + " " + PROCESSING_TIME);
@@ -140,5 +144,11 @@
report.addData(new MeasurementDataNumeric(request, new Double(bytesProcessed.doubleValue())));
}
}
+ for (MeasurementScheduleRequest request : requests) {
+ String metricName = request.getName();
+ if (metricName.equals (OVERALL_METRIC_NAME)) {
+ report.addData(new MeasurementDataNumeric(request, new Double(counter)));
+ }
+ }
}
}
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 2008-09-22 16:00:25 UTC (rev 22991)
+++ labs/jbossesb/trunk/product/tools/jonplugin/src/main/java/org/jbosson/plugins/jbossesb/ESBComponent.java 2008-09-22 20:01:51 UTC (rev 22992)
@@ -58,7 +58,7 @@
@Override
-public void start(ResourceContext context) {
+ public void start(ResourceContext context) {
super.start(context);
Configuration pluginConfig = context.getPluginConfiguration();
@@ -75,7 +75,7 @@
}
@Override
-public AvailabilityType getAvailability() {
+ public AvailabilityType getAvailability() {
AvailabilityType av = super.getAvailability();
return av;
}
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 2008-09-22 16:00:25 UTC (rev 22991)
+++ labs/jbossesb/trunk/product/tools/jonplugin/src/main/java/org/jbosson/plugins/jbossesb/ServiceComponent.java 2008-09-22 20:01:51 UTC (rev 22992)
@@ -48,6 +48,8 @@
private static final String OVERALL_BYTES_PROCESSED = "overall bytes processed";
private static final String OVERALL_BYTES_FAILED = "overall bytes failed";
+ private static final String OVERALL_MINUTE_METRIC_NAME = "overallMessageCountByMinute";
+
@Override
public void start(ResourceContext<MBeanResourceComponent> context) {
super.start(context);
@@ -58,12 +60,13 @@
public void getValues(MeasurementReport report, Set<MeasurementScheduleRequest> requests) {
Configuration pluginConfig = this.context.getPluginConfiguration();
pluginConfig.put(new PropertySimple("type", "service"));
+ Integer overallMessages = null;
for (MeasurementScheduleRequest request : requests) {
String metricName = request.getName();
if (metricName.equals(OVERALL_MESSAGE_METRIC)) {
EmsAttribute attribute = getEmsBean().getAttribute(OVERALL_MESSAGE_COUNT);
- Integer processed = (Integer) attribute.refresh();
- report.addData(new MeasurementDataNumeric(request, new Double(processed.doubleValue())));
+ overallMessages = (Integer) attribute.refresh();
+ report.addData(new MeasurementDataNumeric(request, new Double(overallMessages.doubleValue())));
} else if (metricName.equals(OVERALL_BYTES_PROCESSED_METRIC)) {
EmsAttribute attribute = getEmsBean().getAttribute(OVERALL_BYTES_PROCESSED);
Integer processed = new Integer(0);
@@ -80,5 +83,11 @@
report.addData(new MeasurementDataNumeric(request, new Double(processed.doubleValue())));
}
}
+ for (MeasurementScheduleRequest request : requests) {
+ String metricName = request.getName();
+ if (metricName.equals(OVERALL_MINUTE_METRIC_NAME)) {
+ report.addData(new MeasurementDataNumeric(request, new Double(overallMessages.doubleValue())));
+ }
+ }
}
}
Modified: labs/jbossesb/trunk/product/tools/jonplugin/src/main/java/org/jbosson/plugins/jbossesb/ServiceDiscoveryComponent.java
===================================================================
--- labs/jbossesb/trunk/product/tools/jonplugin/src/main/java/org/jbosson/plugins/jbossesb/ServiceDiscoveryComponent.java 2008-09-22 16:00:25 UTC (rev 22991)
+++ labs/jbossesb/trunk/product/tools/jonplugin/src/main/java/org/jbosson/plugins/jbossesb/ServiceDiscoveryComponent.java 2008-09-22 20:01:51 UTC (rev 22992)
@@ -39,7 +39,7 @@
* @author Greg Hinkle
* @param <T>
*/
-public class ServiceDiscoveryComponent<T extends JMXComponent> implements ResourceDiscoveryComponent<MBeanResourceComponent> {
+public class ServiceDiscoveryComponent<T extends JMXComponent> extends SOADiscoveryComponent {
private static Log log = LogFactory.getLog(ServiceDiscoveryComponent.class);
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 2008-09-22 16:00:25 UTC (rev 22991)
+++ labs/jbossesb/trunk/product/tools/jonplugin/src/main/resources/META-INF/rhq-plugin.xml 2008-09-22 20:01:51 UTC (rev 22992)
@@ -109,14 +109,15 @@
</configuration>
</content>
<service name="JBoss ESB Services"
- discovery="org.jbosson.plugins.jbossesb.ESBDiscoveryComponent"
+ discovery="org.jbosson.plugins.jbossesb.ServiceDiscoveryComponent"
class="ServiceComponent"
description="JBoss ESB Services">
<plugin-configuration>
- <c:simple-property name="objectName" readOnly="true" default="jboss.esb:category=MessageCounter,deployment={deployment},service-name=%serviceName%"/>
+ <c:simple-property name="objectName" readOnly="true" default="jboss.esb:category=MessageCounter,deployment={deployment},service-category=%serviceCategory%,service-name=%serviceName%"/>
<c:simple-property name="nameTemplate" default="{serviceName} Service"/>
<c:simple-property name="DescriptionTemplate" default="JBoss ESB statistics for the {serviceName} service."/>
<c:simple-property name="serviceName" type="string" description="the JBoss ESB service name"/>
+ <c:simple-property name="serviceCategory" type="string" description="The JBoss ESB service category"/>
</plugin-configuration>
<operation name="resetCounter" displayName="Reset the message counter" description="Reset the message counter"/>
<metric displayName="Overall Service Message Count" property="overallMessageCount" category="utilization" displayType="summary" measurementType="dynamic" description="Overall Service Message Count"/>
More information about the jboss-svn-commits
mailing list