X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=contrib%2Fcollection3%2Fetc%2Fcollection.conf;h=5d5e4eb8c861b75f7898d5e63ec78e38641082ce;hb=711f5b6c86f51061c21bedcaa46214a01de0125c;hp=9c5e3d1dfe2839f08bb73c251843fb8c23b97c53;hpb=9a3479d538c92e5a98b14574acd2cc4ee3a3e440;p=collectd.git

diff --git a/contrib/collection3/etc/collection.conf b/contrib/collection3/etc/collection.conf
index 9c5e3d1d..5d5e4eb8 100644
--- a/contrib/collection3/etc/collection.conf
+++ b/contrib/collection3/etc/collection.conf
@@ -2,24 +2,24 @@
 GraphWidth 400
 #UnixSockAddr "/var/run/collectd-unixsock"
 <Type apache_bytes>
-  DataSources count
-  DSName "count Bytes/s"
+  DataSources value
+  DSName "value Bytes/s"
   RRDTitle "Apache Traffic"
   RRDVerticalLabel "Bytes/s"
   RRDFormat "%5.1lf%s"
-  Color count 0000ff
+  Color value 0000ff
 </Type>
 <Type apache_requests>
-  DataSources count
-  DSName "count Requests/s"
+  DataSources value
+  DSName "value Requests/s"
   RRDTitle "Apache Traffic"
   RRDVerticalLabel "Requests/s"
   RRDFormat "%5.2lf"
-  Color count 00d000
+  Color value 00d000
 </Type>
 <Type apache_scoreboard>
   Module GenericStacked
-  DataSources count
+  DataSources value
   RRDTitle "Apache scoreboard on {hostname}"
   RRDVerticalLabel "Slots"
   RRDFormat "%6.2lf"
@@ -245,15 +245,15 @@ GraphWidth 400
   RRDFormat "%6.1lf"
 </Type>
 <Type conntrack>
-  DataSources conntrack
-  DSName conntrack Conntrack count
+  DataSources value
+  DSName value Conntrack count
   RRDTitle "nf_conntrack connections on {hostname}"
   RRDVerticalLabel "Count"
   RRDFormat "%4.0lf"
 </Type>
 <Type entropy>
-  DataSources entropy
-  DSName entropy Entropy bits
+  DataSources value
+  DSName value Entropy bits
   RRDTitle "Available entropy on {hostname}"
   RRDVerticalLabel "Bits"
   RRDFormat "%4.0lf"
@@ -267,12 +267,12 @@ GraphWidth 400
   Color value 00b000
 </Type>
 <Type frequency>
-  DataSources frequency
-  DSName frequency Frequency
+  DataSources value
+  DSName value Frequency
   RRDTitle "Frequency ({type_instance})"
   RRDVerticalLabel "Hertz"
   RRDFormat "%4.1lfHz"
-  Color frequency a000a0
+  Color value a000a0
 </Type>
 <Type humidity>
   DataSources value
@@ -542,16 +542,16 @@ GraphWidth 400
   Scale 8
 </Type>
 <Type percent>
-  DataSources percent
-  DSName percent Percent
+  DataSources value
+  DSName value Percent
   RRDTitle "Percent ({type_instance})"
   RRDVerticalLabel "Percent"
   RRDFormat "%4.1lf%%"
-  Color percent 0000ff
+  Color value 0000ff
 </Type>
 <Type ping>
-  DataSources ping
-  DSName "ping Latency"
+  DataSources value
+  DSName "value Latency"
   RRDTitle "Network latency ({type_instance})"
   RRDVerticalLabel "Milliseconds"
   RRDFormat "%5.2lfms"
@@ -567,6 +567,16 @@ GraphWidth 400
 <Type ps_cputime>
   Module PsCputime
 </Type>
+<Type ps_disk_octets>
+  Module GenericIO
+  DataSources read write
+  DSName "read Read   "
+  DSName write Written
+  RRDTitle "Process disk traffic ({instance})"
+  RRDVerticalLabel "Bytes per second"
+# RRDOptions ...
+  RRDFormat "%5.1lf%s"
+</Type>
 <Type ps_rss>
   DataSources value
   DSName value RSS
@@ -608,6 +618,13 @@ GraphWidth 400
   RRDFormat "%5.1lf%%"
   DSName "value Signal quality"
 </Type>
+<Type smart_temperature>
+  DataSources value
+  DSName value Temp
+  RRDTitle "Temperature ({instance})"
+  RRDVerticalLabel "°Celsius"
+  RRDFormat "%4.1lf°C"
+</Type>
 <Type snr>
   DataSources value
   RRDTitle "Signal / noise ratio ({instance})"
@@ -690,12 +707,12 @@ GraphWidth 400
   Scale 0.001
 </Type>
 <Type users>
-  DataSources users
-  DSName users Users
+  DataSources value
+  DSName value Users
   RRDTitle "Users ({type_instance}) on {hostname}"
   RRDVerticalLabel "Users"
   RRDFormat "%.1lf"
-  Color users 0000f0
+  Color value 0000f0
 </Type>
 <Type voltage>
   DataSources value