modules/core/client-api/src/main/java/org/rhq/core/clientapi/agent/metadata/MetricsMetadataParser.java | 33 +- modules/plugins/apache/src/main/resources/META-INF/rhq-plugin.xml | 44 --- modules/plugins/byteman/src/main/resources/META-INF/rhq-plugin.xml | 15 - modules/plugins/hardware/src/main/resources/META-INF/rhq-plugin.xml | 28 +- modules/plugins/hibernate/src/main/resources/META-INF/rhq-plugin.xml | 14 - modules/plugins/iis/src/main/resources/META-INF/rhq-plugin.xml | 37 -- modules/plugins/jboss-as-5/src/main/resources/META-INF/rhq-plugin.xml | 138 +++++----- modules/plugins/jboss-as/src/main/resources/META-INF/rhq-plugin.xml | 105 ++----- modules/plugins/jmx/src/main/resources/META-INF/rhq-plugin.xml | 6 modules/plugins/mod-cluster/src/main/resources/META-INF/rhq-plugin.xml | 2 modules/plugins/mysql/src/main/resources/META-INF/rhq-plugin.xml | 26 - modules/plugins/onewire/src/main/resources/META-INF/rhq-plugin.xml | 2 modules/plugins/oracle/src/main/resources/META-INF/rhq-plugin.xml | 38 +- modules/plugins/platform/src/main/resources/META-INF/rhq-plugin.xml | 69 ++--- modules/plugins/postgres/src/main/resources/META-INF/rhq-plugin.xml | 4 modules/plugins/rhq-agent/src/main/resources/META-INF/rhq-plugin.xml | 21 - modules/plugins/rhq-server/src/main/resources/META-INF/rhq-plugin.xml | 14 - modules/plugins/script/src/main/resources/META-INF/rhq-plugin.xml | 2 modules/plugins/tomcat/src/main/resources/META-INF/rhq-plugin.xml | 7 modules/plugins/twitter/src/main/resources/META-INF/rhq-plugin.xml | 6 20 files changed, 243 insertions(+), 368 deletions(-)
New commits: commit 2279e1e27e1474b90958eea5afc08cb383eb9e11 Author: John Mazzitelli mazz@redhat.com Date: Tue Sep 27 13:12:49 2011 -0400
[BZ 741331] turn off all plugin metrics by default, up all default collection intervals
diff --git a/modules/core/client-api/src/main/java/org/rhq/core/clientapi/agent/metadata/MetricsMetadataParser.java b/modules/core/client-api/src/main/java/org/rhq/core/clientapi/agent/metadata/MetricsMetadataParser.java index f5b4b5d..77ecd37 100644 --- a/modules/core/client-api/src/main/java/org/rhq/core/clientapi/agent/metadata/MetricsMetadataParser.java +++ b/modules/core/client-api/src/main/java/org/rhq/core/clientapi/agent/metadata/MetricsMetadataParser.java @@ -44,10 +44,11 @@ import org.rhq.core.domain.util.StringUtils; * @author Greg Hinkle */ public class MetricsMetadataParser { - public static final long MIN_1 = 1L * 60 * 1000L; - public static final long MIN_5 = 5L * MIN_1; - public static final long MIN_10 = 10L * MIN_1; - public static final long MIN_30 = 30L * MIN_1; + private static final long MIN_1 = 1L * 60 * 1000L; + private static final long MIN_10 = 10L * MIN_1; + private static final long MIN_20 = 20L * MIN_1; + private static final long MIN_30 = 30L * MIN_1; + private static final long MIN_60 = 60L * MIN_1;
public static final long MINIMUM_INTERVAL = MeasurementSchedule.MINIMUM_INTERVAL;
@@ -58,39 +59,41 @@ public class MetricsMetadataParser { DataType dataType = DataType.valueOf(metricDescriptor.getDataType().toUpperCase()); DisplayType displayType = DisplayType.valueOf(metricDescriptor.getDisplayType().toUpperCase());
- long collectionInterval = MIN_10; + long collectionInterval = MIN_30; MeasurementUnits units = getMeasurementUnits(metricDescriptor.getUnits(), dataType);
switch (dataType) { case MEASUREMENT: { switch (resourceType.getCategory()) { case PLATFORM: { - collectionInterval = MIN_1; + collectionInterval = MIN_10; break; }
case SERVER: { - collectionInterval = MIN_5; + collectionInterval = MIN_20; break; }
case SERVICE: { - collectionInterval = MIN_10; + collectionInterval = MIN_30; break; } }
- collectionInterval = (displayType == DisplayType.SUMMARY) ? collectionInterval : (collectionInterval * 2); + if (displayType != DisplayType.SUMMARY) { + collectionInterval *= 2; + } break; }
case TRAIT: { - collectionInterval = (displayType == DisplayType.SUMMARY) ? MIN_10 : MIN_30; + collectionInterval = (displayType == DisplayType.SUMMARY) ? MIN_30 : MIN_60; break; }
case CALLTIME: { - collectionInterval = MIN_1; + collectionInterval = MIN_10; if (units != MeasurementUnits.MILLISECONDS) { throw new IllegalStateException("Units must always be set to 'milliseconds' for call-time metrics."); } @@ -126,9 +129,11 @@ public class MetricsMetadataParser { definition.setDestinationType(metricDescriptor.getDestinationType());
// Make sure that all summary properties are on by default. - if (definition.getDisplayType() == DisplayType.SUMMARY) { - definition.setDefaultOn(true); - } + // BZ 741331 - we no longer want to imply any metric should be on by default + // let the plugin writer tell us explicitly if it should be on by default + // if (definition.getDisplayType() == DisplayType.SUMMARY) { + // definition.setDefaultOn(true); + // }
if ((definition.getNumericType() == NumericType.TRENDSUP) || (definition.getNumericType() == NumericType.TRENDSDOWN)) { diff --git a/modules/plugins/apache/src/main/resources/META-INF/rhq-plugin.xml b/modules/plugins/apache/src/main/resources/META-INF/rhq-plugin.xml index ad08a22..e88ffbc 100644 --- a/modules/plugins/apache/src/main/resources/META-INF/rhq-plugin.xml +++ b/modules/plugins/apache/src/main/resources/META-INF/rhq-plugin.xml @@ -463,19 +463,19 @@
<metric displayName="Number of Concurrent Connections" property="applInboundAssociations" destinationType="The number of current connections to this application" - defaultOn="true" defaultInterval="300000" displayType="summary" units="none"/> + displayType="summary" units="none"/>
<!-- traits determined via "httpd -V" -->
<metric displayName="Server Built" property="serverBuilt" description="the date and time this Apache server's binary was compiled" - dataType="trait" defaultOn="true" displayType="summary"/> + dataType="trait" displayType="summary"/>
<!-- traits determined via SNMP (format for property attribute is "MIB_column_name") -->
<metric displayName="Start Time" property="wwwServiceStartTime" description="the date and time this Apache server was last started" - dataType="trait" defaultOn="true" displayType="summary"/> + dataType="trait" displayType="summary"/>
<!-- Metric collected by pinging availability over http --> <metric property="rhq_avail_ping_time" displayType="summary" units="milliseconds" @@ -533,27 +533,27 @@
<metric displayName="Host" property="wwwServiceName" description="the host name or IP address of this virtual host" - dataType="trait" defaultOn="true" displayType="summary"/> + dataType="trait" displayType="summary"/>
<metric displayName="Port" property="wwwServiceProtocol" description="the TCP port of this virtual host" - dataType="trait" defaultOn="true" displayType="summary"/> + dataType="trait" displayType="summary"/>
<metric displayName="Administrator" property="wwwServiceContact" description="the administrator of this virtual host" - dataType="trait" defaultOn="true" displayType="summary"/> + dataType="trait" displayType="summary"/>
<!-- summary metrics for requests - determined via SNMP (format for property attribute is "MIB_column_name") -->
<metric displayName="Total Number of Requests" property="wwwSummaryInRequests" description="The number of inbound requests on the service" - defaultOn="true" defaultInterval="300000" displayType="summary" + displayType="summary" units="none" measurementType="trendsup"/>
<metric displayName="Total Number of Bytes Received" property="wwwSummaryInLowBytes" description="The number of bytes received by the service" - defaultOn="true" defaultInterval="300000" displayType="summary" + displayType="summary" units="bytes" measurementType="trendsup"/>
<!-- summary metrics for responses - determined via SNMP @@ -561,12 +561,12 @@
<metric displayName="Total Number of Responses" property="wwwSummaryOutResponses" description="The number of outbound requests on the service" - defaultOn="true" defaultInterval="300000" displayType="summary" + displayType="summary" units="none" measurementType="trendsup"/>
<metric displayName="Total Number of Bytes Sent" property="wwwSummaryOutLowBytes" description="The number of bytes sent by the service" - defaultOn="true" defaultInterval="300000" displayType="summary" + displayType="summary" units="bytes" measurementType="trendsup"/>
<!-- per-request-method metrics - determined via SNMP @@ -574,42 +574,34 @@
<metric displayName="Number of GET Requests" property="wwwRequestInRequests.GET" description="The number of inbound GET requests on the service" - defaultOn="true" defaultInterval="300000" units="none" measurementType="trendsup"/>
<metric displayName="Number of HEAD Requests" property="wwwRequestInRequests.HEAD" description="The number of inbound HEAD requests on the service" - defaultOn="false" defaultInterval="300000" units="none" measurementType="trendsup"/>
<metric displayName="Number of POST Requests" property="wwwRequestInRequests.POST" description="The number of inbound POST requests on the service" - defaultOn="true" defaultInterval="300000" units="none" measurementType="trendsup"/>
<metric displayName="Number of PUT Requests" property="wwwRequestInRequests.PUT" description="The number of inbound PUT requests on the service" - defaultOn="false" defaultInterval="300000" units="none" measurementType="trendsup"/>
<metric displayName="Bytes Received for GET Requests" property="wwwRequestInBytes.GET" description="The number of bytes received by GET requests on the service" - defaultOn="true" defaultInterval="300000" units="bytes" measurementType="trendsup"/>
<metric displayName="Bytes Received for HEAD Requests" property="wwwRequestInBytes.HEAD" description="The number of bytes received by HEAD requests on the service" - defaultOn="false" defaultInterval="300000" units="bytes" measurementType="trendsup"/>
<metric displayName="Bytes Received for POST Requests" property="wwwRequestInBytes.POST" description="The number of bytes received by POST requests on the service" - defaultOn="true" defaultInterval="300000" units="bytes" measurementType="trendsup"/>
<metric displayName="Bytes Received for PUT Requests" property="wwwRequestInBytes.PUT" description="The number of bytes received by PUT requests on the service" - defaultOn="false" defaultInterval="300000" units="bytes" measurementType="trendsup"/>
<!-- per-response-status-code metrics - determined via SNMP @@ -617,78 +609,64 @@
<metric displayName="Number of 200 Responses" property="wwwResponseOutResponses.200" description="The number of 200 responses generated by this service" - defaultOn="true" defaultInterval="300000" units="none" measurementType="trendsup"/>
<metric displayName="Number of 301 Responses" property="wwwResponseOutResponses.301" description="The number of 301 responses generated by this service" - defaultOn="true" defaultInterval="300000" units="none" measurementType="trendsup"/>
<metric displayName="Number of 302 Responses" property="wwwResponseOutResponses.302" description="The number of 302 responses generated by this service" - defaultOn="true" defaultInterval="300000" units="none" measurementType="trendsup"/>
<metric displayName="Number of 401 Responses" property="wwwResponseOutResponses.401" description="The number of 401 responses generated by this service" - defaultOn="true" defaultInterval="300000" units="none" measurementType="trendsup"/>
<metric displayName="Number of 403 Responses" property="wwwResponseOutResponses.403" description="The number of 403 responses generated by this service" - defaultOn="true" defaultInterval="300000" units="none" measurementType="trendsup"/>
<metric displayName="Number of 404 Responses" property="wwwResponseOutResponses.404" description="The number of 404 responses generated by this service" - defaultOn="true" defaultInterval="300000" units="none" measurementType="trendsup"/>
<metric displayName="Number of 500 Responses" property="wwwResponseOutResponses.500" description="The number of 500 responses generated by this service" - defaultOn="true" defaultInterval="300000" units="none" measurementType="trendsup"/>
<metric displayName="Bytes Sent for 200 Responses" property="wwwResponseOutBytes.200" description="The number of bytes sent for 200 responses generated by this service" - defaultOn="true" defaultInterval="300000" units="none" measurementType="trendsup"/>
<metric displayName="Bytes Sent for 301 Responses" property="wwwResponseOutBytes.301" description="The number of bytes sent for 301 responses generated by this service" - defaultOn="true" defaultInterval="300000" units="none" measurementType="trendsup"/>
<metric displayName="Bytes Sent for 302 Responses" property="wwwResponseOutBytes.302" description="The number of bytes sent for 302 responses generated by this service" - defaultOn="true" defaultInterval="300000" units="none" measurementType="trendsup"/>
<metric displayName="Bytes Sent for 401 Responses" property="wwwResponseOutBytes.401" description="The number of bytes sent for 401 responses generated by this service" - defaultOn="true" defaultInterval="300000" units="none" measurementType="trendsup"/>
<metric displayName="Bytes Sent for 403 Responses" property="wwwResponseOutBytes.403" description="The number of bytes sent for 403 responses generated by this service" - defaultOn="true" defaultInterval="300000" units="none" measurementType="trendsup"/>
<metric displayName="Bytes Sent for 404 Responses" property="wwwResponseOutBytes.404" description="The number of bytes sent for 404 responses generated by this service" - defaultOn="true" defaultInterval="300000" units="none" measurementType="trendsup"/>
<metric displayName="Bytes Sent for 500 Responses" property="wwwResponseOutBytes.500" description="The number of bytes sent for 500 responses generated by this service" - defaultOn="true" defaultInterval="300000" units="none" measurementType="trendsup"/>
<!-- response-time metric - determined by parsing the RT logfile that's specified in the plugin config -->
<metric property="ResponseTime" displayName="HTTP Response Time" - dataType="calltime" defaultOn="false" units="milliseconds" destinationType="URL" + dataType="calltime" units="milliseconds" destinationType="URL" description="The minimum, maximum, and average response times for HTTP requests serviced by this virtual host"/>
<resource-configuration> diff --git a/modules/plugins/byteman/src/main/resources/META-INF/rhq-plugin.xml b/modules/plugins/byteman/src/main/resources/META-INF/rhq-plugin.xml index e1d6c6c..8f50485 100644 --- a/modules/plugins/byteman/src/main/resources/META-INF/rhq-plugin.xml +++ b/modules/plugins/byteman/src/main/resources/META-INF/rhq-plugin.xml @@ -85,32 +85,27 @@ displayName="Client Version" description="The version of the client used by this plugin to talk to the Byteman agent." category="utilization" - dataType="trait" - defaultOn="true" /> + dataType="trait" />
<metric property="totalNumberOfScripts" description="The total number of scripts currently deployed in the Byteman agent. Scripts contain one or more rules." category="utilization" - displayType="summary" - defaultOn="true" /> + displayType="summary" />
<metric property="totalNumberOfRules" description="The total number of individual rules currently deployed in the Byteman agent" category="utilization" - displayType="summary" - defaultOn="true" /> + displayType="summary" />
<metric property="totalNumberOfBootJars" description="The total number of jar files that have been added to the Byteman agent's boot classpath" category="utilization" - displayType="summary" - defaultOn="true" /> + displayType="summary" />
<metric property="totalNumberOfSystemJars" description="The total number of jar files that have been added to the Byteman agent's system classpath" category="utilization" - displayType="summary" - defaultOn="true" /> + displayType="summary" />
<!-- bootJar/systemJar content allow users to push jar content to the RHQ agent machine and manage that content. diff --git a/modules/plugins/hardware/src/main/resources/META-INF/rhq-plugin.xml b/modules/plugins/hardware/src/main/resources/META-INF/rhq-plugin.xml index 225adcf..de4d75f 100644 --- a/modules/plugins/hardware/src/main/resources/META-INF/rhq-plugin.xml +++ b/modules/plugins/hardware/src/main/resources/META-INF/rhq-plugin.xml @@ -17,14 +17,14 @@ <metric property="gpusAverageTemperature" units="celsius" displayName="Average GPU Temperature" displayType="summary"/> <metric property="fanAverageSpeed" displayName="Average Fan Speed" displayType="summary"/>
- <metric property="smolt.System Memory" dataType="trait" displayType="summary" displayName="System Memory" defaultInterval="86400"/> - <metric property="smolt.System Swap" dataType="trait" displayType="summary" displayName="System Swap" defaultInterval="86400"/> - <metric property="smolt.Vendor" dataType="trait" displayType="summary" displayName="Vendor" defaultInterval="86400"/> - <metric property="smolt.System" dataType="trait" displayType="summary" displayName="System Model" defaultInterval="86400"/> - <metric property="smolt.Form factor" dataType="trait" displayType="summary" displayName="Form Factor" defaultInterval="86400"/> - <metric property="smolt.CPU Vendor" dataType="trait" displayType="summary" displayName="CPU Vendor" defaultInterval="86400"/> - <metric property="smolt.CPU Model" dataType="trait" displayType="summary" displayName="CPU Model" defaultInterval="86400"/> - <metric property="smolt.BogoMIPS" dataType="trait" displayType="summary" displayName="BogoMIPS" defaultInterval="86400"/> + <metric property="smolt.System Memory" dataType="trait" displayType="summary" displayName="System Memory"/> + <metric property="smolt.System Swap" dataType="trait" displayType="summary" displayName="System Swap"/> + <metric property="smolt.Vendor" dataType="trait" displayType="summary" displayName="Vendor"/> + <metric property="smolt.System" dataType="trait" displayType="summary" displayName="System Model"/> + <metric property="smolt.Form factor" dataType="trait" displayType="summary" displayName="Form Factor"/> + <metric property="smolt.CPU Vendor" dataType="trait" displayType="summary" displayName="CPU Vendor"/> + <metric property="smolt.CPU Model" dataType="trait" displayType="summary" displayName="CPU Model"/> + <metric property="smolt.BogoMIPS" dataType="trait" displayType="summary" displayName="BogoMIPS"/>
</server>
diff --git a/modules/plugins/hibernate/src/main/resources/META-INF/rhq-plugin.xml b/modules/plugins/hibernate/src/main/resources/META-INF/rhq-plugin.xml index ad8a9cf..dfadc25 100644 --- a/modules/plugins/hibernate/src/main/resources/META-INF/rhq-plugin.xml +++ b/modules/plugins/hibernate/src/main/resources/META-INF/rhq-plugin.xml @@ -91,7 +91,7 @@
<metric displayName="Successful Transaction Count" property="SuccessfulTransactionCount" description="The global number of transactions known to have been successful since the statistics were reset" - category="throughput" defaultOn="true" measurementType="trendsup"/> + category="throughput" measurementType="trendsup"/>
<metric displayName="Query Cache Hit Count" property="QueryCacheHitCount" description="The global number of cached queries successfully retrieved from cache since the statistics were reset" @@ -103,11 +103,11 @@
<metric displayName="Connect Count" property="ConnectCount" description="The global number of connections asked by the sessions (the actual number of connections used may be much smaller depending whether you use a connection pool or not) since the statistics were reset" - category="throughput" defaultOn="true" measurementType="trendsup"/> + category="throughput" measurementType="trendsup"/>
<metric displayName="Start Time" property="StartTime" dataType="trait" description="The time when the statistics collection started or were last reset" - category="availability" defaultOn="true" units="epoch_milliseconds" measurementType="dynamic"/> + category="availability" units="epoch_milliseconds" measurementType="dynamic"/>
<metric displayName="Second Level Cache Put Count" property="SecondLevelCachePutCount" description="The global number of cacheable entities/collections put in the cache since the statistics were reset" @@ -119,11 +119,11 @@
<metric displayName="Session Open Count" property="SessionOpenCount" description="The global number of sessions closed since the statistics were reset" - category="throughput" defaultOn="true" measurementType="trendsup"/> + category="throughput" measurementType="trendsup"/>
<metric displayName="Transaction Count" property="TransactionCount" description="The global number of transactions known to have completed since the statistics were reset" - category="throughput" defaultOn="true" measurementType="trendsup"/> + category="throughput" measurementType="trendsup"/>
<metric displayName="Collection Fetch Count" property="CollectionFetchCount" description="The global number of collections fetched since the statistics were reset" @@ -131,11 +131,11 @@
<metric displayName="Session Close Count" property="SessionCloseCount" description="The global number of sessions closed since the statistics were reset" - category="throughput" defaultOn="true" measurementType="trendsup"/> + category="throughput" measurementType="trendsup"/>
<metric displayName="Query Cache Miss Count" property="QueryCacheMissCount" description="The global number of cached queries *not* found in cache since the statistics were reset" - category="throughput" defaultOn="true" measurementType="trendsup"/> + category="throughput" measurementType="trendsup"/>
<metric displayName="Second Level Cache Miss Count" property="SecondLevelCacheMissCount" description="The global number of cacheable entities/collections not found in the cache and loaded from the database since the statistics were reset" diff --git a/modules/plugins/iis/src/main/resources/META-INF/rhq-plugin.xml b/modules/plugins/iis/src/main/resources/META-INF/rhq-plugin.xml index 5065353..287f835 100644 --- a/modules/plugins/iis/src/main/resources/META-INF/rhq-plugin.xml +++ b/modules/plugins/iis/src/main/resources/META-INF/rhq-plugin.xml @@ -5,184 +5,149 @@ <metric displayName="Bytes Sent" description="Shows the rate that data bytes are sent by the Web service." property="Bytes Sent/sec" - defaultOn="true" displayType="summary" measurementType="trendsup" units="bytes"/> <metric displayName="Bytes Received" description="Shows the rate that data bytes are received by the Web service." property="Bytes Received/sec" - defaultOn="true" displayType="summary" measurementType="trendsup" units="bytes"/> <metric displayName="Total Files Sent" description="Shows the total number of files sent by the Web service (counted since service startup)." property="Total Files Sent" - defaultOn="true" measurementType="trendsup" units="none"/> <metric displayName="Total Files Received" description="Shows the total number of files received by the Web service (counted since service startup)." property="Total Files Received" - defaultOn="true" measurementType="trendsup" units="none"/> <metric displayName="Total Files Transferred" description="Shows the sum of Files Sent and Files Received. This is the total number of files transferred by the Web service (counted since service startup)." property="Total Files Transferred" - defaultOn="true" measurementType="trendsup" units="none"/> <metric displayName="Current Anonymous Users" description="Shows the number of users who currently have an anonymous connection using the Web service." property="Current Anonymous Users" - defaultOn="true" units="none"/> <metric displayName="Current NonAnonymous Users" description="Shows the number of users who currently have a non-anonymous connection using the Web service." property="Current NonAnonymous Users" - defaultOn="true" units="none"/> <metric displayName="Total Anonymous Users" description="Shows the total number of users who established an anonymous connection with the Web service (counted since service startup)." property="Total Anonymous Users" - defaultOn="true" measurementType="trendsup" units="none"/> <metric property="Total NonAnonymous Users" description="Shows the total number of users who established a non-anonymous connection with the Web service (counted since service startup)." - defaultOn="true" measurementType="trendsup" units="none"/> <metric property="Maximum Anonymous Users" description="Shows the maximum number of users who established concurrent anonymous connections using the Web service (counted since service startup)." - defaultOn="true" units="none"/> <metric property="Maximum NonAnonymous Users" description="Shows the maximum number of users who established concurrent non-anonymous connections using the Web service (counted since service startup)." - defaultOn="true" units="none"/> <metric property="Current Connections" description="Shows the current number of connections established with the Web service." - defaultOn="true" displayType="summary" units="none"/> <metric property="Maximum Connections" description="Shows the maximum number of simultaneous connections established with the Web service." - defaultOn="true" units="none"/> <metric property="Total Logon Attempts" description="Shows the number of logons that have been attempted using the Web service (counted since service startup)." - defaultOn="true" measurementType="trendsup" units="none"/> <metric displayName="Total GET Requests" description="Shows the number of HTTP requests using the GET method (counted since service startup). GET requests are generally used for basic file retrievals or image maps, though they can be used with forms." property="Total Get Requests" - defaultOn="true" displayType="summary" measurementType="trendsup" units="none"/> <metric displayName="Total POST Requests" description="Shows the number of HTTP requests using the POST method (counted since service startup). POST requests are generally used for forms or gateway requests." property="Total Post Requests" - defaultOn="true" measurementType="trendsup" units="none"/> <metric displayName="Total HEAD Requests" description="Shows the number of HTTP requests using the HEAD method (counted since service startup). Head requests generally indicate a client is querying the state of a document they already have to see if it needs to be refreshed." property="Total Head Requests" - defaultOn="true" measurementType="trendsup" units="none"/> <metric displayName="Total PUT Requests" description="Shows the number of HTTP requests using the PUT method (counted since service startup)." property="Total Put Requests" - defaultOn="true" measurementType="trendsup" units="none"/> <metric displayName="Total DELETE Requests" description="Shows the number of HTTP requests using the DELETE method (counted since service startup). Delete requests are generally used for file removals." property="Total Delete Requests" - defaultOn="true" measurementType="trendsup" units="none"/> <metric displayName="Total TRACE Requests" description="Shows the number of HTTP requests using the TRACE method (counted since service startup). TRACE requests allow the client to see what is being received at the end of the request chain and use the information for diagnostic purposes." property="Total Trace Requests" - defaultOn="true" measurementType="trendsup" units="none"/> <metric property="Total Other Request Methods" description="Shows the number of HTTP requests that are not OPTIONS, GET, HEAD, POST, PUT, DELETE, TRACE, MOVE, COPY, MKCOL, PROPFIND, PROPPATCH, MS-SEARCH, LOCK or UNLOCK methods (counted since service startup). These may include LINK or other methods supported by gateway applications." - defaultOn="true" measurementType="trendsup" units="none"/> <metric property="Total Method Requests" description="Shows the number of all HTTP requests (counted since service startup)." - defaultOn="true" measurementType="trendsup" units="none"/> <metric property="Total CGI Requests" description="Shows the total number of CGI requests. CGI requests are custom gateway executables (.exe) the administrator can install to add forms processing or other dynamic data sources. CGI requests initiate a process on the server which can be a large drain on server resources. The count is the total since service startup." - defaultOn="true" measurementType="trendsup" units="none"/> <metric property="Total ISAPI Extension Requests" description="Shows the total number of ISAPI Extension Requests. ISAPI Extension Requests are custom gateway Dynamic Link Libraries (.dll) the administrator can install to add forms processing or other dynamic data sources. Unlike CGI requests, ISAPI requests are simple calls to a DLL library routine, thus they are better suited to high performance gateway applications. The count is the total since service startup." - defaultOn="true" measurementType="trendsup" units="none"/> <metric property="Total Not Found Errors" description="Shows the number of requests that could not be satisfied by the server because the requested document could not be found. These are generally reported as an HTTP 404 error code to the client. The count is the total since service startup." - defaultOn="true" measurementType="trendsup" units="none"/> <metric property="Total Locked Errors" description="Shows the number of requests that could not be satisfied by the server because the requested was locked. These are generally reported as an HTTP 423 error code to the client. The count is the total since service startup." - defaultOn="true" measurementType="trendsup" units="none"/> <metric property="Current CGI Requests" description="Shows the current number of CGI requests that are simultaneously being processed by the Web service." - defaultOn="true" measurementType="trendsup" units="none"/> <metric property="Current ISAPI Extension Requests" description="Shows the current number of Extension requests that are simultaneously being processed by the Web service." - defaultOn="true" units="none"/> <metric property="Maximum CGI Requests" description="Shows the maximum number of CGI requests simultaneously processed by the Web service." - defaultOn="true" units="none"/> <metric property="Maximum ISAPI Extension Requests" description="Shows the maximum number of Extension requests simultaneously processed by the Web service." - defaultOn="true" units="none"/> <metric property="Total Blocked Async I/O Requests" description="Shows the number of total requests temporarily blocked due to bandwidth throttling settings (counted since service startup)." - defaultOn="true" measurementType="trendsup" units="none"/> <metric property="Total Allowed Async I/O Requests" description="Shows the total number of requests allowed by bandwidth throttling settings (counted since service startup). When bandwidth throttling is defined, the number of allowed user requests is restricted." - defaultOn="true" measurementType="trendsup" units="none"/> <metric property="Total Rejected Async I/O Requests" description="Shows the total number of requests rejected due to bandwidth throttling settings (counted since service startup)." - defaultOn="true" measurementType="trendsup" units="none"/> <metric property="Current Blocked Async I/O Requests" description="Shows current requests that are temporarily blocked due to bandwidth throttling settings." - defaultOn="true" units="none"/> <metric property="Measured Async I/O Bandwidth Usage" description="Shows the measured bandwidth of asynchronous I/O averaged over a minute." - defaultOn="true" units="none"/> '> ]> @@ -229,12 +194,10 @@ <!-- Server only --> <metric property="Total Connection Attempts (all instances)" description="Shows the number of connections that have been attempted using the Web service (counted since service startup). This counter is for all instances listed." - defaultOn="true" measurementType="trendsup" units="none"/> <metric property="Service Uptime" description="The amount of time this service has been up for" - defaultOn="true" units="seconds"/>
<service name="VHost" description="IIS VHost" diff --git a/modules/plugins/jboss-as-5/src/main/resources/META-INF/rhq-plugin.xml b/modules/plugins/jboss-as-5/src/main/resources/META-INF/rhq-plugin.xml index e8cd691..2ae0e71 100644 --- a/modules/plugins/jboss-as-5/src/main/resources/META-INF/rhq-plugin.xml +++ b/modules/plugins/jboss-as-5/src/main/resources/META-INF/rhq-plugin.xml @@ -4,7 +4,7 @@
<!ENTITY managedObjectMetrics ' <metric property="runState" displayType="summary" - defaultOn="true" defaultInterval="600000" dataType="trait" category="performance"/> + dataType="trait" category="performance"/> '>
<!ENTITY datasourceAndConnectionFactoryOperations ' @@ -49,42 +49,42 @@ <!ENTITY datasourceMetrics ' <!-- Traits --> <metric property="poolJndiName" displayType="summary" displayName="Pool JNDI Name" - defaultOn="true" defaultInterval="600000" dataType="trait" category="performance" + dataType="trait" category="performance" description="the JNDI name of the connection pool for this datasource"/>
<!-- Numerics --> <metric property="availableConnectionCount" measurementType="dynamic" displayType="summary" - defaultOn="true" defaultInterval="600000" dataType="measurement" category="performance" + dataType="measurement" category="performance" description="the maximum number of connections that are available"/>
<metric property="connectionCount" measurementType="dynamic" displayType="summary" - defaultOn="true" defaultInterval="600000" dataType="measurement" category="performance" + dataType="measurement" category="performance" description="the number of connections that are currently in the pool"/>
<metric property="connectionCreatedCount" measurementType="dynamic" displayType="detail" - defaultOn="true" defaultInterval="600000" dataType="measurement" category="performance" + dataType="measurement" category="performance" description="the number of connections that have been created since the datasource was last started"/>
<metric property="connectionDestroyedCount" measurementType="dynamic" displayType="detail" - defaultOn="true" defaultInterval="600000" dataType="measurement" category="performance" + dataType="measurement" category="performance" description="the number of connections that have been destroyed since the datasource was last started"/>
<metric property="inUseConnectionCount" measurementType="dynamic" displayType="detail" - defaultOn="true" defaultInterval="600000" dataType="measurement" category="performance" + dataType="measurement" category="performance" description="the number of connections that are currently in use"/>
<metric property="local-transaction" displayType="summary" - defaultOn="true" defaultInterval="600000" dataType="trait" category="performance"/> + dataType="trait" category="performance"/>
<metric property="maxConnectionsInUseCount" measurementType="dynamic" displayType="detail" - defaultOn="true" defaultInterval="600000" dataType="measurement" category="performance" + dataType="measurement" category="performance" description="the most connections that have been simultaneously in use since this datasource was started"/>
<metric property="maxSize" measurementType="dynamic" displayType="detail" displayName="Max Size" - defaultOn="true" defaultInterval="600000" dataType="measurement" category="performance"/> + dataType="measurement" category="performance"/>
<metric property="minSize" measurementType="dynamic" displayType="detail" displayName="Min Size" - defaultOn="true" defaultInterval="600000" dataType="measurement" category="performance"/> + dataType="measurement" category="performance"/> '>
<!-- NOTE: For Datasource ManagedProperty annotations, see: @@ -593,39 +593,39 @@
<!ENTITY connectionFactoryMetrics ' <!-- Traits --> - <metric property="poolJndiName" displayType="summary" displayName="Pool JNDI Name" defaultOn="true" - defaultInterval="600000" dataType="trait" category="performance"/> + <metric property="poolJndiName" displayType="summary" displayName="Pool JNDI Name" + dataType="trait" category="performance"/>
<!-- Numerics --> <metric property="availableConnectionCount" measurementType="dynamic" displayType="summary" displayName="Available Connection Count" description="Number of available connections." - defaultOn="true" defaultInterval="600000" dataType="measurement" category="performance"/> + dataType="measurement" category="performance"/>
<metric property="connectionCount" measurementType="dynamic" displayType="summary" - displayName="Connection Count" defaultOn="true" defaultInterval="600000" dataType="measurement" + displayName="Connection Count" dataType="measurement" category="performance"/>
<metric property="connectionCreatedCount" measurementType="dynamic" displayType="detail" - displayName="Connection Created Count" defaultOn="true" defaultInterval="600000" + displayName="Connection Created Count" dataType="measurement" category="performance"/>
<metric property="connectionDestroyedCount" measurementType="dynamic" displayType="detail" - displayName="Connection Destroyed Count" defaultOn="true" defaultInterval="600000" + displayName="Connection Destroyed Count" dataType="measurement" category="performance"/>
<metric property="inUseConnectionCount" measurementType="dynamic" displayType="detail" displayName="In Use Connection Count" description="Mumber of connections currently in use." - defaultOn="true" defaultInterval="600000" dataType="measurement" category="performance"/> + dataType="measurement" category="performance"/>
<metric property="maxConnectionsInUseCount" measurementType="dynamic" displayType="detail" displayName="Max Connections In Use Count" description="Maximum number of maximum connections that have been in use." - defaultOn="true" defaultInterval="600000" dataType="measurement" category="performance"/> + dataType="measurement" category="performance"/>
<metric property="maxSize" measurementType="dynamic" displayType="detail" displayName="Max Size" - defaultOn="true" defaultInterval="600000" dataType="measurement" category="performance"/> + dataType="measurement" category="performance"/>
<metric property="minSize" measurementType="dynamic" displayType="detail" displayName="Min Size" - defaultOn="true" defaultInterval="600000" dataType="measurement" category="performance"/> + dataType="measurement" category="performance"/> '>
<!-- These are the operations that both Topics and Queues have. --> @@ -672,14 +672,14 @@
<!ENTITY webApplicationContextMetrics ' <metric property="clustered" dataType="trait" displayType="summary" - description="True if this web application context is clustered" defaultOn="true" defaultInterval="3600000" /> + description="True if this web application context is clustered" />
<metric property="virtualHost" dataType="trait" displayType="summary" description="the virtual host with which this context is associated"/>
<metric property="responseTime" - dataType="calltime" defaultOn="false" defaultInterval="600000" units="milliseconds" destinationType="URL" + dataType="calltime" defaultOn="false" units="milliseconds" destinationType="URL" description="the minimum, maximum, and average response times for requests serviced by this webapp"/>
<metric property="activeSessions" @@ -782,30 +782,30 @@
<!-- default interval == 600000 ms == 10 min --> <metric property="methodInvocationTime" dataType="calltime" units="milliseconds" - defaultOn="false" defaultInterval="600000" destinationType="Method Name" + defaultOn="false" destinationType="Method Name" description="The minimum, maximum, and average invocation times for each of the methods exposed by this EJB"/> '>
<!ENTITY ejb3StatefulSessionBeanMetrics ' <metric property="cacheSize" measurementType="dynamic" displayType="detail" displayName="Cache Size" - defaultOn="true" defaultInterval="600000" dataType="measurement" category="performance"/> + dataType="measurement" category="performance"/>
<metric property="passivatedCount" measurementType="dynamic" displayType="detail" displayName="Passivated Count" - defaultOn="true" defaultInterval="600000" dataType="measurement" category="performance"/> + dataType="measurement" category="performance"/>
<metric property="totalSize" measurementType="dynamic" displayType="detail" displayName="Total Size" - defaultOn="true" defaultInterval="600000" dataType="measurement" category="performance"/> + dataType="measurement" category="performance"/> '>
<!ENTITY ejb3MessageDrivenBeanMetrics ' <metric property="minPoolSize" measurementType="dynamic" displayType="detail" displayName="Minimum Pool Size" - defaultOn="true" defaultInterval="600000" dataType="measurement" category="performance"/> + dataType="measurement" category="performance"/>
<metric property="maxPoolSize" measurementType="dynamic" displayType="detail" displayName="Maximum Pool Size" - defaultOn="true" defaultInterval="600000" dataType="measurement" category="performance"/> + dataType="measurement" category="performance"/>
<metric property="maxMessages" measurementType="dynamic" displayType="detail" displayName="Maximum number of Messages" - defaultOn="true" defaultInterval="600000" dataType="measurement" category="performance"/> + dataType="measurement" category="performance"/> '>
<!ENTITY ejb2PoolMetrics ' @@ -827,7 +827,7 @@ <!ENTITY ejb2SessionBeanMetrics ' <!-- default interval == 600000 ms == 10 min --> <metric property="methodInvocationTime" dataType="calltime" units="milliseconds" - defaultOn="false" defaultInterval="600000" destinationType="Method Name" + defaultOn="false" destinationType="Method Name" description="The minimum, maximum, and average invocation times for each of the methods exposed by this EJB"/> '>
@@ -902,8 +902,7 @@ <!ENTITY ejb2EntityBeanMetrics ' <metric property="CacheSize" displayName="Cache Size" - displayType="summary" - defaultOn="true"/> + displayType="summary"/> '>
<!ENTITY subscriptionsResultProperty ' @@ -1140,35 +1139,35 @@
<metric displayName="Active Thread Count" property="MCBean|ServerInfo|*|activeThreadCount" description="The current number of active threads for this app server instance" - defaultInterval="300000" displayType="summary" category="throughput"/> + displayType="summary" category="throughput"/>
<metric displayName="Active Thread Group Count" property="MCBean|ServerInfo|*|activeThreadGroupCount" description="The current number of active thread groups for this app server instance" - defaultInterval="300000" defaultOn="true" category="throughput"/> + category="throughput"/>
<metric displayName="JVM Free Memory" property="MCBean|ServerInfo|*|freeMemory" displayType="summary" defaultOn="true" description="An approximation of the total amount of memory currently available in the app server JVM for future allocated objects, measured in bytes" - defaultInterval="300000" defaultOn="true" category="utilization" units="bytes"/> + category="utilization" units="bytes"/>
<metric displayName="JVM Max Memory" property="MCBean|ServerInfo|*|maxMemory" description="The maximum amount of memory that the app server JVM will attempt to use, measured in bytes; if there is no inherent limit then the value Long.MAX_VALUE will be returned" - defaultInterval="1800000" defaultOn="true" category="utilization" units="bytes"/> + category="utilization" units="bytes"/>
<metric displayName="JVM Total Memory" property="MCBean|ServerInfo|*|totalMemory" displayType="summary" description="The total amount of memory currently available in the app server JVM for current and future objects, measured in bytes" - defaultInterval="300000" defaultOn="true" category="utilization" units="bytes"/> + category="utilization" units="bytes"/>
<metric displayName="Total Transactions" property="MCBean|JTA|*|transactionCount" measurementType="trendsup" - defaultInterval="300000" defaultOn="true" category="utilization" + category="utilization" description="Total number of transactions since last restart"/>
<metric displayName="Transactions Committed" property="MCBean|JTA|*|commitCount" displayType="summary" measurementType="trendsup" - defaultInterval="600000" defaultOn="true" category="utilization" + category="utilization" description="Number of transactions committed since last restart"/>
<metric displayName="Transactions Rolled Back" property="MCBean|JTA|*|rollbackCount" measurementType="trendsup" - defaultInterval="600000" defaultOn="true" category="utilization" + category="utilization" description="Number of transactions rolled back since last restart"/>
<event name="logEntry" description="an entry was appended to a log file"/> @@ -1255,7 +1254,7 @@ displayName="Maximum Request Time" description="the maximum time it took to process a request since the last restart" units="milliseconds" - defaultOn="true" category="performance"/> + category="performance"/>
<metric property="requestCount" displayName="Request Count" description="the total number of requests processed since the last restart" @@ -1263,16 +1262,16 @@
<metric property="errorCount" displayName="Error Count" description="the number of errors while processing requests since the last restart" - defaultOn="true" category="utilization" measurementType="trendsup"/> + category="utilization" measurementType="trendsup"/>
<metric property="ThreadPool|currentThreadsBusy" displayName="Current Active Threads" - defaultOn="true" category="utilization" displayType="summary" + category="utilization" displayType="summary" description="the number of threads for this connector that are currently active"/>
<metric property="ThreadPool|currentThreadCount" displayName="Current Thread Count" - defaultOn="true" category="utilization" displayType="summary" + category="utilization" displayType="summary" description="the number of threads for this connector that currently exist"/>
</service> @@ -1583,7 +1582,7 @@
<metric property="custom.transactionType" displayName="Transaction Type" displayType="summary" description="The type of transactions used by this connection factory - Local or XA" - defaultOn="true" defaultInterval="600000" dataType="trait" category="performance"/> + dataType="trait" category="performance"/>
&managedObjectMetrics; &connectionFactoryMetrics; @@ -1762,54 +1761,54 @@ <!-- Traits -->
<metric property="createdProgrammatically" displayType="summary" - defaultOn="true" defaultInterval="600000" dataType="trait" category="performance" + dataType="trait" category="performance" description="Was this queue created programmatically? If Yes, the queue will not survive a restart of the application server. If No, the queue was created via a deployment XML file."/>
<!-- NOTE: We have to make this a trait rather than a resource config prop due to a bug in JBMESSAGING (see https://jira.jboss.org/jira/browse/JBAS-6721). --> <metric property="messageCounterHistoryDayLimit" - defaultOn="true" defaultInterval="600000" dataType="trait" category="performance" + dataType="trait" category="performance" description="This queue's message counter history day limit - <0: unlimited, =0: history disabled, >0: maximum day count"/>
<!-- Numerics -->
<metric property="consumerCount" measurementType="dynamic" displayType="summary" displayName="Consumer Count" - defaultOn="true" defaultInterval="600000" dataType="measurement" category="throughput" + dataType="measurement" category="throughput" description="The number of consumers on the queue"/>
<metric property="deliveringCount" measurementType="dynamic" displayType="detail" displayName="Delivering Count" - defaultOn="true" defaultInterval="600000" dataType="measurement" category="throughput" + dataType="measurement" category="throughput" description="The number of messages currently being delivered"/>
<metric property="messageCount" measurementType="dynamic" displayType="summary" displayName="Message Count" - defaultOn="true" defaultInterval="600000" dataType="measurement" category="throughput" + dataType="measurement" category="throughput" description="The number of messages in the queue"/>
<metric property="scheduledMessageCount" measurementType="dynamic" displayType="detail" displayName="Scheduled Message Count" - defaultOn="true" defaultInterval="600000" dataType="measurement" category="throughput" + dataType="measurement" category="throughput" description="The number of scheduled messages in the queue"/>
<metric property="messageStatistics.count" measurementType="dynamic" displayType="detail" displayName="Count" - defaultOn="true" defaultInterval="600000" dataType="measurement" category="utilization" + dataType="measurement" category="utilization" description="The total message count since startup or last counter reset"/>
<metric property="messageStatistics.countDelta" measurementType="dynamic" displayType="detail" displayName="Count Delta" - defaultOn="true" defaultInterval="600000" dataType="measurement" category="utilization" + dataType="measurement" category="utilization" description="The message count delta since last method call"/>
<metric property="messageStatistics.depth" measurementType="dynamic" displayType="detail" displayName="Depth" - defaultOn="true" defaultInterval="600000" dataType="measurement" category="utilization" + dataType="measurement" category="utilization" description="The current message count of pending messages within the queue waiting for dispatch"/>
<metric property="messageStatistics.depthDelta" measurementType="dynamic" displayType="detail" displayName="Depth Delta" - defaultOn="true" defaultInterval="600000" dataType="measurement" category="utilization" + dataType="measurement" category="utilization" description="The message count delta of pending messages since last method call"/>
<metric property="messageStatistics.timeLastUpdate" measurementType="dynamic" displayType="detail" displayName="Time Last Update" - defaultOn="true" defaultInterval="600000" dataType="measurement" category="utilization" + dataType="measurement" category="utilization" description="The timestamp of the last message add"/>
- <metric property="clustered" dataType="trait" description="True if this queue is clustered, false otherwise" defaultInterval="3600000" defaultOn="true"/> + <metric property="clustered" dataType="trait" description="True if this queue is clustered, false otherwise" />
<resource-configuration>
@@ -2113,42 +2112,42 @@ <!-- Traits -->
<metric property="createdProgrammatically" displayType="summary" - defaultOn="true" defaultInterval="600000" dataType="trait" category="performance" + dataType="trait" category="performance" description="Was this topic created programmatically? If Yes, the topic will not survive a restart of the application server. If No, the topic was created via a deployment XML file."/>
<!-- NOTE: We have to make this a trait rather than a resource config prop due to a bug in JBMESSAGING (see https://jira.jboss.org/jira/browse/JBAS-6721). --> <metric property="messageCounterHistoryDayLimit" - defaultOn="true" defaultInterval="600000" dataType="trait" category="performance" + dataType="trait" category="performance" description="This topic's message counter history day limit - <0: unlimited, =0: history disabled, >0: maximum day count"/>
<!-- Numerics -->
<metric property="allMessageCount" measurementType="dynamic" displayType="summary" displayName="All Message Count" - defaultOn="true" defaultInterval="600000" dataType="measurement" category="throughput" + dataType="measurement" category="throughput" description="The count of all messages in all subscriptions to this topic"/>
<metric property="allSubscriptionsCount" measurementType="dynamic" displayType="summary" displayName="All Subscriptions Count" - defaultOn="true" defaultInterval="600000" dataType="measurement" category="throughput" + dataType="measurement" category="throughput" description="The count of all subscriptions to this topic"/>
<metric property="durableMessageCount" measurementType="dynamic" displayType="detail" displayName="Durable Message Count" - defaultOn="true" defaultInterval="600000" dataType="measurement" category="throughput" + dataType="measurement" category="throughput" description="The count of all messages for all durable subscriptions to this topic"/>
<metric property="durableSubscriptionsCount" measurementType="dynamic" displayType="detail" displayName="Durable Subscriptions Count" - defaultOn="true" defaultInterval="600000" dataType="measurement" category="throughput" + dataType="measurement" category="throughput" description="The count of all durable subscriptions to this topic"/>
<metric property="nonDurableMessageCount" measurementType="dynamic" displayType="detail" displayName="Non Durable Message Count" - defaultOn="true" defaultInterval="600000" dataType="measurement" category="throughput" + dataType="measurement" category="throughput" description="The count of all messages in all non durable subscriptions to this topic"/>
<metric property="nonDurableSubscriptionsCount" measurementType="dynamic" displayType="detail" displayName="Non Durable Subscriptions Count" - defaultOn="true" defaultInterval="600000" dataType="measurement" category="throughput" + dataType="measurement" category="throughput" description="The count of all non durable subscriptions to this topic"/>
- <metric property="clustered" dataType="trait" description="True if this topic is clustered, false otherwise" defaultInterval="3600000" defaultOn="true"/> + <metric property="clustered" dataType="trait" description="True if this topic is clustered, false otherwise" />
<resource-configuration>
@@ -2569,7 +2568,7 @@ &ejb2StatelessSessionBeanMetrics;
<metric property="methodInvocationTime" dataType="calltime" units="milliseconds" - defaultOn="false" defaultInterval="600000" destinationType="Method Name" + defaultOn="false" destinationType="Method Name" description="The minimum, maximum, and average invocation times for each of the methods exposed by this EJB"/> </service>
@@ -2585,7 +2584,7 @@ &ejb2StatefulSessionBeanMetrics;
<metric property="methodInvocationTime" dataType="calltime" units="milliseconds" - defaultOn="false" defaultInterval="600000" destinationType="Method Name" + defaultOn="false" destinationType="Method Name" description="The minimum, maximum, and average invocation times for each of the methods exposed by this EJB"/> </service>
diff --git a/modules/plugins/jboss-as/src/main/resources/META-INF/rhq-plugin.xml b/modules/plugins/jboss-as/src/main/resources/META-INF/rhq-plugin.xml index 6588d0d..2536cb5 100644 --- a/modules/plugins/jboss-as/src/main/resources/META-INF/rhq-plugin.xml +++ b/modules/plugins/jboss-as/src/main/resources/META-INF/rhq-plugin.xml @@ -203,35 +203,35 @@
<metric property="jboss.system:type=ServerInfo:ActiveThreadCount" displayName="Active Thread Count" description="The current number of active threads for this app server instance" - defaultInterval="300000" displayType="summary" category="throughput"/> + displayType="summary" category="throughput"/>
<metric property="jboss.system:type=ServerInfo:ActiveThreadGroupCount" displayName="Active Thread Group Count" description="The current number of active thread groups for this app server instance" - defaultInterval="300000" defaultOn="true" category="throughput"/> + category="throughput"/>
<metric property="jboss.system:type=ServerInfo:FreeMemory" displayName="JVM Free Memory" displayType="summary" defaultOn="true" description="An approximation of the total amount of memory currently available in the app server JVM for future allocated objects, measured in bytes" - defaultInterval="300000" defaultOn="true" category="utilization" units="bytes"/> + category="utilization" units="bytes"/>
<metric property="jboss.system:type=ServerInfo:MaxMemory" displayName="JVM Max Memory" description="The maximum amount of memory that the app server JVM will attempt to use, measured in bytes; if there is no inherent limit then the value Long.MAX_VALUE will be returned" - defaultInterval="1800000" defaultOn="true" category="utilization" units="bytes"/> + category="utilization" units="bytes"/>
<metric property="jboss.system:type=ServerInfo:TotalMemory" displayName="JVM Total Memory" displayType="summary" description="The total amount of memory currently available in the app server JVM for current and future objects, measured in bytes" - defaultInterval="300000" defaultOn="true" category="utilization" units="bytes"/> + category="utilization" units="bytes"/>
<metric property="jboss:service=TransactionManager:TransactionCount" displayName="Total Transactions" measurementType="trendsup" - defaultInterval="300000" defaultOn="true" category="utilization" + category="utilization" description="Total number of transactions since last restart"/>
<metric property="jboss:service=TransactionManager:CommitCount" displayName="Transactions Committed" displayType="summary" measurementType="trendsup" - defaultInterval="600000" defaultOn="true" category="utilization" + category="utilization" description="Number of transactions commited since last restart"/>
<metric property="jboss:service=TransactionManager:RollbackCount" displayName="Transactions Rolledback" measurementType="trendsup" - defaultInterval="600000" defaultOn="true" category="utilization" + category="utilization" description="Number of transactions commited since last restart"/>
<event name="logEntry" description="an entry in a log file"/> @@ -392,7 +392,7 @@ displayName="Maximum Request Time" description="Maximum time it took to process a request" units="milliseconds" - defaultOn="true" category="performance"/> + category="performance"/>
<!-- jboss.web:name=http-0.0.0.0-8080,type=GlobalRequestProcessor:requestCount --> <metric property="jboss.web:name=%schema%%dash%%address%-%port%,type=GlobalRequestProcessor:requestCount" @@ -402,17 +402,17 @@ <!-- jboss.web:name=http-0.0.0.0-8080,type=GlobalRequestProcessor:errorCount --> <metric property="jboss.web:name=%schema%%dash%%address%-%port%,type=GlobalRequestProcessor:errorCount" displayName="Error count" description="Number of errors while processing since last restart." - defaultOn="true" category="utilization" measurementType="trendsup"/> + category="utilization" measurementType="trendsup"/>
<!-- jboss.web:name=http-0.0.0.0-8080,type=ThreadPool:currentThreadsBusy --> <metric property="jboss.web:name=%schema%%dash%%address%-%port%,type=ThreadPool:currentThreadsBusy" displayName="Threads Active" - defaultOn="true" category="utilization" displayType="summary"/> + category="utilization" displayType="summary"/>
<!-- jboss.web:name=http-0.0.0.0-8080,type=ThreadPool:currentThreadCount --> <metric property="jboss.web:name=%schema%%dash%%address%-%port%,type=ThreadPool:currentThreadCount" displayName="Threads Allocated" - defaultOn="true" category="utilization" displayType="summary"/> + category="utilization" displayType="summary"/>
</service> <service name="VHost" @@ -429,7 +429,7 @@ <metric property="jboss.web:type=Host,host=%name%:aliases" description="The aliases for this virtual host" displayName="Aliases" - defaultOn="true" dataType="trait" /> + dataType="trait" /> </service> </server>
@@ -461,20 +461,20 @@ created."/>
<metric displayName="Total Connections" property="ConnectionCount" - category="utilization" defaultOn="true" displayType="summary" + category="utilization" displayType="summary" description="Total Number of Connections for the Connection Pool, both active and in-active."/> <metric displayName="Available Connections" property="AvailableConnectionCount" - category="utilization" defaultOn="true" displayType="summary" + category="utilization" displayType="summary" description="Number of available connections in the connection pool in-active and waiting."/> <metric displayName="Active Connections" property="InUseConnectionCount" - category="utilization" defaultOn="true" displayType="summary" + category="utilization" displayType="summary" description="Number of Connections currently supporting clients."/> <metric displayName="Connections Created" property="ConnectionCreatedCount" - category="utilization" defaultOn="true" displayType="summary" + category="utilization" displayType="summary" measurementType="trendsup" description="Number of Connections created since the Connection Pool was created."/> <metric displayName="Connections Destroyed" property="ConnectionDestroyedCount" - category="utilization" defaultOn="true" displayType="summary" + category="utilization" displayType="summary" measurementType="trendsup" description="Number of Connections destroyed since the Connection Pool was created."/>
@@ -601,33 +601,33 @@
<metric property="AvailableConnectionCount" measurementType="dynamic" displayType="summary" displayName="Available Connection Count" description="Number of available connections." - defaultOn="true" defaultInterval="600000" dataType="measurement" category="performance"/> + dataType="measurement" category="performance"/>
<metric property="ConnectionCount" measurementType="dynamic" displayType="summary" - displayName="Connection Count" defaultOn="true" defaultInterval="600000" dataType="measurement" + displayName="Connection Count" dataType="measurement" category="performance"/>
<metric property="ConnectionCreatedCount" measurementType="dynamic" displayType="detail" - displayName="Connection Created Count" defaultOn="true" defaultInterval="600000" + displayName="Connection Created Count" dataType="measurement" category="performance"/>
<metric property="ConnectionDestroyedCount" measurementType="dynamic" displayType="detail" - displayName="Connection Destroyed Count" defaultOn="true" defaultInterval="600000" + displayName="Connection Destroyed Count" dataType="measurement" category="performance"/>
<metric property="InUseConnectionCount" measurementType="dynamic" displayType="detail" displayName="In Use Connection Count" description="Mumber of connections currently in use." - defaultOn="true" defaultInterval="600000" dataType="measurement" category="performance"/> + dataType="measurement" category="performance"/>
<metric property="MaxConnectionsInUseCount" measurementType="dynamic" displayType="detail" displayName="Max Connections In Use Count" description="Maximum number of maximum connections that have been in use." - defaultOn="true" defaultInterval="600000" dataType="measurement" category="performance"/> + dataType="measurement" category="performance"/>
<metric property="MaxSize" measurementType="dynamic" displayType="detail" displayName="Max Size" - defaultOn="true" defaultInterval="600000" dataType="measurement" category="performance"/> + dataType="measurement" category="performance"/>
<metric property="MinSize" measurementType="dynamic" displayType="detail" displayName="Min Size" - defaultOn="true" defaultInterval="600000" dataType="measurement" category="performance"/> + dataType="measurement" category="performance"/>
<resource-configuration>
@@ -972,27 +972,27 @@
<metric property="jboss.mq:service=MessageCache:CacheHits" displayName="JMS Message Cache Hits" description="The number of cache hits to the JMS Message Cache" - defaultInterval="300000" defaultOn="false" category="throughput" measurementType="trendsup"/> + defaultOn="false" category="throughput" measurementType="trendsup"/>
<metric property="jboss.mq:service=MessageCache:CacheMisses" displayName="JMS Message Cache Misses" description="The number of cache misses to the JMS Message Cache" - defaultInterval="300000" defaultOn="false" category="throughput" measurementType="trendsup"/> + defaultOn="false" category="throughput" measurementType="trendsup"/>
<metric property="jboss.mq:service=MessageCache:CurrentMemoryUsage" displayName="JMS Message Cache Current Memory Usage" description="The total memory currently in use by the JMS Message Cache" - defaultInterval="300000" defaultOn="false" category="utilization" units="bytes"/> + defaultOn="false" category="utilization" units="bytes"/>
<metric property="jboss.mq:service=MessageCache:HighMemoryMark" displayName="JMS Message Cache High Memory Mark" description="The peak amount of memory the JMS Message Cache has actively used since server start" - defaultInterval="300000" defaultOn="false" category="utilization" units="bytes"/> + defaultOn="false" category="utilization" units="bytes"/>
<metric property="jboss.mq:service=MessageCache:MaxMemoryMark" displayName="JMS Message Cache Max Memory Mark" description="The maximum amount of memory the JMS Message Cache is allowed to use" - defaultInterval="300000" defaultOn="false" category="utilization" units="bytes"/> + defaultOn="false" category="utilization" units="bytes"/>
<metric property="jboss.mq:service=MessageCache:TotalCacheSize" displayName="JMS Message Cache Size" description="The number of messages currently in the JMS Message Cache" - defaultInterval="300000" defaultOn="false" category="utilization"/> + defaultOn="false" category="utilization"/>
<service name="JMQ JMS Queue" class="JMSComponent" discovery="org.rhq.plugins.jmx.MBeanResourceDiscoveryComponent" @@ -1049,26 +1049,22 @@ <metric displayName="Messages in Queue" property="QueueDepth" category="utilization" - defaultOn="true" displayType="summary" description="The number of undelivered messages in the queue."/>
<metric displayName="Receivers Count" property="ReceiversCount" category="utilization" - defaultOn="true" description="The number of ClientConsumers waiting for a message."/>
<metric displayName="Scheduled Message Count" property="ScheduledMessageCount" category="utilization" - defaultOn="true" description="The number of messages waiting to be scheduled"/>
<metric displayName="In Process Message Count" property="InProcessMessageCount" category="utilization" - defaultOn="true" description="The number of messages received by clients but not acknowledged (from AS 4.0.5)"/>
<resource-configuration> @@ -1389,37 +1385,31 @@ <metric displayName="All Message Counter" property="AllMessageCount" category="utilization" - defaultOn="true" displayType="summary" description="Returns the total message count for all subscriptions."/> <metric displayName="Durable Message Count" property="DurableMessageCount" category="utilization" - defaultOn="true" displayType="summary" description="Total number of messages for all durable subscriptions."/> <metric displayName="Non-durable Message Count" property="NonDurableMessageCount" category="utilization" - defaultOn="true" displayType="summary" description="Total number of messages for all non-durable subscriptions."/> <metric displayName="All Subscription Count" property="AllSubscriptionsCount" category="utilization" - defaultOn="true" displayType="summary" description="Number of subscriptions waiting for a message."/> <metric displayName="Durable Subscription Count" property="DurableSubscriptionsCount" category="utilization" - defaultOn="true" displayType="summary" description="Number of durable subscriptions waiting for a message."/> <metric displayName="Non-durable Subscription Count" property="NonDurableSubscriptionsCount" category="utilization" - defaultOn="true" displayType="summary" description="Number of non-durable subscriptions waiting for a message."/>
@@ -1624,24 +1614,20 @@ <metric displayName="Messages in Queue" property="MessageCount" category="utilization" - defaultOn="true" displayType="summary" description="The number of messages in the queue."/> <metric displayName="Consumer Count" property="ConsumerCount" category="utilization" - defaultOn="true" description="The number of ClientConsumers waiting for a message."/> <metric displayName="Scheduled Message Count" property="ScheduledMessageCount" category="utilization" - defaultOn="true" description="The number of scheduled messages in the Queue"/> <metric displayName="Created programmatically" property="CreatedProgrammatically" dataType="trait" displayType="summary" - defaultOn="true" description="Was this Queue created dynamically" /> <metric displayName="Delivering Count" property="DeliveringCount" @@ -1843,7 +1829,6 @@ <metric displayName="All Message Counter" property="AllMessageCount" category="utilization" - defaultOn="true" displayType="summary" description="Returns the total message count for all subscriptions."/> <metric displayName="Durable Message Count" @@ -1859,7 +1844,6 @@ <metric displayName="All Subscription Count" property="AllSubscriptionsCount" category="utilization" - defaultOn="true" displayType="summary" description="Number of subscriptions waiting for a message."/> <metric displayName="Durable Subscription Count" @@ -1876,7 +1860,6 @@ property="CreatedProgrammatically" dataType="trait" displayType="summary" - defaultOn="true" description="Was this Topic created dynamically" />
<resource-configuration> @@ -2046,9 +2029,8 @@ <metric displayName="Max Size" property="MaxSize" description="The maximum number of instances that are allowed to be pooled"/>
- <!-- default interval == 600000 ms == 10 min --> <metric property="MethodInvocationTime" dataType="calltime" units="milliseconds" - defaultOn="false" defaultInterval="600000" destinationType="Method Name" + defaultOn="false" destinationType="Method Name" description="The minimum, maximum, and average invocation times for each of the methods exposed by this EJB; NOTE: this metric is only available if JBoss EJB3 RC9 Patch 1 or later is being used (a capable version of EJB3 is included with JBossAS 4.2.0.GA or later)"/> @@ -2096,9 +2078,8 @@ description="The maximum number of instances that are allowed to be pooled" property="{{jboss.j2ee:jndiName=%name%,plugin=pool,service=EJB}MaxSize}"/>
- <!-- default interval == 600000 ms == 10 min --> <metric property="MethodInvocationTime" dataType="calltime" units="milliseconds" - defaultOn="false" defaultInterval="600000" destinationType="Method Name" + defaultOn="false" destinationType="Method Name" description="the minimum, maximum, and average invocation times for each of the methods exposed by this EJB"/>
</service> @@ -2142,9 +2123,8 @@ property="{stats.passiveCount.current}" displayType="summary"/>
- <!-- default interval == 600000 ms == 10 min --> <metric property="MethodInvocationTime" dataType="calltime" units="milliseconds" - defaultOn="false" defaultInterval="600000" destinationType="Method Name" + defaultOn="false" destinationType="Method Name" description="the minimum, maximum, and average invocation times for each of the methods exposed by this EJB"/>
</service> @@ -2190,24 +2170,20 @@
<metric property="{{jboss.j2ee:jndiName=%name%,plugin=cache,service=EJB}CacheSize}" description="The total number of currently cached instances of this EJB 1.x or 2.x Entity Bean" - displayName="Cache Size" - defaultOn="true"/> + displayName="Cache Size"/>
<metric property="{{jboss.j2ee:jndiName=%name%,plugin=cache,service=EJB}PassivatedCount}" description="The number of pooled instances of this EJB 1.x or 2.x Entity Bean in the passivated state" displayName="Passivated Count" - defaultOn="true" measurementType="trendsup"/>
<metric property="{{jboss.j2ee:jndiName=%name%,plugin=pool,service=EJB}PoolSize}" description="The total number of currently pooled instances of this EJB 1.x or 2.x Entity Bean" - displayName="Current Size" - defaultOn="true"/> + displayName="Current Size"/>
<metric property="{{jboss.j2ee:jndiName=%name%,plugin=pool,service=EJB}MaxPoolSize}" description="The maximum number of instances that are allowed to be pooled" - displayName="Max Size" - defaultOn="true"/> + displayName="Max Size"/>
</service>
@@ -2412,7 +2388,7 @@ <metric property="Session.sessionMaxAliveTime" displayName="Max Session alive time" units="seconds" description="Maximum alive time of a Sessions" />
- <metric property="Vhost.name" displayName="Vhost" dataType="trait" defaultOn="true" + <metric property="Vhost.name" displayName="Vhost" dataType="trait" description="Virtual hosts this app runs on"/>
</service> @@ -2539,7 +2515,7 @@ <metric property="Session.sessionMaxAliveTime" displayName="Max Session alive time" units="seconds" description="Maximum alive time of a Sessions" />
- <metric property="Vhost.name" displayName="Vhost" dataType="trait" defaultOn="true" + <metric property="Vhost.name" displayName="Vhost" dataType="trait" description="Virtual hosts this app runs on"/>
<content name="file" displayName="WAR File" category="deployable" isCreationType="true"> diff --git a/modules/plugins/jmx/src/main/resources/META-INF/rhq-plugin.xml b/modules/plugins/jmx/src/main/resources/META-INF/rhq-plugin.xml index b142a22..b2c71b9 100644 --- a/modules/plugins/jmx/src/main/resources/META-INF/rhq-plugin.xml +++ b/modules/plugins/jmx/src/main/resources/META-INF/rhq-plugin.xml @@ -126,7 +126,6 @@ </plugin-configuration>
<metric displayName="Free Physical Memory" - defaultOn="true" displayType="summary" category="performance" property="FreePhysicalMemorySize" @@ -147,7 +146,6 @@ measurementType="trendsup" units="nanoseconds"/> <metric displayName="Committed Virtual Memory" - defaultOn="true" category="utilization" property="CommittedVirtualMemorySize" description="Size of virtual memory used by this process" @@ -208,23 +206,19 @@ </operation>
<metric displayName="Thread Count" - defaultOn="true" displayType="summary" category="performance" property="ThreadCount" description="Number of active threads in the system"/> <metric displayName="Peak Thread Count" - defaultOn="true" category="performance" property="PeakThreadCount" description="Peak count of active threads in the system"/> <metric displayName="Total Started Thread Count" - defaultOn="true" category="performance" property="TotalStartedThreadCount" description="Count of threads started since system start"/> <metric displayName="Daemon Thread Count" - defaultOn="true" category="performance" property="DaemonThreadCount" description="Count of threads marked as daemons in the system"/> 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 282987e..491af1c 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 @@ -477,7 +477,7 @@
<metric property="Load" displayName="Load" category="utilization" description="The current load of this metric as a percent of the metric's capacity." dataType="measurement" - defaultOn="true" displayType="summary"/> + displayType="summary"/>
<resource-configuration> <c:simple-property name="weight" type="integer" description="The significance of this load metric compared to the other metrics." /> diff --git a/modules/plugins/mysql/src/main/resources/META-INF/rhq-plugin.xml b/modules/plugins/mysql/src/main/resources/META-INF/rhq-plugin.xml index 6a96c19..9c3e148 100644 --- a/modules/plugins/mysql/src/main/resources/META-INF/rhq-plugin.xml +++ b/modules/plugins/mysql/src/main/resources/META-INF/rhq-plugin.xml @@ -361,21 +361,21 @@ <c:simple-property name="tableName" readOnly="true" /> </plugin-configuration> <!-- Summary Traits --> - <metric property="Engine" displayType="summary" dataType="trait" description="Database Engine that created the Table" defaultOn="true"/> - <metric property="Version" displayType="summary" dataType="trait" description="Version of the Table" defaultOn="true"/> - <metric property="Row_format" displayType="summary" dataType="trait" description="Row Format" defaultOn="true"/> - <metric property="Collation" displayType="summary" dataType="trait" description="Collation Character Set" defaultOn="true"/> - <metric property="Comment" displayType="summary" dataType="trait" description="Table Creation Comment" defaultOn="true"/> - <metric property="Create_options" displayType="summary" dataType="trait" description="Table Creation Options" defaultOn="true"/> - <metric property="Create_time" displayType="summary" dataType="trait" description="Table Creation Time" defaultOn="true"/> + <metric property="Engine" displayType="summary" dataType="trait" description="Database Engine that created the Table" /> + <metric property="Version" displayType="summary" dataType="trait" description="Version of the Table" /> + <metric property="Row_format" displayType="summary" dataType="trait" description="Row Format" /> + <metric property="Collation" displayType="summary" dataType="trait" description="Collation Character Set" /> + <metric property="Comment" displayType="summary" dataType="trait" description="Table Creation Comment" /> + <metric property="Create_options" displayType="summary" dataType="trait" description="Table Creation Options" /> + <metric property="Create_time" displayType="summary" dataType="trait" description="Table Creation Time" />
<!-- Dynamic Metrics --> - <metric property="Rows" displayType="summary" measurementType="dynamic" description="Number of Rows in the Table" defaultOn="true"/> - <metric property="Avg_row_length" displayType="summary" measurementType="dynamic" units="bytes" description="Average Row Length(bytes)" defaultOn="true"/> - <metric property="Data_length" displayType="summary" measurementType="dynamic" units="bytes" description="Table Data Size(bytes)" defaultOn="true"/> - <metric property="Max_data_length" displayType="summary" measurementType="dynamic" units="bytes" description="Max Table Data Size(bytes)" defaultOn="true"/> - <metric property="Index_length" displayType="summary" measurementType="dynamic" units="bytes" description="Table Index Size(bytes)" defaultOn="true"/> - <metric property="Data_free" displayType="summary" measurementType="dynamic" units="bytes" description="Table Free Space(bytes)" defaultOn="true"/> + <metric property="Rows" displayType="summary" measurementType="dynamic" description="Number of Rows in the Table" /> + <metric property="Avg_row_length" displayType="summary" measurementType="dynamic" units="bytes" description="Average Row Length(bytes)" /> + <metric property="Data_length" displayType="summary" measurementType="dynamic" units="bytes" description="Table Data Size(bytes)" /> + <metric property="Max_data_length" displayType="summary" measurementType="dynamic" units="bytes" description="Max Table Data Size(bytes)" /> + <metric property="Index_length" displayType="summary" measurementType="dynamic" units="bytes" description="Table Index Size(bytes)" /> + <metric property="Data_free" displayType="summary" measurementType="dynamic" units="bytes" description="Table Free Space(bytes)" /> </service> </service> <service name="User" class="MySqlUserComponent" discovery="MySqlUserDiscoveryComponent" diff --git a/modules/plugins/onewire/src/main/resources/META-INF/rhq-plugin.xml b/modules/plugins/onewire/src/main/resources/META-INF/rhq-plugin.xml index a8ea1e3..5cca30b 100644 --- a/modules/plugins/onewire/src/main/resources/META-INF/rhq-plugin.xml +++ b/modules/plugins/onewire/src/main/resources/META-INF/rhq-plugin.xml @@ -25,7 +25,7 @@ discovery="DS1820Discovery" >
- <metric property="temperature" defaultOn="true" description="Temperature measured" + <metric property="temperature" description="Temperature measured" displayType="summary" units="celsius"/>
</service> diff --git a/modules/plugins/oracle/src/main/resources/META-INF/rhq-plugin.xml b/modules/plugins/oracle/src/main/resources/META-INF/rhq-plugin.xml index 11eb232..fea33f1 100644 --- a/modules/plugins/oracle/src/main/resources/META-INF/rhq-plugin.xml +++ b/modules/plugins/oracle/src/main/resources/META-INF/rhq-plugin.xml @@ -33,13 +33,13 @@
<metric property="totalSize" displayType="summary" units="bytes"/> - <metric property="logons cumulative" defaultOn="true"/> + <metric property="logons cumulative" /> <metric property="logons current" displayType="summary"/> <metric property="opened cursors cumulative"/> - <metric property="opened cursors current" defaultOn="true"/> + <metric property="opened cursors current" /> <metric property="user commits" displayType="summary"/> <metric property="user rollbacks" displayType="summary"/> - <metric property="user calls" defaultOn="true"/> + <metric property="user calls" /> <metric property="recursive calls"/> <metric property="recursive cpu usage"/> <metric property="session logical reads"/> @@ -49,8 +49,8 @@ <metric property="DB time"/> <metric property="cluster wait time"/> <metric property="concurrency wait time"/> - <metric property="application wait time" defaultOn="true"/> - <metric property="user I/O wait time" defaultOn="true"/> + <metric property="application wait time" /> + <metric property="user I/O wait time" /> <metric property="session connect time"/> <metric property="process last non-idle time"/> <!--<metric property="session uga memory" displayType="summary" units="bytes"/> @@ -70,30 +70,30 @@ <metric property="global enqueue gets async"/> <metric property="global enqueue get time"/> <metric property="global enqueue releases"/> - <metric property="physical read total IO requests" defaultOn="true"/> + <metric property="physical read total IO requests" /> <metric property="physical read total multi block requests"/> - <metric property="physical read total bytes" defaultOn="true"/> - <metric property="physical write total IO requests" defaultOn="true"/> + <metric property="physical read total bytes" /> + <metric property="physical write total IO requests" /> <metric property="physical write total multi block requests"/> - <metric property="physical write total bytes" defaultOn="true"/> + <metric property="physical write total bytes" /> <metric property="IPC CPU used by this session"/> <metric property="gcs messages sent"/> <metric property="ges messages sent"/> <metric property="global enqueue CPU used by this session"/> - <metric property="db block gets" defaultOn="true"/> - <metric property="db block gets from cache" defaultOn="true"/> - <metric property="db block gets direct" defaultOn="true"/> + <metric property="db block gets" /> + <metric property="db block gets from cache" /> + <metric property="db block gets direct" /> <metric property="consistent gets"/> <metric property="consistent gets from cache"/> <metric property="consistent gets - examination"/> <metric property="consistent gets direct"/> - <metric property="physical reads" defaultOn="true"/> + <metric property="physical reads" /> <metric property="physical reads cache"/> <metric property="physical reads direct"/> - <metric property="physical read IO requests" defaultOn="true"/> + <metric property="physical read IO requests" /> <metric property="physical read bytes"/> - <metric property="db block changes" defaultOn="true"/> - <metric property="consistent changes" defaultOn="true"/> + <metric property="db block changes" /> + <metric property="consistent changes" /> <metric property="recovery blocks read"/> <metric property="physical writes"/> <metric property="physical writes direct"/> @@ -367,15 +367,15 @@ <metric property="parse count (hard)"/> <metric property="parse count (failures)"/> <metric property="frame signature mismatch"/> - <metric property="execute count" defaultOn="true"/> + <metric property="execute count" /> <metric property="bytes sent via SQL*Net to client"/> <metric property="bytes received via SQL*Net from client"/> <metric property="SQL*Net roundtrips to/from client"/> <metric property="bytes sent via SQL*Net to dblink"/> <metric property="bytes received via SQL*Net from dblink"/> <metric property="SQL*Net roundtrips to/from dblink"/> - <metric property="sorts (memory)" defaultOn="true"/> - <metric property="sorts (disk)" defaultOn="true"/> + <metric property="sorts (memory)" /> + <metric property="sorts (disk)" /> <metric property="sorts (rows)"/> <metric property="OTC commit optimization attempts"/> <metric property="OTC commit optimization hits"/> diff --git a/modules/plugins/platform/src/main/resources/META-INF/rhq-plugin.xml b/modules/plugins/platform/src/main/resources/META-INF/rhq-plugin.xml index 64575d9..cd70d40 100644 --- a/modules/plugins/platform/src/main/resources/META-INF/rhq-plugin.xml +++ b/modules/plugins/platform/src/main/resources/META-INF/rhq-plugin.xml @@ -54,34 +54,29 @@ description="Name that this platform is known as" defaultOn="true" dataType="trait" - displayType="summary" - defaultOn="true" /> + displayType="summary" /> <metric displayName="OS Name" property="Trait.osname" description="Name that the operating system is known as" defaultOn="true" dataType="trait" - displayType="summary" - defaultOn="true" /> + displayType="summary" /> <metric displayName="OS Version" property="Trait.osversion" description="Version of the operating system" defaultOn="true" dataType="trait" - displayType="summary" - defaultOn="true" /> + displayType="summary" /> <metric displayName="Architecture" property="Trait.sysarch" description="Hardware architecture of the platform" defaultOn="true" dataType="trait" - displayType="summary" - defaultOn="true"/> + displayType="summary" /> '> <!ENTITY nativeMetrics ' <metric displayName="Free Memory" property="Native.MemoryInfo.free" - defaultOn="true" displayType="summary" defaultOn="true" units="bytes" @@ -89,7 +84,6 @@
<metric displayName="Used Memory" property="Native.MemoryInfo.used" - defaultOn="true" displayType="summary" defaultOn="true" units="bytes" @@ -97,29 +91,23 @@
<metric displayName="Total Memory" property="Native.MemoryInfo.total" - defaultOn="true" units="bytes" - defaultInterval="1200000" description="The total system memory"/>
<metric displayName="Free Swap Space" property="Native.SwapInfo.free" - defaultOn="true" units="bytes" description="The total free system swap"/>
<metric displayName="Used Swap Space" property="Native.SwapInfo.used" - defaultOn="true" displayType="summary" units="bytes" description="The total used system swap"/>
<metric displayName="Total Swap Space" property="Native.SwapInfo.total" - defaultOn="true" units="bytes" - defaultInterval="1200000" description="The total system swap"/> '>
@@ -151,29 +139,21 @@ property="CpuTrait.vendor" defaultOn="true" dataType="trait" - defaultOn="true" - defaultInterval="3600000" description="Vendor of this CPU"/> <metric displayName="CPU Model" property="CpuTrait.model" defaultOn="true" dataType="trait" - defaultOn="true" - defaultInterval="3600000" description="Model of this CPU"/> <metric displayName="CPU Speed" property="CpuTrait.mhz" defaultOn="true" dataType="trait" - defaultOn="true" - defaultInterval="3600000" description="Speed of this CPU in Mhz"/> <metric displayName="Cache size" property="CpuTrait.cacheSize" defaultOn="true" dataType="trait" - defaultOn="true" - defaultInterval="3600000" description="Cache Size of this CPU"/> '>
@@ -348,15 +328,13 @@ description="name of the Linux distribution" defaultOn="true" dataType="trait" - displayType="summary" - defaultOn="true" /> + displayType="summary" /> <metric displayName="Distribution Version" property="distro.version" description="version of the Linux distribution" defaultOn="true" dataType="trait" - displayType="summary" - defaultOn="true" /> + displayType="summary" />
&syslogEventDefinition;
@@ -538,29 +516,29 @@ description="The total free bytes on filesystem"/> <metric property="fileSystemUsage.usePercent" displayName="Used Percentage" units="percentage" displayType="summary" description="The percentage of disk used"/> - <metric property="fileSystemUsage.total" displayName="Capacity" units="kilobytes" dataType="trait" defaultOn="true" + <metric property="fileSystemUsage.total" displayName="Capacity" units="kilobytes" dataType="trait" description="The total size of the filesystem"/> <metric property="fileSystem.typeName" displayName="Volume Type" dataType="trait" displayType="summary" description="The filesystem's generic type name"/> <metric property="fileSystem.sysTypeName" displayName="Drive Type" dataType="trait" displayType="summary" description="The filesystem's operating system-specific type name"/> - <metric property="fileSystem.devName" displayName="name" dataType="trait" defaultOn="true" + <metric property="fileSystem.devName" displayName="name" dataType="trait" description="The name of this device"/> <metric property="fileSystemUsage.freeFiles" displayName="Free Files" description="The number of free file nodes on the filesystem"/> - <metric property="fileSystem.flags" displayName="Flags" dataType="trait" defaultOn="true" + <metric property="fileSystem.flags" displayName="Flags" dataType="trait" description="The filesystem's flags"/> - <metric property="fileSystemUsage.used" displayName="Used" units="kilobytes" defaultOn="true" + <metric property="fileSystemUsage.used" displayName="Used" units="kilobytes" description="The total bytes used on the filesystem"/> <metric property="fileSystemUsage.diskReads" displayName="Disk Reads" measurementType="trendsup" displayType="summary" description="The number of physical disk reads"/> <metric property="fileSystemUsage.diskWrites" displayName="Disk Writes" measurementType="trendsup" displayType="summary" description="The number of physical disk writes"/> - <metric property="fileSystemUsage.diskReadBytes" displayName="Disk Read Bytes" measurementType="trendsup" units="bytes" defaultOn="true" + <metric property="fileSystemUsage.diskReadBytes" displayName="Disk Read Bytes" measurementType="trendsup" units="bytes" description="The number of physical disk bytes read"/> - <metric property="fileSystemUsage.diskWriteBytes" displayName="Disk Write Bytes" measurementType="trendsup" units="bytes" defaultOn="true" + <metric property="fileSystemUsage.diskWriteBytes" displayName="Disk Write Bytes" measurementType="trendsup" units="bytes" description="The number of physical disk bytes written"/> - <metric property="fileSystemUsage.diskQueue" displayName="Disk Queue" defaultOn="true" + <metric property="fileSystemUsage.diskQueue" displayName="Disk Queue" description="The number of I/Os currently in progress"/>
</service> diff --git a/modules/plugins/postgres/src/main/resources/META-INF/rhq-plugin.xml b/modules/plugins/postgres/src/main/resources/META-INF/rhq-plugin.xml index 88df960..6d55124 100644 --- a/modules/plugins/postgres/src/main/resources/META-INF/rhq-plugin.xml +++ b/modules/plugins/postgres/src/main/resources/META-INF/rhq-plugin.xml @@ -391,10 +391,10 @@ <metric displayName="Total Size" property="total_size" measurementType="dynamic" displayType="summary" units="bytes" description="The size in bytes of the data and all associated indexes and toast tables"/> <metric displayName="Rows" property="rows" measurementType="dynamic" - defaultOn="false" defaultInterval="600000" + defaultOn="false" description="The count of rows in the table. Warning: This may be an expensive operation"/> <metric displayName="Approximate rows" property="rows_approx" measurementType="dynamic" - defaultOn="false" defaultInterval="300000" + defaultOn="false" description="The approximate count of rows in the table. This is basically the number of rows of the last ANALYZE of the table. This metric is not expensive."/>
<!-- TODO GH: add metrics for data and index space used --> diff --git a/modules/plugins/rhq-agent/src/main/resources/META-INF/rhq-plugin.xml b/modules/plugins/rhq-agent/src/main/resources/META-INF/rhq-plugin.xml index 3517bf6..69cbf8a 100644 --- a/modules/plugins/rhq-agent/src/main/resources/META-INF/rhq-plugin.xml +++ b/modules/plugins/rhq-agent/src/main/resources/META-INF/rhq-plugin.xml @@ -197,13 +197,11 @@ dataType="trait" displayType="detail" defaultInterval="86400000" - defaultOn="true" description="The directory where the agent is installed" />
<metric property="NumberAgentRestarts" displayName="Number of Agent Restarts" description="Number of times the agent was restarted during the lifetime of its Java Virtual Machine" - defaultOn="true" displayType="detail" units="none" category="availability" @@ -212,8 +210,6 @@ <metric property="AgentServerClockDifference" displayName="Agent-Server Clock Difference" description="Number of milliseconds the agent's clock differs from its server's clock" - defaultInterval="1800000" - defaultOn="true" displayType="summary" units="milliseconds" category="performance" @@ -230,7 +226,6 @@ <metric property="NumberTotalCommandsReceived" displayName="Total Number Of Commands Received" description="Total number of messages this agent has received from the RHQ Server" - defaultOn="true" displayType="summary" category="throughput" measurementType="trendsup" /> @@ -238,21 +233,18 @@ <metric property="NumberSuccessfulCommandsReceived" displayName="Number of Commands Received Successfully" description="Number of messages this agent has received from the RHQ Server and succesfully processed" - defaultOn="true" category="throughput" measurementType="trendsup" />
<metric property="NumberFailedCommandsReceived" displayName="Number of Commands Received but Failed " description="Number of messages this agent has received from the RHQ Server but failed to process" - defaultOn="true" category="throughput" measurementType="trendsup" />
<metric property="AverageExecutionTimeReceived" displayName="Avg Execution Time Commands Received Successfully" description="Average time it took to process incoming commands that are ultimately successful" - defaultOn="true" displayType="summary" category="performance" measurementType="dynamic" @@ -261,7 +253,6 @@ <metric property="AverageExecutionTimeSent" displayName="Avg Execution Time Commands Sent Successfully" description="Average time it took to send commands that are ultimately successful" - defaultOn="true" displayType="summary" category="performance" measurementType="dynamic" @@ -270,7 +261,6 @@ <metric property="NumberTotalCommandsSent" displayName="Total Number of Commands Sent" description="Total number of messages this agent has sent to the RHQ Server" - defaultOn="true" displayType="summary" category="throughput" measurementType="trendsup" /> @@ -278,21 +268,18 @@ <metric property="NumberSuccessfulCommandsSent" displayName="Number of Commands Successfully Sent" description="Number of messages this agent has sent to the RHQ Server successfully" - defaultOn="true" category="throughput" measurementType="trendsup" />
<metric property="NumberFailedCommandsSent" displayName="Number of Commands Sent but Failed" description="Number of messages this agent has either tried, but failed, to send or were not processed succesfully by the RHQ Server" - defaultOn="true" category="throughput" measurementType="trendsup" />
<metric property="NumberCommandsActiveSent" displayName="Number Of Active Commands Being Sent" description="The number of messages this agent is currently sending" - defaultOn="true" displayType="summary" category="throughput" measurementType="dynamic" /> @@ -300,7 +287,6 @@ <metric property="NumberCommandsInQueue" displayName="Number of Commands In Queue" description="Number of messages currently queued waiting to be sent to the RHQ Server" - defaultOn="true" displayType="summary" category="throughput" measurementType="dynamic" /> @@ -308,14 +294,12 @@ <metric property="NumberCommandsSpooled" displayName="Number of Commands Spooled To Disk" description="Number of messages spooled to disk waiting to be sent to the RHQ Server" - defaultOn="true" category="throughput" measurementType="dynamic" />
<metric property="JVMFreeMemory" displayName="JVM Free Memory" description="The amount of free memory the agent JVM has in its heap" - defaultOn="true" units="bytes" category="performance" measurementType="dynamic" /> @@ -323,7 +307,6 @@ <metric property="JVMTotalMemory" displayName="JVM Total Memory" description="The amount of total memory the agent JVM has in its heap" - defaultOn="true" units="bytes" category="performance" measurementType="dynamic" /> @@ -331,7 +314,6 @@ <metric property="JVMActiveThreads" displayName="JVM Active Threads" description="The number of active threads currently running in the agent JVM" - defaultOn="true" category="performance" measurementType="dynamic" />
@@ -750,16 +732,13 @@ <metric property="NumberOfPluginClassLoaders" defaultOn="false" displayType="detail" - defaultInterval="3600000" description="The total number of plugin classloaders currently created and actively managed."/> <metric property="NumberOfDiscoveryClassLoaders" defaultOn="false" displayType="detail" - defaultInterval="3600000" description="The total number of discovery classloaders currently created and actively managed."/> <metric property="NumberOfResourceClassLoaders" displayType="summary" - defaultInterval="600000" description="The total number of individual resource classloaders currently created and assigned to resources."/>
</service> diff --git a/modules/plugins/rhq-server/src/main/resources/META-INF/rhq-plugin.xml b/modules/plugins/rhq-server/src/main/resources/META-INF/rhq-plugin.xml index 9f0f6a3..18cae0e 100644 --- a/modules/plugins/rhq-server/src/main/resources/META-INF/rhq-plugin.xml +++ b/modules/plugins/rhq-server/src/main/resources/META-INF/rhq-plugin.xml @@ -128,19 +128,19 @@ <metric property="FullAvailabilityReports" displayType="summary" measurementType="trendsup" description="The number of full availability reports received and processed by this RHQ Server since it was started"/>
- <metric property="PurgedAlerts" displayType="summary" measurementType="dynamic" category="utilization" defaultInterval="900000" + <metric property="PurgedAlerts" displayType="summary" measurementType="dynamic" category="utilization" description="Number of alerts purged by the last purge job"/> - <metric property="PurgedAlertConditions" displayType="summary" measurementType="dynamic" category="utilization" defaultInterval="900000" + <metric property="PurgedAlertConditions" displayType="summary" measurementType="dynamic" category="utilization" description="Number of alert conditions purged by the last purge job"/> - <metric property="PurgedAlertNotifications" displayType="summary" measurementType="dynamic" category="utilization" defaultInterval="900000" + <metric property="PurgedAlertNotifications" displayType="summary" measurementType="dynamic" category="utilization" description="Number of alert notifications purged by the last purge job"/> - <metric property="PurgedAvailabilities" displayType="summary" measurementType="dynamic" category="utilization" defaultInterval="900000" + <metric property="PurgedAvailabilities" displayType="summary" measurementType="dynamic" category="utilization" description="Number of availabilities purged by the last purge job"/> - <metric property="PurgedCallTimeData" displayType="summary" measurementType="dynamic" category="utilization" defaultInterval="900000" + <metric property="PurgedCallTimeData" displayType="summary" measurementType="dynamic" category="utilization" description="Number of call time data purged by the last purge job"/> - <metric property="PurgedEvents" displayType="summary" measurementType="dynamic" category="utilization" defaultInterval="900000" + <metric property="PurgedEvents" displayType="summary" measurementType="dynamic" category="utilization" description="Number of events purged by the last purge job"/> - <metric property="PurgedMeasurementTraits" displayType="summary" measurementType="dynamic" category="utilization" defaultInterval="900000" + <metric property="PurgedMeasurementTraits" displayType="summary" measurementType="dynamic" category="utilization" description="Number of traits purged by the last purge job"/>
</service> diff --git a/modules/plugins/script/src/main/resources/META-INF/rhq-plugin.xml b/modules/plugins/script/src/main/resources/META-INF/rhq-plugin.xml index 016985e..851e830 100644 --- a/modules/plugins/script/src/main/resources/META-INF/rhq-plugin.xml +++ b/modules/plugins/script/src/main/resources/META-INF/rhq-plugin.xml @@ -80,9 +80,7 @@ dataType="measurement" displayName="The Measurement Name" description="Describes what this measurement is actually telling you" - defaultOn="true" units="none" - defaultInterval="300000" displayType="summary" category="performance" /> --> diff --git a/modules/plugins/tomcat/src/main/resources/META-INF/rhq-plugin.xml b/modules/plugins/tomcat/src/main/resources/META-INF/rhq-plugin.xml index 09ad1af..15caad5 100644 --- a/modules/plugins/tomcat/src/main/resources/META-INF/rhq-plugin.xml +++ b/modules/plugins/tomcat/src/main/resources/META-INF/rhq-plugin.xml @@ -442,7 +442,6 @@ property="VHost.name" displayName="Virtual Hosts" dataType="trait" - defaultOn="true" description="Virtual hosts this app runs on" />
<metric @@ -705,14 +704,12 @@ displayName="Maximum Request Time" description="Maximum time it took to process a request." units="milliseconds" - defaultOn="true" category="performance" />
<metric property="Catalina:type=GlobalRequestProcessor,name=%handler%%address%-%port%:requestCount" displayName="Request count" description="Total number of requests processed since last restart." - defaultOn="true" category="utilization" measurementType="trendsup" />
@@ -720,7 +717,6 @@ property="Catalina:type=GlobalRequestProcessor,name=%handler%%address%-%port%:errorCount" displayName="Error count" description="Number of errors while processing since last restart." - defaultOn="true" category="utilization" measurementType="trendsup" />
@@ -728,7 +724,6 @@ property="Catalina:type=ThreadPool,name=%handler%%address%-%port%:currentThreadsBusy" displayName="Threadpool Threads Active" description="Number of current busy threads." - defaultOn="true" category="utilization" displayType="summary" />
@@ -736,7 +731,6 @@ property="Catalina:type=ThreadPool,name=%handler%%address%-%port%:currentThreadCount" displayName="Threadpool Threads Allocated" description="Number of current threads." - defaultOn="true" category="utilization" displayType="summary" />
@@ -744,7 +738,6 @@ property="Catalina:type=ThreadPool,name=%handler%%address%-%port%:maxThreads" displayName="Threadpool Max Threads" description="Maximum number of threads that can be allocated for the ThreadPool." - defaultOn="true" category="utilization" displayType="detail" />
diff --git a/modules/plugins/twitter/src/main/resources/META-INF/rhq-plugin.xml b/modules/plugins/twitter/src/main/resources/META-INF/rhq-plugin.xml index a066afc..4944199 100644 --- a/modules/plugins/twitter/src/main/resources/META-INF/rhq-plugin.xml +++ b/modules/plugins/twitter/src/main/resources/META-INF/rhq-plugin.xml @@ -45,11 +45,11 @@ </operation>
<metric property="tweetCount" displayName="Tweet count" category="utilization" dataType="measurement" - defaultOn="true" displayType="summary" measurementType="dynamic" + displayType="summary" measurementType="dynamic" description="Number of new tweets since last poll"/>
<metric property="followerCount" displayName="Follower count" dataType="measurement" - defaultOn="true" displayType="summary" measurementType="dynamic" defaultInterval="14400000" + displayType="summary" measurementType="dynamic" defaultInterval="14400000" description="Number of followers" />
@@ -77,7 +77,7 @@ </plugin-configuration>
<metric property="tweetCount" displayName="Tweet count" category="utilization" dataType="measurement" - defaultOn="true" displayType="summary" measurementType="dynamic" + displayType="summary" measurementType="dynamic" description="Number of new tweets since last poll"/>
<event name="FeedEvent"/>
commit e5c7414502b4440378858da2c7e188d8b5a71e52 Author: John Mazzitelli mazz@redhat.com Date: Tue Sep 27 16:06:28 2011 -0400
[BZ 741331] just some very limited number of metrics to be enabled out of box - mainly in platform plugin
diff --git a/modules/plugins/jboss-as-5/src/main/resources/META-INF/rhq-plugin.xml b/modules/plugins/jboss-as-5/src/main/resources/META-INF/rhq-plugin.xml index e337217..e8cd691 100644 --- a/modules/plugins/jboss-as-5/src/main/resources/META-INF/rhq-plugin.xml +++ b/modules/plugins/jboss-as-5/src/main/resources/META-INF/rhq-plugin.xml @@ -1147,6 +1147,7 @@ defaultInterval="300000" defaultOn="true" category="throughput"/>
<metric displayName="JVM Free Memory" property="MCBean|ServerInfo|*|freeMemory" displayType="summary" + defaultOn="true" description="An approximation of the total amount of memory currently available in the app server JVM for future allocated objects, measured in bytes" defaultInterval="300000" defaultOn="true" category="utilization" units="bytes"/>
diff --git a/modules/plugins/jboss-as/src/main/resources/META-INF/rhq-plugin.xml b/modules/plugins/jboss-as/src/main/resources/META-INF/rhq-plugin.xml index d02a8c0..6588d0d 100644 --- a/modules/plugins/jboss-as/src/main/resources/META-INF/rhq-plugin.xml +++ b/modules/plugins/jboss-as/src/main/resources/META-INF/rhq-plugin.xml @@ -210,6 +210,7 @@ defaultInterval="300000" defaultOn="true" category="throughput"/>
<metric property="jboss.system:type=ServerInfo:FreeMemory" displayName="JVM Free Memory" displayType="summary" + defaultOn="true" description="An approximation of the total amount of memory currently available in the app server JVM for future allocated objects, measured in bytes" defaultInterval="300000" defaultOn="true" category="utilization" units="bytes"/>
diff --git a/modules/plugins/platform/src/main/resources/META-INF/rhq-plugin.xml b/modules/plugins/platform/src/main/resources/META-INF/rhq-plugin.xml index fa07736..64575d9 100644 --- a/modules/plugins/platform/src/main/resources/META-INF/rhq-plugin.xml +++ b/modules/plugins/platform/src/main/resources/META-INF/rhq-plugin.xml @@ -52,24 +52,28 @@ <metric displayName="Hostname" property="Trait.hostname" description="Name that this platform is known as" + defaultOn="true" dataType="trait" displayType="summary" defaultOn="true" /> <metric displayName="OS Name" property="Trait.osname" description="Name that the operating system is known as" + defaultOn="true" dataType="trait" displayType="summary" defaultOn="true" /> <metric displayName="OS Version" property="Trait.osversion" description="Version of the operating system" + defaultOn="true" dataType="trait" displayType="summary" defaultOn="true" /> <metric displayName="Architecture" property="Trait.sysarch" description="Hardware architecture of the platform" + defaultOn="true" dataType="trait" displayType="summary" defaultOn="true"/> @@ -79,6 +83,7 @@ property="Native.MemoryInfo.free" defaultOn="true" displayType="summary" + defaultOn="true" units="bytes" description="The total free system memory"/>
@@ -86,6 +91,7 @@ property="Native.MemoryInfo.used" defaultOn="true" displayType="summary" + defaultOn="true" units="bytes" description="The total used system memory"/>
@@ -124,11 +130,13 @@ description="Idle percentage of all CPUs"/> <metric displayName="System Load" property="CpuPerc.sys" + defaultOn="true" displayType="summary" units="percentage" description="Percentage of all CPUs running in system mode"/> <metric displayName="User Load" property="CpuPerc.user" + defaultOn="true" displayType="summary" units="percentage" description="Percentage of all CPUs running in user mode"/> @@ -141,24 +149,28 @@ <!ENTITY cpuDetail ' <metric displayName="Vendor" property="CpuTrait.vendor" + defaultOn="true" dataType="trait" defaultOn="true" defaultInterval="3600000" description="Vendor of this CPU"/> <metric displayName="CPU Model" property="CpuTrait.model" + defaultOn="true" dataType="trait" defaultOn="true" defaultInterval="3600000" description="Model of this CPU"/> <metric displayName="CPU Speed" property="CpuTrait.mhz" + defaultOn="true" dataType="trait" defaultOn="true" defaultInterval="3600000" description="Speed of this CPU in Mhz"/> <metric displayName="Cache size" property="CpuTrait.cacheSize" + defaultOn="true" dataType="trait" defaultOn="true" defaultInterval="3600000" @@ -334,12 +346,14 @@ <metric displayName="Distribution Name" property="distro.name" description="name of the Linux distribution" + defaultOn="true" dataType="trait" displayType="summary" defaultOn="true" /> <metric displayName="Distribution Version" property="distro.version" description="version of the Linux distribution" + defaultOn="true" dataType="trait" displayType="summary" defaultOn="true" /> @@ -469,11 +483,12 @@ </runs-inside>
<metric displayName="Inet4Address" + defaultOn="true" property="Trait.net4.address" dataType="trait" displayType="summary" - description="IP address of the network adaptor"/> + description="IP address of the network adapter"/>
- <metric property="Trait.interfaceFlags" displayName="Interface Flags" dataType="trait" displayType="summary" - description="Flag constants for network related ops"/> + <metric property="Trait.interfaceFlags" displayName="Interface Flags" dataType="trait" + description="Flag constants for network related operations"/>
<metric property="rxBytes" displayName="Bytes Received" units="bytes" measurementType="trendsup" displayType="summary" description="The total number of bytes received across this network interface since it started"/>
commit 9da7796c9d21db1f53c542913480fe73033761e6 Author: John Mazzitelli mazz@redhat.com Date: Tue Nov 1 12:19:35 2011 -0400
[BZ 741331] no metrics on by default in hardware plugin
diff --git a/modules/plugins/hardware/src/main/resources/META-INF/rhq-plugin.xml b/modules/plugins/hardware/src/main/resources/META-INF/rhq-plugin.xml index 3ef6c2e..225adcf 100644 --- a/modules/plugins/hardware/src/main/resources/META-INF/rhq-plugin.xml +++ b/modules/plugins/hardware/src/main/resources/META-INF/rhq-plugin.xml @@ -41,12 +41,12 @@ <metric property="Raw_Read_Error_Rate" displayType="summary"/> <metric property="Reallocated_Sector_Ct" displayType="summary"/> <metric property="Power_On_Hours" units="hours" displayType="summary"/> - <metric property="Start_Stop_Count" defaultOn="true"/> - <metric property="Power_Cycle_Count" defaultOn="true"/> - <metric property="High_Fly_Writes" defaultOn="true"/> - <metric property="Load_Cycle_Count" defaultOn="true"/> - <metric property="Hardware_ECC_Recovered" defaultOn="true"/> - <metric property="Power-Off_Retract_Count" defaultOn="true"/> + <metric property="Start_Stop_Count" /> + <metric property="Power_Cycle_Count" /> + <metric property="High_Fly_Writes" /> + <metric property="Load_Cycle_Count" /> + <metric property="Hardware_ECC_Recovered" /> + <metric property="Power-Off_Retract_Count" />
</server>