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 2511221..2360f3c 100644 (file)
--- a/contrib/collection3/etc/collection.conf
+++ b/contrib/collection3/etc/collection.conf
@@ -131,6 +131,13 @@ GraphWidth 400
   RRDVerticalLabel "Queries/s"
   RRDFormat "%6.1lf"
 </Type>
+<Type conntrack>
+  DataSources conntrack
+  DSName conntrack Conntrack count
+  RRDTitle "nf_conntrack connections on {hostname}"
+  RRDVerticalLabel "Count"
+  RRDFormat "%4.0lf"
+</Type>
 <Type entropy>
   DataSources entropy
   DSName entropy Entropy bits
@@ -254,6 +261,10 @@ GraphWidth 400
 <Type load>
   Module Load
 </Type>
+<Type java_memory>
+  Module JavaMemory
+  DataSources value
+</Type>
 <Type memory>
   Module GenericStacked
   DataSources value
@@ -434,7 +445,7 @@ GraphWidth 400
   DataSources value
   RRDTitle "Processes on {hostname}"
   RRDVerticalLabel "Processes"
-  RRDFormat "%5.1lf%s"
+  RRDFormat "%5.1lf"
   DSName running  Running
   DSName sleeping Sleeping
   DSName paging   Paging
@@ -498,8 +509,16 @@ GraphWidth 400
   DataSources value
   DSName value Temp
   RRDTitle "Temperature ({instance})"
-  RRDVerticalLabel "°Celsius"
-  RRDFormat "%4.1lf°C"
+  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
@@ -525,4 +544,4 @@ GraphWidth 400
   RRDVerticalLabel "W"
   RRDFormat "%4.1lfW"
 </Type>
-# vim: set sw=2 sts=2 et syntax=apache fileencoding=latin-1 :
+# vim: set sw=2 sts=2 et syntax=apache fileencoding=utf-8 :