modules/plugins/jmx/src/main/resources/META-INF/rhq-plugin.xml | 34 +++++----- 1 file changed, 20 insertions(+), 14 deletions(-)
New commits: commit 570a73c42ab563aaa2be114038b0d79601d4032e Author: John Mazzitelli mazz@redhat.com Date: Fri Nov 4 19:55:10 2011 -0400
[BZ 747925] revert the changes that BZ 741331 made to the JMX plugin rhq-plugin.xml that materially affects the metadata. once 747925 is fixed, we must undo this commit and put this file back the way we wanted it (which is what it looked like immediately prior to this commit)
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 41e031b..5572bf0 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 @@ -120,9 +120,9 @@ createDeletePolicy="neither" singleton="true">
<plugin-configuration> - <c:simple-property name="objectName" readOnly="true" default="java.lang:type=OperatingSystem"/> - <c:simple-property name="nameTemplate" readOnly="true" default="Operating system information"/> - <c:simple-property name="descriptionTemplate" readOnly="true" default="Operating system information provided by the JVM."/> + <c:simple-property name="objectName" default="java.lang:type=OperatingSystem"/> + <c:simple-property name="nameTemplate" default="Operating system information"/> + <c:simple-property name="descriptionTemplate" default="Operating system information provided by the JVM."/> </plugin-configuration>
<metric displayName="Free Physical Memory" @@ -146,6 +146,7 @@ measurementType="trendsup" units="nanoseconds"/> <metric displayName="Committed Virtual Memory" + defaultOn="true" category="utilization" property="CommittedVirtualMemorySize" description="Size of virtual memory used by this process" @@ -159,7 +160,7 @@
<plugin-configuration> <c:simple-property name="objectName" readOnly="true" default="java.lang:type=Threading"/> - <c:simple-property name="nameTemplate" readOnly="true" default="Threading"/> + <c:simple-property name="nameTemplate" default="Threading"/> </plugin-configuration>
<operation displayName="Reset Peak Thread Metrics" name="resetPeakThreadCount" @@ -210,12 +211,15 @@ property="ThreadCount" description="Number of active threads in the system"/> <metric displayName="Peak Thread Count" + defaultOn="true" property="PeakThreadCount" description="Peak count of active threads in the system"/> <metric displayName="Total Started Thread Count" + defaultOn="true" property="TotalStartedThreadCount" description="Count of threads started since system start"/> <metric displayName="Daemon Thread Count" + defaultOn="true" property="DaemonThreadCount" description="Count of threads marked as daemons in the system"/> <metric property="SuspendedThreadCount" @@ -237,13 +241,14 @@
<plugin-configuration> <c:simple-property name="objectName" readOnly="true" default="java.lang:type=Memory"/> - <c:simple-property name="nameTemplate" readOnly="true" default="Memory Subsystem"/> + <c:simple-property name="nameTemplate" default="Memory Subsystem"/> </plugin-configuration>
<operation name="gc" displayName="Run Garbage Collection" description="Runs the garbage collector."/>
<metric displayName="Heap Usage" property="{HeapMemoryUsage.used}" + displayType="summary" description="Current heap memory usage" units="bytes"/> <metric displayName="Heap Committed" @@ -253,6 +258,7 @@ 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" @@ -297,9 +303,9 @@
<plugin-configuration> <c:simple-property name="objectName" readOnly="true" default="java.lang:type=MemoryPool,name=%name%"/> - <c:simple-property name="nameTemplate" readOnly="true" default="{name}"/> - <c:simple-property name="descriptionTemplate" readOnly="true" default="The {name} memory pool for this VM."/> - <c:simple-property name="name" type="string" readOnly="true" description="The memory pool's name"/> + <c:simple-property name="nameTemplate" default="{name}"/> + <c:simple-property name="descriptionTemplate" default="The {name} memory pool for this VM."/> + <c:simple-property name="name" type="string" description="The memory pool's name"/> </plugin-configuration>
<metric displayName="Used" @@ -340,9 +346,9 @@
<plugin-configuration> <c:simple-property name="objectName" readOnly="true" default="java.lang:type=GarbageCollector,name=%name%"/> - <c:simple-property name="nameTemplate" readOnly="true" default="{name}"/> - <c:simple-property name="descriptionTemplate" readOnly="true" default="The {name} Garbage Collector for this VM."/> - <c:simple-property name="name" type="string" readOnly="true" description="The garbage collector's name"/> + <c:simple-property name="nameTemplate" default="{name}"/> + <c:simple-property name="descriptionTemplate" default="The {name} Garbage Collector for this VM."/> + <c:simple-property name="name" type="string" description="The garbage collector's name"/> </plugin-configuration>
<metric property="CollectionCount" @@ -369,7 +375,7 @@
<plugin-configuration> <c:simple-property name="objectName" readOnly="true" default="java.lang:type=Compilation"/> - <c:simple-property name="nameTemplate" readOnly="true" default="Compilation"/> + <c:simple-property name="nameTemplate" default="Compilation"/> </plugin-configuration>
<metric property="TotalCompilationTime" @@ -385,7 +391,7 @@
<plugin-configuration> <c:simple-property name="objectName" readOnly="true" default="java.lang:type=ClassLoading"/> - <c:simple-property name="nameTemplate" readOnly="true" default="Class Loading"/> + <c:simple-property name="nameTemplate" default="Class Loading"/> </plugin-configuration>
<metric displayName="Loaded Classes" @@ -413,7 +419,7 @@
<plugin-configuration> <c:simple-property name="objectName" readOnly="true" default="java.util.logging:type=Logging"/> - <c:simple-property name="nameTemplate" readOnly="true" default="Logging"/> + <c:simple-property name="nameTemplate" default="Logging"/> <c:simple-property name="configManagementEnabled" type="boolean" default="false" description="When false, configuration reading for this resource will fail."/> </plugin-configuration>