modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/common/detail/summary/AbstractActivityView.java
| 2
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/monitoring/table/MeasurementTableView.java
| 2
modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/alert/engine/internal/AgentConditionCache.java
| 8
modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/alert/engine/mbean/AlertConditionCacheMonitor.java
| 37 ++++
modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/alert/engine/mbean/AlertConditionCacheMonitorMBean.java
| 12 +
modules/plugins/apache/src/main/resources/META-INF/rhq-plugin.xml
| 2
modules/plugins/hibernate/src/main/resources/META-INF/rhq-plugin.xml
| 10 -
modules/plugins/iis/src/main/resources/META-INF/rhq-plugin.xml
| 1
modules/plugins/jboss-as-5/src/main/resources/META-INF/rhq-plugin.xml
| 10 -
modules/plugins/jboss-as/src/main/resources/META-INF/rhq-plugin.xml
| 23 --
modules/plugins/jboss-cache-v3/src/main/resources/META-INF/rhq-plugin.xml
| 8
modules/plugins/jmx/src/main/resources/META-INF/rhq-plugin.xml
| 14 -
modules/plugins/mysql/src/main/resources/META-INF/rhq-plugin.xml
| 6
modules/plugins/netservices/src/main/resources/META-INF/rhq-plugin.xml
| 6
modules/plugins/platform/src/main/resources/META-INF/rhq-plugin.xml
| 14 -
modules/plugins/postgres/src/main/resources/META-INF/rhq-plugin.xml
| 6
modules/plugins/rhq-agent/src/main/resources/META-INF/rhq-plugin.xml
| 46 +----
modules/plugins/rhq-server/src/main/resources/META-INF/rhq-plugin.xml
| 90 +++++-----
modules/plugins/tomcat/src/main/resources/META-INF/rhq-plugin.xml
| 1
modules/plugins/virt/src/main/resources/META-INF/rhq-plugin.xml
| 12 -
20 files changed, 161 insertions(+), 149 deletions(-)
New commits:
commit bcbe473033dd782d7450e5e5c732e9f0c0f1bac8
Author: John Mazzitelli <mazz(a)redhat.com>
Date: Thu Nov 3 14:57:40 2011 -0400
[BZ 751177] make sure the buttons in the footer are re-enabled.
this also ensures the chart window is destroyed, not just hidden
diff --git
a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/common/detail/summary/AbstractActivityView.java
b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/common/detail/summary/AbstractActivityView.java
index b51419d..2b9e3e6 100644
---
a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/common/detail/summary/AbstractActivityView.java
+++
b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/common/detail/summary/AbstractActivityView.java
@@ -648,7 +648,7 @@ public abstract class AbstractActivityView extends LocatableVLayout
implements R
@Override
public void onCloseClick(CloseClientEvent event) {
try {
- hide();
+ ChartViewWindow.this.destroy();
} catch (Throwable e) {
Log.warn("Cannot destroy chart display window.", e);
}
diff --git
a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/monitoring/table/MeasurementTableView.java
b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/monitoring/table/MeasurementTableView.java
index 66667e9..f15b348 100644
---
a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/monitoring/table/MeasurementTableView.java
+++
b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/monitoring/table/MeasurementTableView.java
@@ -170,6 +170,7 @@ public class MeasurementTableView extends
Table<MeasurementTableDataSource> {
FullHTMLPane iframe = new FullHTMLPane(extendLocatorId("View"),
destination);
window.addItem(iframe);
window.show();
+ refreshTableInfo();
}
});
}
@@ -193,6 +194,7 @@ public class MeasurementTableView extends
Table<MeasurementTableDataSource> {
@Override
public void onCloseClick(CloseClientEvent event) {
liveDataWindow.destroy();
+ refreshTableInfo();
}
});
commit 6e953998dd354da8ae726bf7f9bcd8772d5c7842
Author: John Mazzitelli <mazz(a)redhat.com>
Date: Thu Nov 3 13:49:32 2011 -0400
[BZ 741331] go through plugins and switch some services' metrics away from being
"summary" to detail (this is the displayType attribute)
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 e88ffbc..68f0802 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
@@ -553,7 +553,6 @@
<metric displayName="Total Number of Bytes Received"
property="wwwSummaryInLowBytes"
description="The number of bytes received by the service"
- displayType="summary"
units="bytes" measurementType="trendsup"/>
<!-- summary metrics for responses - determined via SNMP
@@ -566,7 +565,6 @@
<metric displayName="Total Number of Bytes Sent"
property="wwwSummaryOutLowBytes"
description="The number of bytes sent by the service"
- displayType="summary"
units="bytes" measurementType="trendsup"/>
<!-- per-request-method metrics - determined via SNMP
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 dfadc25..9dff05e 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
@@ -47,11 +47,11 @@
<metric displayName="Entity Insert Count"
property="EntityInsertCount"
description="The global number of entity inserts since the statistics
were reset"
- category="throughput" displayType="summary"
measurementType="trendsup"/>
+ category="throughput" measurementType="trendsup"/>
<metric displayName="Query Execution Max Time"
property="QueryExecutionMaxTime"
description="The amount of time taken by the slowest recorded query
since the statistics were reset"
- category="performance" displayType="summary"
units="milliseconds" />
+ category="performance" units="milliseconds" />
<metric displayName="Entity Update Count"
property="EntityUpdateCount"
description="The global number of entity updates since the statistics
were reset"
@@ -210,11 +210,11 @@
<metric displayName="Load Count" property="loadCount"
displayType="summary"
description="The number of times this entity was loaded since the
statistics were reset" />
- <metric displayName="Update Count" property="updateCount"
displayType="summary"
+ <metric displayName="Update Count"
property="updateCount"
description="The number of times this entity was updated since the
statistics were reset" />
- <metric displayName="Insert Count" property="insertCount"
displayType="summary"
+ <metric displayName="Insert Count"
property="insertCount"
description="The number of times this entity was inserted since the
statistics were reset" />
- <metric displayName="Delete Count" property="deleteCount"
displayType="summary"
+ <metric displayName="Delete Count"
property="deleteCount"
description="The number of times this entity was deleted since the
statistics were reset" />
<metric displayName="Fetch Count" property="fetchCount"
description="The number of times this entity was fetched 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 287f835..5b66a1b 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
@@ -66,7 +66,6 @@
<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"
- displayType="summary"
measurementType="trendsup"
units="none"/>
<metric displayName="Total POST Requests"
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 d6efd88..dfbd728 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
@@ -812,13 +812,13 @@
<metric property="CurrentPoolSize" displayName="Current Pool
Size" displayType="summary" measurementType="dynamic"
description="The number of beans in the pool."/>
- <metric property="MaxPoolSize" displayName="Max Pool Size"
displayType="summary" measurementType="dynamic"
+ <metric property="MaxPoolSize" displayName="Max Pool Size"
measurementType="dynamic"
description="The maximum pool size."/>
'>
<!ENTITY ejb2CreateRemoveMetrics '
<metric property="CreateCount" displayName="Create Count"
displayType="summary" measurementType="trendsup"
- description="The number of instances of this EJB2 Session Bean that have
been created. since server start."/>
+ description="The number of instances of this EJB2 Session Bean that have
been created since server start."/>
<metric property="RemoveCount" displayName="Remove Count"
displayType="summary" measurementType="trendsup"
description="The number of instances of this EJB2 Session Bean that have
been removed since server start."/>
@@ -872,8 +872,7 @@
<!ENTITY ejb2StatefulSessionBeanMetrics '
<metric displayName="Passive Beans"
description="The count of beans in the passivated state"
- property="PassivatedCount"
- displayType="summary"/>
+ property="PassivatedCount" />
'>
<!ENTITY ejb2MessageDrivenBeanDefinition '
@@ -901,8 +900,7 @@
<!ENTITY ejb2EntityBeanMetrics '
<metric property="CacheSize"
- displayName="Cache Size"
- displayType="summary"/>
+ displayName="Cache Size"/>
'>
<!ENTITY subscriptionsResultProperty '
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 f697574..db4b8e5 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
@@ -464,7 +464,7 @@
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" displayType="summary"
+ category="utilization"
description="Number of available connections in the connection pool
in-active and waiting."/>
<metric displayName="Active Connections"
property="InUseConnectionCount"
category="utilization" displayType="summary"
@@ -474,7 +474,7 @@
measurementType="trendsup"
description="Number of Connections created since the Connection
Pool was created."/>
<metric displayName="Connections Destroyed"
property="ConnectionDestroyedCount"
- category="utilization" displayType="summary"
+ category="utilization"
measurementType="trendsup"
description="Number of Connections destroyed since the Connection
Pool was created."/>
@@ -1390,12 +1390,10 @@
<metric displayName="Durable Message Count"
property="DurableMessageCount"
category="utilization"
- displayType="summary"
description="Total number of messages for all durable
subscriptions."/>
<metric displayName="Non-durable Message Count"
property="NonDurableMessageCount"
category="utilization"
- displayType="summary"
description="Total number of messages for all non-durable
subscriptions."/>
<metric displayName="All Subscription Count"
property="AllSubscriptionsCount"
@@ -1405,12 +1403,10 @@
<metric displayName="Durable Subscription Count"
property="DurableSubscriptionsCount"
category="utilization"
- displayType="summary"
description="Number of durable subscriptions waiting for a
message."/>
<metric displayName="Non-durable Subscription Count"
property="NonDurableSubscriptionsCount"
category="utilization"
- displayType="summary"
description="Number of non-durable subscriptions waiting for a
message."/>
<resource-configuration>
@@ -2115,13 +2111,11 @@
<metric displayName="Method-Ready Beans"
description="The number of pooled instances of this EJB 1.x or
2.x Stateful Session Bean in the method-ready state"
- property="{stats.methodReadyCount.current}"
- displayType="summary"/>
+ property="{stats.methodReadyCount.current}"/>
<metric displayName="Passive Beans"
description="The number of pooled instances of this EJB 1.x or
2.x Stateful Session Bean in the passivated state"
- property="{stats.passiveCount.current}"
- displayType="summary"/>
+ property="{stats.passiveCount.current}"/>
<metric property="MethodInvocationTime"
dataType="calltime" units="milliseconds"
defaultOn="false" destinationType="Method Name"
@@ -2160,8 +2154,7 @@
<metric displayName="Method-Ready Beans"
description="The number of pooled instances of this EJB 1.x or 2.x
Entity Bean in the method-ready state"
- property="{stats.methodReadyCount.current}"
- displayType="summary"/>
+ property="{stats.methodReadyCount.current}"/>
<metric displayName="Pooled Beans"
description="The total number of currently pooled instances of this
EJB 1.x or 2.x Entity Bean"
@@ -2565,11 +2558,11 @@
description="Returns the hit/miss ratio for the cache. This
ratio is defined as hits/(hits + misses)."/>
<metric property="ReadWriteRatio"
displayType="summary" units="percentage"
description="Returns the read/write ratio for the cache. This
ratio is defined as (hits + misses)/stores."/>
- <metric property="Hits" displayType="summary"
+ <metric property="Hits"
description="Returns the number of requests made to this cache
which it could answer without interrogating the underlying data store"/>
- <metric property="Misses" displayType="summary"
+ <metric property="Misses"
description="Returns the number of requests made to this cache
which required interrogating the underlying data store"/>
- <metric property="Evictions" displayType="summary"
+ <metric property="Evictions"
description="Returns the number of elements purged from this
cache in accordance with its specific eviction policy"/>
<metric property="NumberOfLocksHeld"
description="The number of elements locked by this interceptor
for update / replication across the (clustered) tree cache"/>
diff --git a/modules/plugins/jboss-cache-v3/src/main/resources/META-INF/rhq-plugin.xml
b/modules/plugins/jboss-cache-v3/src/main/resources/META-INF/rhq-plugin.xml
index 80ada64..cba79cf 100644
--- a/modules/plugins/jboss-cache-v3/src/main/resources/META-INF/rhq-plugin.xml
+++ b/modules/plugins/jboss-cache-v3/src/main/resources/META-INF/rhq-plugin.xml
@@ -117,12 +117,12 @@
<metric property="Evictions" displayName="Evictions"
measurementType="trendsup"
description="the number of cache eviction operations"
category="performance"/>
<metric property="HitMissRatio" displayType="summary"
displayName="Hit/Miss Ratio"/>
- <metric property="ReadWriteRatio"
displayType="summary" displayName="Read/Write Ratio"/>
+ <metric property="ReadWriteRatio" displayName="Read/Write
Ratio"/>
<metric property="NumberOfNodes"
displayName="NumberOfNodes"
description="the number of nodes in the cache"
category="performance"/>
- <metric property="Hits" displayType="summary"
displayName="Hits" measurementType="trendsup"
+ <metric property="Hits" displayName="Hits"
measurementType="trendsup"
description="the number of cache attribute hits"
category="performance"/>
- <metric property="NumberOfAttributes"
displayType="summary"
+ <metric property="NumberOfAttributes"
description="the number of cache attributes"
category="performance"/>
<metric property="StatisticsEnabled"
dataType="trait"/>
<metric property="ElapsedTime"
@@ -263,7 +263,7 @@
description="the number of transaction rollbacks"
category="performance"/>
<metric property="Prepares" displayType="summary"
description="the number of transaction prepares"
category="performance"/>
- <metric property="numberOfSyncsRegistered"
displayType="summary"
+ <metric property="numberOfSyncsRegistered"
description="the number of transaction synchronizations
currently registered"
category="performance"/>
</service>
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 b2c71b9..41e031b 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
@@ -207,31 +207,23 @@
<metric displayName="Thread Count"
displayType="summary"
- category="performance"
property="ThreadCount"
description="Number of active threads in the system"/>
<metric displayName="Peak Thread Count"
- category="performance"
property="PeakThreadCount"
description="Peak count of active threads in the system"/>
<metric displayName="Total Started Thread Count"
- category="performance"
property="TotalStartedThreadCount"
description="Count of threads started since system
start"/>
<metric displayName="Daemon Thread Count"
- category="performance"
property="DaemonThreadCount"
description="Count of threads marked as daemons in the
system"/>
<metric property="SuspendedThreadCount"
displayName="Suspended Thread Count"
- description="Count of suspended threads"
- defaultOn="false"
- category="performance" />
+ description="Count of suspended threads" />
<metric property="DeadLockedThreadCount"
displayName="Deadlocked Thread Count"
- description="Count of threads that are deadlocked waiting to
acquire object monitors. This is a CPU-time consuming metric."
- defaultOn="false"
- category="performance" />
+ description="Count of threads that are deadlocked waiting to
acquire object monitors. This is a CPU-time consuming metric." />
<resource-configuration>
<c:simple-property name="ThreadContentionMonitoringEnabled"
type="boolean"/>
<c:simple-property name="ThreadCpuTimeEnabled"
type="boolean"/>
@@ -252,7 +244,6 @@
<metric displayName="Heap Usage"
property="{HeapMemoryUsage.used}"
- displayType="summary"
description="Current heap memory usage"
units="bytes"/>
<metric displayName="Heap Committed"
@@ -262,7 +253,6 @@
units="bytes"/>
<metric displayName="Non-Heap Usage"
property="{NonHeapMemoryUsage.used}"
- displayType="summary"
description="Current memory usage outside the heap"
units="bytes"/>
<metric displayName="Non-Heap Committed"
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 9c3e148..439370e 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
@@ -371,10 +371,10 @@
<!-- Dynamic Metrics -->
<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="Avg_row_length"
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="Max_data_length"
measurementType="dynamic" units="bytes" description="Max Table
Data Size(bytes)" />
+ <metric property="Index_length"
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>
diff --git a/modules/plugins/netservices/src/main/resources/META-INF/rhq-plugin.xml
b/modules/plugins/netservices/src/main/resources/META-INF/rhq-plugin.xml
index a3b869c..b2d11b9 100644
--- a/modules/plugins/netservices/src/main/resources/META-INF/rhq-plugin.xml
+++ b/modules/plugins/netservices/src/main/resources/META-INF/rhq-plugin.xml
@@ -37,12 +37,12 @@
</plugin-configuration>
<metric property="connectTime" units="milliseconds"
displayType="summary"
- description="The to connect to the service"/>
+ description="The time to connect to the service"/>
<metric property="readTime" units="milliseconds"
displayType="summary"
description="The time to transfer the requested content"/>
- <metric property="contentLength" units="bytes"
displayType="summary"
+ <metric property="contentLength" units="bytes"
description="The size of the returned content"/>
- <metric property="contentAge" units="milliseconds"
displayType="summary"
+ <metric property="contentAge" units="milliseconds"
description="The declared age of the requested page"/>
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 fc9e119..40ee623 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
@@ -472,12 +472,12 @@
<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"/>
- <metric property="rxPackets" displayName="Packets Received"
measurementType="trendsup" displayType="summary"
+ <metric property="rxPackets" displayName="Packets Received"
measurementType="trendsup"
description="The total number of packets received across this network
interface since it started"/>
<metric property="txBytes" displayName="Bytes Transmitted"
units="bytes" measurementType="trendsup"
displayType="summary"
description="The total number of bytes transmitted across this network
interface since it started"/>
- <metric property="txPackets" displayName="Packets
Transmitted" measurementType="trendsup" displayType="summary"
+ <metric property="txPackets" displayName="Packets
Transmitted" measurementType="trendsup"
description="The total number of packets transmitted across this
network interface since it started"/>
<metric property="rxErrors" displayName="Receive Errors"
measurementType="trendsup"
@@ -532,9 +532,9 @@
description="The filesystem's flags"/>
<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"
+ <metric property="fileSystemUsage.diskReads" displayName="Disk
Reads" measurementType="trendsup"
description="The number of physical disk reads"/>
- <metric property="fileSystemUsage.diskWrites" displayName="Disk
Writes" measurementType="trendsup" displayType="summary"
+ <metric property="fileSystemUsage.diskWrites" displayName="Disk
Writes" measurementType="trendsup"
description="The number of physical disk writes"/>
<metric property="fileSystemUsage.diskReadBytes"
displayName="Disk Read Bytes" measurementType="trendsup"
units="bytes"
description="The number of physical disk bytes read"/>
@@ -615,9 +615,9 @@
<c:simple-property name="fullProcessTree"
default="true" type="boolean" description="If true, the entire
process tree will be monitored"/>
</plugin-configuration>
- <metric displayName="User Time" property="Process.cpu.user"
measurementType="trendsup" units="milliseconds"
displayType="summary"
+ <metric displayName="User Time" property="Process.cpu.user"
measurementType="trendsup" units="milliseconds"
description="The aggregate amount of CPU user time spent by all
processes"/>
- <metric displayName="Kernel Time"
property="Process.cpu.sys" measurementType="trendsup"
units="milliseconds" displayType="summary"
+ <metric displayName="Kernel Time"
property="Process.cpu.sys" measurementType="trendsup"
units="milliseconds"
description="The aggregate amount of CPU kernel time spent by all
processes"/>
<metric displayName="CPU Percentage"
property="Process.cpu.percent" measurementType="dynamic"
units="percentage" displayType="summary"
description="The percentage of CPU currently being used by all
processes"/>
@@ -625,7 +625,7 @@
description="The aggregate amount of resident memory used by all
processes"/>
<metric displayName="Virtual Memory"
property="Process.memory.size" measurementType="dynamic"
units="bytes" displayType="summary"
description="The aggregate amount of virtual memory used by all
processes"/>
- <metric displayName="Open File Descriptors"
property="Process.fileDescriptor.total" measurementType="dynamic"
displayType="summary"
+ <metric displayName="Open File Descriptors"
property="Process.fileDescriptor.total" measurementType="dynamic"
description="The aggregate number of file descriptors open by all
processes"/>
</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 6d55124..9618c86 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
@@ -329,7 +329,7 @@
</operation>
- <metric displayName="Backends" property="numbackends"
displayType="summary"
+ <metric displayName="Backends" property="numbackends"
description="Number of active server processes for
database"/>
<metric displayName="Transactions Committed"
property="xact_commit" measurementType="trendsup"
displayType="summary"
description="Transactions committed in database"/>
@@ -362,11 +362,11 @@
<metric displayName="Index Scan Rows Read"
property="idx_tup_fetch" measurementType="trendsup"
description="Number of index entries returned by index
scans"/>
- <metric displayName="Heap Blocks Read"
property="heap_blks_read" measurementType="trendsup"
displayType="summary"
+ <metric displayName="Heap Blocks Read"
property="heap_blks_read" measurementType="trendsup"
description="The number of heap blocks read that were not a
buffer cache hit"/>
<metric displayName="Heap Blocks Hit"
property="heap_blks_hit" measurementType="trendsup"
description="The number of heap block requests that were found
in the buffer cache"/>
- <metric displayName="Index Blocks Read"
property="idx_blks_read" measurementType="trendsup"
displayType="summary"
+ <metric displayName="Index Blocks Read"
property="idx_blks_read" measurementType="trendsup"
description="The number of index blocks fetched that were not a
buffer cache hit"/>
<metric displayName="Index Blocks Hit"
property="idx_blks_hit" measurementType="trendsup"
description="The number of index block requests that were found
in the buffer cache"/>
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 ee83f0c..9a0a100 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
@@ -195,24 +195,18 @@
<metric property="Trait.AgentHomeDirectory"
displayName="Agent Home Directory"
dataType="trait"
- displayType="detail"
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"
- displayType="detail"
- units="none"
- category="availability"
- measurementType="dynamic" />
+ category="availability" />
<metric property="AgentServerClockDifference"
displayName="Agent-Server Clock Difference"
description="Number of milliseconds the agent's clock differs from
its server's clock"
displayType="summary"
- units="milliseconds"
- category="performance"
- measurementType="dynamic" />
+ units="milliseconds" />
<metric property="Uptime"
displayName="Up Time"
@@ -245,16 +239,12 @@
displayName="Avg Execution Time Commands Received Successfully"
description="Average time it took to process incoming commands that
are ultimately successful"
displayType="summary"
- category="performance"
- measurementType="dynamic"
units="milliseconds" />
<metric property="AverageExecutionTimeSent"
displayName="Avg Execution Time Commands Sent Successfully"
description="Average time it took to send commands that are ultimately
successful"
displayType="summary"
- category="performance"
- measurementType="dynamic"
units="milliseconds" />
<metric property="NumberTotalCommandsSent"
@@ -279,42 +269,31 @@
<metric property="NumberCommandsActiveSent"
displayName="Number Of Active Commands Being Sent"
description="The number of messages this agent is currently
sending"
- displayType="summary"
- category="throughput"
- measurementType="dynamic" />
+ category="throughput" />
<metric property="NumberCommandsInQueue"
displayName="Number of Commands In Queue"
description="Number of messages currently queued waiting to be sent to
the RHQ Server"
- displayType="summary"
- category="throughput"
- measurementType="dynamic" />
+ category="throughput" />
<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"
- category="throughput"
- measurementType="dynamic" />
+ category="throughput" />
<metric property="JVMFreeMemory"
displayName="JVM Free Memory"
description="The amount of free memory the agent JVM has in its
heap"
- units="bytes"
- category="performance"
- measurementType="dynamic" />
+ units="bytes" />
<metric property="JVMTotalMemory"
displayName="JVM Total Memory"
description="The amount of total memory the agent JVM has in its
heap"
- units="bytes"
- category="performance"
- measurementType="dynamic" />
+ units="bytes" />
<metric property="JVMActiveThreads"
displayName="JVM Active Threads"
- description="The number of active threads currently running in the
agent JVM"
- category="performance"
- measurementType="dynamic" />
+ description="The number of active threads currently running in the
agent JVM" />
<event name="logEntry" description="a log message"/>
@@ -632,13 +611,13 @@
<c:simple-property name="descriptionTemplate"
default="information about this agent's measurement subsystem"
readOnly="true"/>
</plugin-configuration>
- <metric property="CurrentlyScheduleMeasurements"
displayType="summary"
+ <metric property="CurrentlyScheduleMeasurements"
description="The total number of active measurement schedules
currently being collected by this RHQ Agent"/>
<metric property="MeasurementsCollected"
measurementType="trendsup" displayType="summary"
description="The total number of measurements collected since this
RHQ Agent was started"/>
<metric property="TotalTimeCollectingMeasurements"
displayType="summary" units="milliseconds"
measurementType="trendsup"
description="The amount of time this RHQ Agent has spent collecting
measurements since it was started"/>
- <metric property="FailedCollections"
displayType="summary" measurementType="trendsup"
+ <metric property="FailedCollections"
measurementType="trendsup"
description="The number of individual measurement collections that
have failed since this RHQ Agent was started"/>
<metric property="LateCollections" displayType="summary"
measurementType="trendsup"
description="The number of individual measurement collections that
have fallen behind from their desired schedule"/>
@@ -729,15 +708,10 @@
</operation>
<metric property="NumberOfPluginClassLoaders"
- defaultOn="false"
- displayType="detail"
description="The total number of plugin classloaders currently
created and actively managed."/>
<metric property="NumberOfDiscoveryClassLoaders"
- defaultOn="false"
- displayType="detail"
description="The total number of discovery classloaders currently
created and actively managed."/>
<metric property="NumberOfResourceClassLoaders"
- displayType="summary"
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 f051ffd..651d290 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
@@ -40,53 +40,53 @@
<metric property="TotalCacheElementCount"
category="throughput" displayType="summary"
description="The total number of elements in all alert caches that
check all types of conditions"/>
- <metric property="AvailabilityCacheElementCount"
category="throughput" displayType="summary"
+ <metric property="AvailabilityCacheElementCount"
category="throughput"
description="The number of elements in the alerts cache that check
conditions against availability data"/>
- <metric property="MeasurementCacheElementCount"
category="throughput" displayType="summary"
+ <metric property="MeasurementCacheElementCount"
category="throughput"
description="The number of elements in the alerts cache that check
conditions against measurement numeric or trait data"/>
- <metric property="EventCacheElementCount"
category="throughput" displayType="summary"
+ <metric property="EventCacheElementCount"
category="throughput"
description="The number of elements in the alerts cache that check
conditions against event history data"/>
- <metric property="OperationCacheElementCount"
category="throughput" displayType="summary"
+ <metric property="OperationCacheElementCount"
category="throughput"
description="The number of elements in the alerts cache that check
conditions against operation history data"/>
- <metric property="CallTimeCacheElementCount"
category="throughput" displayType="summary"
+ <metric property="CallTimeCacheElementCount"
category="throughput"
description="The number of elements in the alerts cache that check
conditions against calltime measurement data"/>
- <metric property="ResourceConfigurationCacheElementCount"
category="throughput" displayType="summary"
+ <metric property="ResourceConfigurationCacheElementCount"
category="throughput"
description="The number of elements in the alerts cache that check
conditions against resource configuration data"/>
- <metric property="DriftCacheElementCount"
category="throughput" displayType="summary"
+ <metric property="DriftCacheElementCount"
category="throughput"
description="The number of elements in the alerts cache that check
conditions against drift data"/>
<metric property="TotalCacheElementMatches"
category="throughput" displayType="summary"
measurementType="trendsup"
description="The total number of times ANY cache element has triggered
against incoming data since this RHQ Server instance was started"/>
- <metric property="AvailabilityCacheElementMatches"
category="throughput" displayType="summary"
measurementType="trendsup"
+ <metric property="AvailabilityCacheElementMatches"
category="throughput" measurementType="trendsup"
description="The total number of times availability-based conditions
have triggered against incoming data since this RHQ Server instance was
started"/>
- <metric property="MeasurementCacheElementMatches"
category="throughput" displayType="summary"
measurementType="trendsup"
+ <metric property="MeasurementCacheElementMatches"
category="throughput" measurementType="trendsup"
description="The total number of times measurement-based conditions
have triggered against incoming data since this RHQ Server instance was
started"/>
- <metric property="EventCacheElementMatches"
category="throughput" displayType="summary"
measurementType="trendsup"
+ <metric property="EventCacheElementMatches"
category="throughput" measurementType="trendsup"
description="The total number of times events-based conditions have
triggered against incoming data since this RHQ Server instance was started"/>
- <metric property="ResourceConfigurationCacheElementMatches"
category="throughput" displayType="summary"
measurementType="trendsup"
+ <metric property="ResourceConfigurationCacheElementMatches"
category="throughput" measurementType="trendsup"
description="The total number of times resource configuration-based
conditions have triggered against incoming data since this RHQ Server instance was
started"/>
- <metric property="OperationCacheElementMatches"
category="throughput" displayType="summary"
measurementType="trendsup"
+ <metric property="OperationCacheElementMatches"
category="throughput" measurementType="trendsup"
description="The total number of times operation-based conditions have
triggered against incoming data since this RHQ Server instance was started"/>
- <metric property="CallTimeCacheElementMatches"
category="throughput" displayType="summary"
measurementType="trendsup"
+ <metric property="CallTimeCacheElementMatches"
category="throughput" measurementType="trendsup"
description="The total number of times calltime-based conditions have
triggered against incoming data since this RHQ Server instance was started"/>
- <metric property="DriftCacheElementMatches"
category="throughput" displayType="summary"
measurementType="trendsup"
+ <metric property="DriftCacheElementMatches"
category="throughput" measurementType="trendsup"
description="The total number of times drift conditions have triggered
against incoming data since this RHQ Server instance was started"/>
<metric property="TotalProcessingTime" units="milliseconds"
displayType="summary" measurementType="trendsup"
description="The total amount of time spent by the alerts cache
processing ALL types of data"/>
- <metric property="AvailabilityProcessingTime"
units="milliseconds" displayType="summary"
measurementType="trendsup"
+ <metric property="AvailabilityProcessingTime"
units="milliseconds" measurementType="trendsup"
description="The total amount of time spent by the alerts cache
processing availability data"/>
- <metric property="MeasurementProcessingTime"
units="milliseconds" displayType="summary"
measurementType="trendsup"
+ <metric property="MeasurementProcessingTime"
units="milliseconds" measurementType="trendsup"
description="The total amount of time spent by the alerts cache
processing measurement numeric or trait data"/>
- <metric property="EventProcessingTime" units="milliseconds"
displayType="summary" measurementType="trendsup"
+ <metric property="EventProcessingTime" units="milliseconds"
measurementType="trendsup"
description="The total amount of time spent by the alerts cache
processing event history data"/>
- <metric property="ResourceConfigurationProcessingTime"
units="milliseconds" displayType="summary"
measurementType="trendsup"
+ <metric property="ResourceConfigurationProcessingTime"
units="milliseconds" measurementType="trendsup"
description="The total amount of time spent by the alerts cache
processing resource configuration data"/>
- <metric property="OperationProcessingTime"
units="milliseconds" displayType="summary"
measurementType="trendsup"
+ <metric property="OperationProcessingTime"
units="milliseconds" measurementType="trendsup"
description="The total amount of time spent by the alerts cache
processing operation history data"/>
- <metric property="CallTimeProcessingTime"
units="milliseconds" displayType="summary"
measurementType="trendsup"
+ <metric property="CallTimeProcessingTime"
units="milliseconds" measurementType="trendsup"
description="The total amount of time spent by the alerts cache
processing calltime measurement data"/>
- <metric property="DriftProcessingTime" units="milliseconds"
displayType="summary" measurementType="trendsup"
+ <metric property="DriftProcessingTime" units="milliseconds"
measurementType="trendsup"
description="The total amount of time spent by the alerts cache
processing drift data"/>
</service>
@@ -107,9 +107,9 @@
<c:simple-property name="descriptionTemplate"
default="Statistics for the RHQ Server Measurement Subsystem."
readOnly="true"/>
</plugin-configuration>
- <metric property="CalltimeValuesInserted"
category="throughput" displayType="summary"
measurementType="trendsup"
+ <metric property="CalltimeValuesInserted"
category="throughput" measurementType="trendsup"
description="The total number of call time data records inserted into
the database by this RHQ Server instance since it was started"/>
- <metric property="CallTimeInsertTime" units="milliseconds"
displayType="summary" measurementType="trendsup"
+ <metric property="CallTimeInsertTime" units="milliseconds"
measurementType="trendsup"
description="The total amount of time taken to insert call time data
into the database by this RHQ Server instance since it was started"/>
<metric property="MeasurementsInserted"
category="throughput" displayType="summary"
measurementType="trendsup"
@@ -120,35 +120,35 @@
description="The total amount of time taken to insert measurement data
into the database by this RHQ Server instance since it was started"/>
<metric property="BaselineCalculationTime"
units="milliseconds" measurementType="trendsup"
description="The total amount of time taken to calculate and insert
measurement baseline data into the database by this RHQ Server instance since it was
started"/>
- <metric property="MeasurementCompressionTime"
units="milliseconds" displayType="summary"
measurementType="trendsup"
+ <metric property="MeasurementCompressionTime"
units="milliseconds" measurementType="trendsup"
description="The total amount of time taken by this RHQ Server
instance to compress measurement data since it was started"/>
<metric property="PurgeTime" displayType="summary"
units="milliseconds" measurementType="trendsup"
- description="The total amount of time taken by this RHQ Server
instance to purge old measurement data since it was started"/>
+ description="The total amount of time taken by this RHQ Server
instance to purge old data (including measurement, availability, event, etc) since it was
started"/>
- <metric property="AvailabilityInsertTime"
displayType="summary" units="milliseconds"
measurementType="trendsup"
+ <metric property="AvailabilityInsertTime"
units="milliseconds" measurementType="trendsup"
description="The total amount of time taken to insert availability
data into the database by this RHQ Server instance since it was started"/>
- <metric property="AvailabilitiesInserted"
displayType="summary" measurementType="trendsup"
+ <metric property="AvailabilitiesInserted"
measurementType="trendsup"
description="The total number of availability records inserted into
the database by this RHQ Server instance since it was started"/>
- <metric property="TotalAvailabilityReports"
displayType="summary" measurementType="trendsup"
+ <metric property="TotalAvailabilityReports"
measurementType="trendsup"
description="The total number of availability reports received and
processed by this RHQ Server since it was started"/>
- <metric property="ChangesOnlyAvailabilityReports"
displayType="summary" measurementType="trendsup"
+ <metric property="ChangesOnlyAvailabilityReports"
measurementType="trendsup"
description="The number of changes-only availability reports received
and processed by this RHQ Server since it was started"/>
- <metric property="FullAvailabilityReports"
displayType="summary" measurementType="trendsup"
+ <metric property="FullAvailabilityReports"
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"
+ <metric property="PurgedAlerts" measurementType="dynamic"
category="utilization"
description="Number of alerts purged by the last purge job"/>
- <metric property="PurgedAlertConditions"
displayType="summary" measurementType="dynamic"
category="utilization"
+ <metric property="PurgedAlertConditions"
measurementType="dynamic" category="utilization"
description="Number of alert conditions purged by the last purge
job"/>
- <metric property="PurgedAlertNotifications"
displayType="summary" measurementType="dynamic"
category="utilization"
+ <metric property="PurgedAlertNotifications"
measurementType="dynamic" category="utilization"
description="Number of alert notifications purged by the last purge
job"/>
- <metric property="PurgedAvailabilities"
displayType="summary" measurementType="dynamic"
category="utilization"
+ <metric property="PurgedAvailabilities"
measurementType="dynamic" category="utilization"
description="Number of availabilities purged by the last purge
job"/>
- <metric property="PurgedCallTimeData" displayType="summary"
measurementType="dynamic" category="utilization"
+ <metric property="PurgedCallTimeData"
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"
+ <metric property="PurgedEvents" measurementType="dynamic"
category="utilization"
description="Number of events purged by the last purge job"/>
- <metric property="PurgedMeasurementTraits"
displayType="summary" measurementType="dynamic"
category="utilization"
+ <metric property="PurgedMeasurementTraits"
measurementType="dynamic" category="utilization"
description="Number of traits purged by the last purge job"/>
</service>
@@ -188,11 +188,11 @@
</results>
</operation>
- <metric property="GroupDefinitionCount"
category="throughput" displayType="summary"
measurementType="dynamic"
+ <metric property="GroupDefinitionCount"
category="throughput" measurementType="dynamic"
description="Total number of group definitions in the
system"/>
- <metric property="AutoRecalculatingGroupDefinitionCount"
category="throughput" displayType="summary"
measurementType="dynamic"
+ <metric property="AutoRecalculatingGroupDefinitionCount"
category="throughput" measurementType="dynamic"
description="The number of auto-recalculating group definitions in the
system"/>
- <metric property="DynaGroupCount" category="throughput"
displayType="summary" measurementType="dynamic"
+ <metric property="DynaGroupCount" category="throughput"
measurementType="dynamic"
description="Total number of resource groups managed by some group
definition"/>
<metric property="AutoRecalculationThreadTime"
category="performance" displayType="summary"
measurementType="dynamic" units="milliseconds"
description="Average time it took to recalculate DynaGroup members for
those GroupDefinition's whose timeout expired"/>
@@ -235,15 +235,15 @@
</results>
</operation>
- <metric property="NumberFailedCommandsReceived"
category="throughput" displayType="summary"
measurementType="trendsup"
+ <metric property="NumberFailedCommandsReceived"
category="throughput" measurementType="trendsup"
description="Total number of commands that were received but failed to
be processed successfully"/>
- <metric property="NumberSuccessfulCommandsReceived"
category="throughput" displayType="summary"
measurementType="trendsup"
+ <metric property="NumberSuccessfulCommandsReceived"
category="throughput" measurementType="trendsup"
description="Total number of commands that were received and
successfully processed"/>
<metric property="NumberTotalCommandsReceived"
category="throughput" displayType="summary"
measurementType="trendsup"
description="Total number of commands that were received regardless of
their success or failure"/>
<metric property="NumberDroppedCommandsReceived"
category="throughput" displayType="summary"
measurementType="trendsup"
description="Total number of commands that were received but were
dropped, usually due to a limit reached in the server that prohibits more commands from
being processed until commands currently being processed are finished."/>
- <metric property="NumberNotProcessedCommandsReceived"
category="throughput" displayType="summary"
measurementType="trendsup"
+ <metric property="NumberNotProcessedCommandsReceived"
category="throughput" measurementType="trendsup"
description="Total number of commands that were received but were not
processed usually due to the suspension of global command processing."/>
<metric property="AverageExecutionTimeReceived"
category="performance" displayType="summary"
measurementType="dynamic" units="milliseconds"
description="Average time it took to process incoming commands that
were ultimately successful"/>
@@ -312,7 +312,7 @@
<metric property="NumberFailedInvocations"
category="throughput" displayType="summary"
measurementType="trendsup"
description="Total number of remote API requests that were received
but failed to be processed successfully"/>
- <metric property="NumberSuccessfulInvocations"
category="throughput" displayType="summary"
measurementType="trendsup"
+ <metric property="NumberSuccessfulInvocations"
category="throughput" measurementType="trendsup"
description="Total number of remote API requests that were received
and successfully processed"/>
<metric property="NumberTotalInvocations"
category="throughput" displayType="summary"
measurementType="trendsup"
description="Total number of remote API requests that were received
regardless of their success or failure"/>
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 15caad5..a5277a8 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
@@ -628,7 +628,6 @@
description="Number of cache entries" />
<metric
property="cacheMaxSize"
- displayType="summary"
description="Maximum number of cache entries" />
</service>
</service>
diff --git a/modules/plugins/virt/src/main/resources/META-INF/rhq-plugin.xml
b/modules/plugins/virt/src/main/resources/META-INF/rhq-plugin.xml
index 39d0cf9..1ebe30d 100644
--- a/modules/plugins/virt/src/main/resources/META-INF/rhq-plugin.xml
+++ b/modules/plugins/virt/src/main/resources/META-INF/rhq-plugin.xml
@@ -171,12 +171,12 @@
<metric property="rx_bytes" displayName="Received
Bytes" units="bytes" displayType="summary"
measurementType="trendsup"/>
<metric property="rx_packets" displayName="Received
Packets" measurementType="trendsup"/>
- <metric property="rx_errs" displayName="Receive
Errors" displayType="summary" measurementType="trendsup"/>
- <metric property="rx_drop" displayName="Receive
Packages Dropped" displayType="summary"
measurementType="trendsup"/>
+ <metric property="rx_errs" displayName="Receive
Errors" measurementType="trendsup"/>
+ <metric property="rx_drop" displayName="Receive
Packages Dropped" measurementType="trendsup"/>
<metric property="tx_bytes" displayName="Sent
Bytes" units="bytes" displayType="summary"
measurementType="trendsup"/>
<metric property="tx_packets" displayName="Sent
Packets" measurementType="trendsup"/>
- <metric property="tx_errs" displayName="Send
Errors" displayType="summary" measurementType="trendsup"/>
- <metric property="tx_drop" displayName="Send Packets
Dropped" displayType="summary" measurementType="trendsup"/>
+ <metric property="tx_errs" displayName="Send
Errors" measurementType="trendsup"/>
+ <metric property="tx_drop" displayName="Send Packets
Dropped" measurementType="trendsup"/>
</service>
@@ -184,9 +184,9 @@
<service name="Virtual Block Device"
class="VirtualizationBlockDeviceComponent"
discovery="VirtualizationBlockDeviceDiscoveryComponent">
- <metric property="rd_req" displayName="Read
Requests" displayType="summary" measurementType="trendsup"/>
+ <metric property="rd_req" displayName="Read
Requests" measurementType="trendsup"/>
<metric property="rd_bytes" displayName="Read
Bytes" units="bytes" displayType="summary"
measurementType="trendsup"/>
- <metric property="wr_req" displayName="Write
Requests" displayType="summary" measurementType="trendsup"/>
+ <metric property="wr_req" displayName="Write
Requests" measurementType="trendsup"/>
<metric property="wr_bytes" displayName="Write
Bytes" units="bytes" displayType="summary"
measurementType="trendsup"/>
<metric property="errs" displayName="Errors"
displayType="summary" measurementType="trendsup"/>
commit a560fa305476df8a5afae2f210a7ea6e89513b94
Author: John Mazzitelli <mazz(a)redhat.com>
Date: Thu Nov 3 11:56:50 2011 -0400
[BZ 751128] missing calltime alert stats. also adds "total cache element
count" as well.
diff --git
a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/alert/engine/internal/AgentConditionCache.java
b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/alert/engine/internal/AgentConditionCache.java
index 49faca2..be48af0 100644
---
a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/alert/engine/internal/AgentConditionCache.java
+++
b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/alert/engine/internal/AgentConditionCache.java
@@ -56,6 +56,7 @@ import
org.rhq.enterprise.server.alert.engine.internal.AlertConditionCacheCoordi
import org.rhq.enterprise.server.alert.engine.mbean.AlertConditionCacheMonitor;
import org.rhq.enterprise.server.alert.engine.model.AlertConditionOperator;
import org.rhq.enterprise.server.alert.engine.model.CallTimeDataCacheElement;
+import
org.rhq.enterprise.server.alert.engine.model.CallTimeDataCacheElement.CallTimeElementValue;
import org.rhq.enterprise.server.alert.engine.model.DriftCacheElement;
import org.rhq.enterprise.server.alert.engine.model.EventCacheElement;
import org.rhq.enterprise.server.alert.engine.model.InvalidCacheElementException;
@@ -64,7 +65,6 @@ import
org.rhq.enterprise.server.alert.engine.model.MeasurementNumericCacheEleme
import org.rhq.enterprise.server.alert.engine.model.MeasurementRangeNumericCacheElement;
import org.rhq.enterprise.server.alert.engine.model.MeasurementTraitCacheElement;
import org.rhq.enterprise.server.alert.engine.model.NumericDoubleCacheElement;
-import
org.rhq.enterprise.server.alert.engine.model.CallTimeDataCacheElement.CallTimeElementValue;
import org.rhq.enterprise.server.auth.SubjectManagerLocal;
import org.rhq.enterprise.server.measurement.MeasurementDataManagerLocal;
import org.rhq.enterprise.server.plugin.pc.drift.DriftChangeSetSummary;
@@ -415,6 +415,8 @@ class AgentConditionCache extends AbstractConditionCache {
}
}
}
+
AlertConditionCacheMonitor.getMBean().incrementCallTimeCacheElementMatches(stats.matched);
+
AlertConditionCacheMonitor.getMBean().incrementCallTimeProcessingTime(stats.getAge());
} catch (Throwable t) {
// don't let any exceptions bubble up to the calling SLSB layer
log.error("Error during calltime cache processing for agent[id=" +
agentId + "]", t);
@@ -519,8 +521,8 @@ class AgentConditionCache extends AbstractConditionCache {
int resourceId = driftChangeSetSummary.getResourceId();
List<DriftCacheElement> cacheElements =
lookupDriftCacheElements(resourceId);
- processCacheElements(cacheElements, DriftCacheElement.UNUSED_CONDITION_VALUE,
driftChangeSetSummary
- .getCreatedTime(), stats, driftChangeSetSummary);
+ processCacheElements(cacheElements,
DriftCacheElement.UNUSED_CONDITION_VALUE,
+ driftChangeSetSummary.getCreatedTime(), stats, driftChangeSetSummary);
AlertConditionCacheMonitor.getMBean().incrementDriftCacheElementMatches(stats.matched);
AlertConditionCacheMonitor.getMBean().incrementDriftProcessingTime(stats.getAge());
diff --git
a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/alert/engine/mbean/AlertConditionCacheMonitor.java
b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/alert/engine/mbean/AlertConditionCacheMonitor.java
index 1442dce..8e3be19 100644
---
a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/alert/engine/mbean/AlertConditionCacheMonitor.java
+++
b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/alert/engine/mbean/AlertConditionCacheMonitor.java
@@ -42,6 +42,7 @@ public class AlertConditionCacheMonitor implements
AlertConditionCacheMonitorMBe
public AtomicInteger measurementCacheElementMatches = new AtomicInteger();
public AtomicInteger resourceConfigurationCacheElementMatches = new AtomicInteger();
public AtomicInteger operationCacheElementMatches = new AtomicInteger();
+ public AtomicInteger calltimeCacheElementMatches = new AtomicInteger();
public AtomicInteger driftCacheElementMatches = new AtomicInteger();
public AtomicInteger totalCacheElementMatches = new AtomicInteger();
@@ -50,6 +51,7 @@ public class AlertConditionCacheMonitor implements
AlertConditionCacheMonitorMBe
public AtomicLong measurementProcessingTime = new AtomicLong();
public AtomicLong resourceConfigurationProcessingTime = new AtomicLong();
public AtomicLong operationProcessingTime = new AtomicLong();
+ public AtomicLong calltimeProcessingTime = new AtomicLong();
public AtomicLong driftProcessingTime = new AtomicLong();
public AtomicLong totalProcessingTime = new AtomicLong();
@@ -99,11 +101,28 @@ public class AlertConditionCacheMonitor implements
AlertConditionCacheMonitorMBe
AlertConditionCacheCoordinator.Cache.ResourceOperationCache);
}
+ public int getCallTimeCacheElementCount() {
+ return AlertConditionCacheCoordinator.getInstance().getCacheSize(
+ AlertConditionCacheCoordinator.Cache.CallTimeDataCache);
+ }
+
public int getDriftCacheElementCount() {
return AlertConditionCacheCoordinator.getInstance().getCacheSize(
AlertConditionCacheCoordinator.Cache.DriftCache);
}
+ /**
+ * Takes all the counts from {@link #getCacheCounts()} and returns the sum.
+ */
+ public int getTotalCacheElementCount() {
+ Map<String, Integer> map = getCacheCounts();
+ int total = 0;
+ for (Integer count : map.values()) {
+ total += count;
+ }
+ return total;
+ }
+
public Map<String, Integer> getCacheCounts() {
return AlertConditionCacheCoordinator.getInstance().getCacheCounts();
}
@@ -128,6 +147,10 @@ public class AlertConditionCacheMonitor implements
AlertConditionCacheMonitorMBe
return operationCacheElementMatches.get();
}
+ public int getCallTimeCacheElementMatches() {
+ return calltimeCacheElementMatches.get();
+ }
+
public int getDriftCacheElementMatches() {
return driftCacheElementMatches.get();
}
@@ -161,6 +184,11 @@ public class AlertConditionCacheMonitor implements
AlertConditionCacheMonitorMBe
totalCacheElementMatches.addAndGet(matches);
}
+ public void incrementCallTimeCacheElementMatches(int matches) {
+ calltimeCacheElementMatches.addAndGet(matches);
+ totalCacheElementMatches.addAndGet(matches);
+ }
+
public void incrementDriftCacheElementMatches(int matches) {
driftCacheElementMatches.addAndGet(matches);
totalCacheElementMatches.addAndGet(matches);
@@ -182,6 +210,10 @@ public class AlertConditionCacheMonitor implements
AlertConditionCacheMonitorMBe
return operationProcessingTime.get();
}
+ public long getCallTimeProcessingTime() {
+ return calltimeProcessingTime.get();
+ }
+
public long getDriftProcessingTime() {
return driftProcessingTime.get();
}
@@ -215,6 +247,11 @@ public class AlertConditionCacheMonitor implements
AlertConditionCacheMonitorMBe
totalProcessingTime.addAndGet(moreMillis);
}
+ public void incrementCallTimeProcessingTime(long moreMillis) {
+ calltimeProcessingTime.addAndGet(moreMillis);
+ totalProcessingTime.addAndGet(moreMillis);
+ }
+
public void incrementDriftProcessingTime(long moreMillis) {
driftProcessingTime.addAndGet(moreMillis);
totalProcessingTime.addAndGet(moreMillis);
diff --git
a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/alert/engine/mbean/AlertConditionCacheMonitorMBean.java
b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/alert/engine/mbean/AlertConditionCacheMonitorMBean.java
index 9e0a1f8..328d4f2 100644
---
a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/alert/engine/mbean/AlertConditionCacheMonitorMBean.java
+++
b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/alert/engine/mbean/AlertConditionCacheMonitorMBean.java
@@ -40,6 +40,8 @@ public interface AlertConditionCacheMonitorMBean {
public long getOperationProcessingTime();
+ public long getCallTimeProcessingTime();
+
public long getDriftProcessingTime();
public void incrementAvailabilityProcessingTime(long moreMillis);
@@ -52,11 +54,15 @@ public interface AlertConditionCacheMonitorMBean {
public void incrementOperationProcessingTime(long moreMillis);
+ public void incrementCallTimeProcessingTime(long moreMillis);
+
public void incrementDriftProcessingTime(long moreMillis);
/*
* for current congestion
*/
+ public int getTotalCacheElementCount();
+
public int getAvailabilityCacheElementCount();
public int getMeasurementCacheElementCount();
@@ -67,6 +73,8 @@ public interface AlertConditionCacheMonitorMBean {
public int getOperationCacheElementCount();
+ public int getCallTimeCacheElementCount();
+
public int getDriftCacheElementCount();
public Map<String, Integer> getCacheCounts();
@@ -86,6 +94,8 @@ public interface AlertConditionCacheMonitorMBean {
public int getOperationCacheElementMatches();
+ public int getCallTimeCacheElementMatches();
+
public int getDriftCacheElementMatches();
public void incrementAvailabilityCacheElementMatches(int matches);
@@ -98,6 +108,8 @@ public interface AlertConditionCacheMonitorMBean {
public void incrementOperationCacheElementMatches(int matches);
+ public void incrementCallTimeCacheElementMatches(int matches);
+
public void incrementDriftCacheElementMatches(int matches);
/*
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 18cae0e..f051ffd 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
@@ -38,6 +38,8 @@
</results>
</operation>
+ <metric property="TotalCacheElementCount"
category="throughput" displayType="summary"
+ description="The total number of elements in all alert caches that
check all types of conditions"/>
<metric property="AvailabilityCacheElementCount"
category="throughput" displayType="summary"
description="The number of elements in the alerts cache that check
conditions against availability data"/>
<metric property="MeasurementCacheElementCount"
category="throughput" displayType="summary"
@@ -46,6 +48,8 @@
description="The number of elements in the alerts cache that check
conditions against event history data"/>
<metric property="OperationCacheElementCount"
category="throughput" displayType="summary"
description="The number of elements in the alerts cache that check
conditions against operation history data"/>
+ <metric property="CallTimeCacheElementCount"
category="throughput" displayType="summary"
+ description="The number of elements in the alerts cache that check
conditions against calltime measurement data"/>
<metric property="ResourceConfigurationCacheElementCount"
category="throughput" displayType="summary"
description="The number of elements in the alerts cache that check
conditions against resource configuration data"/>
<metric property="DriftCacheElementCount"
category="throughput" displayType="summary"
@@ -63,6 +67,8 @@
description="The total number of times resource configuration-based
conditions have triggered against incoming data since this RHQ Server instance was
started"/>
<metric property="OperationCacheElementMatches"
category="throughput" displayType="summary"
measurementType="trendsup"
description="The total number of times operation-based conditions have
triggered against incoming data since this RHQ Server instance was started"/>
+ <metric property="CallTimeCacheElementMatches"
category="throughput" displayType="summary"
measurementType="trendsup"
+ description="The total number of times calltime-based conditions have
triggered against incoming data since this RHQ Server instance was started"/>
<metric property="DriftCacheElementMatches"
category="throughput" displayType="summary"
measurementType="trendsup"
description="The total number of times drift conditions have triggered
against incoming data since this RHQ Server instance was started"/>
@@ -78,6 +84,8 @@
description="The total amount of time spent by the alerts cache
processing resource configuration data"/>
<metric property="OperationProcessingTime"
units="milliseconds" displayType="summary"
measurementType="trendsup"
description="The total amount of time spent by the alerts cache
processing operation history data"/>
+ <metric property="CallTimeProcessingTime"
units="milliseconds" displayType="summary"
measurementType="trendsup"
+ description="The total amount of time spent by the alerts cache
processing calltime measurement data"/>
<metric property="DriftProcessingTime" units="milliseconds"
displayType="summary" measurementType="trendsup"
description="The total amount of time spent by the alerts cache
processing drift data"/>