Merge branch 'collectd-4.3' into collectd-4.4

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

diff --git a/contrib/collection3/etc/collection.conf b/contrib/collection3/etc/collection.conf
index c96e921..a836cf2 100644 (file)
--- a/contrib/collection3/etc/collection.conf
+++ b/contrib/collection3/etc/collection.conf
@@ -1,3 +1,5 @@
+GraphWidth 400
+UnixSockAddr "/var/run/collectd-unixsock"
 <Type apache_scoreboard>
   Module GenericStacked
   DataSources count
@@ -52,6 +54,14 @@
   Color interrupt a000a0
   Color steal     000000
 </Type>
+<Type current>
+  DataSources value
+  DSName value Current
+  RRDTitle "Current ({type_instance})"
+  RRDVerticalLabel "Ampere"
+  RRDFormat "%4.1lfA"
+  Color value ffb000
+</Type>
 <Type df>
   Module Df
   DataSources free used
@@ -107,11 +117,27 @@
 <Type fanspeed>
   DataSources value
   DSName value RPM
-  RRDTitle "Fanspeed ({type_instance})"
+  RRDTitle "Fanspeed ({instance})"
   RRDVerticalLabel "RPM"
   RRDFormat "%6.1lf"
   Color value 00b000
 </Type>
+<Type frequency>
+  DataSources frequency
+  DSName frequency Frequency
+  RRDTitle "Frequency ({type_instance})"
+  RRDVerticalLabel "Hertz"
+  RRDFormat "%4.1lfHz"
+  Color frequency a000a0
+</Type>
+<Type humidity>
+  DataSources value
+  DSName value Humitidy
+  RRDTitle "Humitidy ({instance})"
+  RRDVerticalLabel "Percent"
+  RRDFormat "%4.1lf%%"
+  Color value 00e000
+</Type>
 <Type if_errors>
   Module GenericIO
   DataSources rx tx
@@ -212,6 +238,14 @@
   Color buffered  ffb000
   Color used      ff0000
 </Type>
+<Type percent>
+  DataSources percent
+  DSName percent Percent
+  RRDTitle "Percent ({type_instance})"
+  RRDVerticalLabel "Percent"
+  RRDFormat "%4.1lf%%"
+  Color percent 0000ff
+</Type>
 <Type ping>
   DataSources ping
   DSName "ping Latency"
@@ -219,6 +253,21 @@
   RRDVerticalLabel "Milliseconds"
   RRDFormat "%5.2lfms"
 </Type>
+<Type power>
+  DataSources value
+  DSName value Watts
+  RRDTitle "Power ({type_instance})"
+  RRDVerticalLabel "Watts"
+  RRDFormat "%6.2lf%sW"
+  Color value 008080
+</Type>
+<Type ps_rss>
+  DataSources value
+  DSName value RSS
+  RRDTitle "Resident Segment Size ({instance})"
+  RRDVerticalLabel "Bytes"
+  RRDFormat "%6.2lf%s"
+</Type>
 <Type ps_state>
   Module GenericStacked
   DataSources value
@@ -239,6 +288,22 @@
   Color blocked  ff00ff
   Color stopped  a000a0
 </Type>
+<Type swap>
+  Module GenericStacked
+  DataSources value
+  RRDTitle "Swap utilization on {hostname}"
+  RRDVerticalLabel "Bytes"
+  RRDFormat "%5.1lf%s"
+  RRDOptions -b 1024 -l 0
+  DSName     "free Free    "
+  DSName   "cached Cached  "
+  DSName     "used Used    "
+  #Order used cached free
+  Order free cached used
+  Color free      00e000
+  Color cached    0000ff
+  Color used      ff0000
+</Type>
 <Type tcp_connections>
   Module GenericStacked
   DataSources value
@@ -262,7 +327,7 @@
 <Type temperature>
   DataSources value
   DSName value Temp
-  RRDTitle "Temperature ({type_instance})"
+  RRDTitle "Temperature ({instance})"
   RRDVerticalLabel "°Celsius"
   RRDFormat "%4.1lf°C"
 </Type>
@@ -282,4 +347,4 @@
   RRDFormat "%4.1lfV"
   Color value f00000
 </Type>
-# vim: set sw=2 sts=2 et syntax=apache :
+# vim: set sw=2 sts=2 et syntax=apache fileencoding=latin-1 :