Merge branch 'collectd-4.6' into collectd-4.7

[collectd.git] / contrib / collection3 / etc / collection.conf

diff --git a/contrib/collection3/etc/collection.conf b/contrib/collection3/etc/collection.conf
index f56d1ca..2360f3c 100644 (file)
--- a/contrib/collection3/etc/collection.conf
+++ b/contrib/collection3/etc/collection.conf
@@ -261,6 +261,10 @@ GraphWidth 400
 <Type load>
   Module Load
 </Type>
+<Type java_memory>
+  Module JavaMemory
+  DataSources value
+</Type>
 <Type memory>
   Module GenericStacked
   DataSources value
@@ -508,6 +512,14 @@ GraphWidth 400
   RRDVerticalLabel "°Celsius"
   RRDFormat "%4.1lf°C"
 </Type>
+<Type total_time_in_ms>
+  DataSources value
+  DSName "value Time"
+  RRDTitle "Time {instance}"
+  RRDVerticalLabel "Seconds"
+  RRDFormat "%6.2lf %ss"
+  Scale 0.001
+</Type>
 <Type users>
   DataSources users
   DSName users Users