Merge pull request #3339 from jkohen/patch-1

[collectd.git] / contrib / GenericJMX.conf

diff --git a/contrib/GenericJMX.conf b/contrib/GenericJMX.conf
index 45c7cf9..1d3fe56 100644 (file)
--- a/contrib/GenericJMX.conf
+++ b/contrib/GenericJMX.conf
@@ -91,6 +91,12 @@
 #      </Value>
     </MBean>
 
+    ######################################
+    # Define the "jmx_memory" type as:   #
+    #   jmx_memory  value:GAUGE:0:U      #
+    # See types.db(5) for details.       #
+    ######################################
+
     # Generic heap/nonheap memory usage.
     <MBean "memory">
       ObjectName "java.lang:type=Memory"
@@ -99,7 +105,7 @@
 
       # Creates four values: committed, init, max, used
       <Value>
-        Type "memory"
+        Type "jmx_memory"
         #InstancePrefix ""
         #InstanceFrom ""
         Table true
@@ -109,11 +115,12 @@
 
       # Creates four values: committed, init, max, used
       <Value>
-        Type "memory"
+        Type "jmx_memory"
         #InstancePrefix ""
         #InstanceFrom ""
         Table true
         Attribute "NonHeapMemoryUsage"
+        InstancePrefix "nonheap-"
       </Value>
     </MBean>
 
@@ -124,7 +131,7 @@
       InstanceFrom "name"
 
       <Value>
-        Type "memory"
+        Type "jmx_memory"
         #InstancePrefix ""
         #InstanceFrom ""
         Table true
@@ -141,7 +148,7 @@
 
       <Value>
         Type "io_octets"
-        #InstancePrefix ""
+        InstancePrefix "global"
         #InstanceFrom ""
         Table false
         Attribute "bytesReceived"
@@ -150,7 +157,7 @@
 
       <Value>
         Type "total_requests"
-        #InstancePrefix ""
+        InstancePrefix "global"
         #InstanceFrom ""
         Table false
         Attribute "requestCount"
@@ -158,7 +165,7 @@
 
       <Value>
         Type "total_time_in_ms"
-        InstancePrefix "processing"
+        InstancePrefix "global-processing"
         #InstanceFrom ""
         Table false
         Attribute "processingTime"
@@ -169,12 +176,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 +190,7 @@
       <Value>
         Type "total_requests"
         #InstancePrefix ""
-        InstanceFrom "worker"
+        InstanceFrom "name"
         Table false
         Attribute "requestCount"
       </Value>
@@ -191,7 +198,7 @@
       <Value>
         Type "total_time_in_ms"
         InstancePrefix "processing-"
-        InstanceFrom "worker"
+        InstanceFrom "name"
         Table false
         Attribute "processingTime"
       </Value>
@@ -224,8 +231,10 @@
     # Connection blocks #
     #####################
     <Connection>
-      Host "localhost"
       ServiceURL "service:jmx:rmi:///jndi/rmi://localhost:17264/jmxrmi"
+      User "monitorRole"
+      Password "queeZie1"
+      Host "localhost"
       Collect "classes"
       Collect "compilation"
       Collect "garbage_collector"