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 ec0124e..f56d1ca 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
@@ -202,7 +209,7 @@ GraphWidth 400
   DataSources rx tx
   DSName rx RX
   DSName tx TX
-  RRDTitle "Interface Traffic ({type_instance})"
+  RRDTitle "Interface Traffic ({instance})"
   RRDVerticalLabel "Bits per second"
 # RRDOptions ...
   RRDFormat "%5.1lf%s"
@@ -277,7 +284,7 @@ GraphWidth 400
 <Type mysql_commands>
   Module GenericStacked
   DataSources value
-  RRDTitle "MySQL commands"
+  RRDTitle "MySQL commands ({plugin_instance})"
   RRDVerticalLabel "Invocations"
   RRDFormat "%6.2lf"
 
@@ -361,7 +368,7 @@ GraphWidth 400
 <Type mysql_handler>
   Module GenericStacked
   DataSources value
-  RRDTitle "MySQL handler"
+  RRDTitle "MySQL handler ({plugin_instance})"
   RRDVerticalLabel "Invocations"
   RRDFormat "%6.2lf"
   DSName commit commit
@@ -391,7 +398,7 @@ GraphWidth 400
   DataSources rx tx
   DSName rx RX
   DSName tx TX
-  RRDTitle "MySQL Traffic"
+  RRDTitle "MySQL Traffic ({plugin_instance})"
   RRDVerticalLabel "Bits per second"
   RRDFormat "%5.1lf%s"
   Scale 8
@@ -419,6 +426,9 @@ GraphWidth 400
   RRDFormat "%6.2lf%sW"
   Color value 008080
 </Type>
+<Type ps_cputime>
+  Module PsCputime
+</Type>
 <Type ps_rss>
   DataSources value
   DSName value RSS
@@ -431,7 +441,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
@@ -495,8 +505,8 @@ GraphWidth 400
   DataSources value
   DSName value Temp
   RRDTitle "Temperature ({instance})"
-  RRDVerticalLabel "°Celsius"
-  RRDFormat "%4.1lf°C"
+  RRDVerticalLabel "°Celsius"
+  RRDFormat "%4.1lf°C"
 </Type>
 <Type users>
   DataSources users
@@ -522,4 +532,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 :