contrib/GenericJMX.conf: Fix some typos and improve type instances.

diff --git a/contrib/GenericJMX.conf b/contrib/GenericJMX.conf
index 45c7cf9fb791c912dd0426da0049d681d6782b88..394dd3065a25c487ac9504ab406f473442a70798 100644 (file)
--- a/contrib/GenericJMX.conf
+++ b/contrib/GenericJMX.conf
@@ -141,7 +141,7 @@
 
       <Value>
         Type "io_octets"
-        #InstancePrefix ""
+        InstancePrefix "global"
         #InstanceFrom ""
         Table false
         Attribute "bytesReceived"
@@ -150,7 +150,7 @@
 
       <Value>
         Type "total_requests"
-        #InstancePrefix ""
+        InstancePrefix "global"
         #InstanceFrom ""
         Table false
         Attribute "requestCount"
@@ -158,7 +158,7 @@
 
       <Value>
         Type "total_time_in_ms"
-        InstancePrefix "processing"
+        InstancePrefix "global-processing"
         #InstanceFrom ""
         Table false
         Attribute "processingTime"
@@ -169,12 +169,12 @@
     <MBean "catalina/detailed_request_processor">
       ObjectName "Catalina:type=RequestProcessor,*"
       InstancePrefix "request_processor-"
-      InstanceFrom "name"
+      InstanceFrom "worker"
 
       <Value>
         Type "io_octets"
         #InstancePrefix ""
-        InstanceFrom "worker"
+        InstanceFrom "name"
         Table false
         Attribute "bytesReceived"
         Attribute "bytesSent"
@@ -183,7 +183,7 @@
       <Value>
         Type "total_requests"
         #InstancePrefix ""
-        InstanceFrom "worker"
+        InstanceFrom "name"
         Table false
         Attribute "requestCount"
       </Value>
@@ -191,7 +191,7 @@
       <Value>
         Type "total_time_in_ms"
         InstancePrefix "processing-"
-        InstanceFrom "worker"
+        InstanceFrom "name"
         Table false
         Attribute "processingTime"
       </Value>