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 b703e9f..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
@@ -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"
@@ -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
@@ -277,7 +288,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 +372,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 +402,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 +430,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 +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
@@ -462,6 +476,15 @@ GraphWidth 400
   Color cached    0000ff
   Color used      ff0000
 </Type>
+<Type table_size>
+  Module TableSize
+  DataSources value
+  DSName value Bytes
+  RRDTitle "Table size ({instance})"
+  RRDVerticalLabel "Size [Bytes]"
+# RRDOptions ...
+  RRDFormat "%5.1lf%s"
+</Type>
 <Type tcp_connections>
   Module GenericStacked
   DataSources value
@@ -486,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
@@ -505,4 +536,12 @@ GraphWidth 400
   RRDFormat "%4.1lfV"
   Color value f00000
 </Type>
-# vim: set sw=2 sts=2 et syntax=apache fileencoding=latin-1 :
+<Type wirkleistung>
+  Module Wirkleistung
+  DataSources kWh
+  DSName value Wh
+  RRDTitle "Watt"
+  RRDVerticalLabel "W"
+  RRDFormat "%4.1lfW"
+</Type>
+# vim: set sw=2 sts=2 et syntax=apache fileencoding=utf-8 :