From 502535807083ee487f2e1b3dad15051b4db7c754 Mon Sep 17 00:00:00 2001
From: Florian Forster <octo@noris.net>
Date: Wed, 9 Jun 2010 10:38:11 +0200
Subject: [PATCH] contrib/GenericJMX.conf: Use the "jmx_memory" type.

---
 contrib/GenericJMX.conf | 13 ++++++++++---
 1 file changed, 10 insertions(+), 3 deletions(-)

diff --git a/contrib/GenericJMX.conf b/contrib/GenericJMX.conf
index f4dd8f0e..1d3fe564 100644
--- 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
-- 
2.11.0