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

diff --git a/contrib/collection3/etc/collection.conf b/contrib/collection3/etc/collection.conf
index 1322d0d9..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"
@@ -93,6 +93,13 @@ GraphWidth 400
   RRDOptions -l 0
   DSName "value Hit ratio"
 </Type>
+<Type bitrate>
+  DataSources value
+  RRDTitle "Bitrate ({instance})"
+  RRDVerticalLabel "Bit/s"
+  RRDFormat "%5.1lf%s"
+  DSName "value Bitrate"
+</Type>
 <Type cache_ratio>
   DataSources value
   DSName value Percent
@@ -139,21 +146,25 @@ GraphWidth 400
 <Type df_complex>
   Module GenericStacked
   DataSources value
-  RRDTitle "disk usage on {plugin_instance}"
+  RRDTitle "Disk/Volume usage on {plugin_instance}"
   RRDVerticalLabel "Byte"
-  RRDFormat "%6.2lf%s"
-  DSName "snap_used    used for snapshots"
-  DSName "snap_reserved snapshot reserve "
-  DSName "used         in use            "
-  DSName "free         free              "
-  DSName "sis_saved    sis_saved         "
-  Order free snap_used snap_reserved sis_saved used
+  RRDFormat "%5.1lf%s"
+  DSName "sis_saved         SIS saved         "
+  DSName "reserved          Reserved          "
+  DSName "free              Free              "
+  DSName "used              Used              "
+  DSName "snap_normal_used  Snap used (normal)"
+  DSName "snap_reserved     Snap reserved     "
+  DSName "snap_reserve_used Snap used (resv)  "
+  Order sis_saved reserved free used snap_normal_used snap_reserved snap_reserve_used
+  Color sis_saved 00e0e0
+  Color reserved ffb000
+  Color free  00ff00
   Color snap_reverse   ff8000
   Color used  ff0000
-  Color snap_used   000080
-  Color snap_reserved   ff8000
-  Color free  00ff00
-  Color sis_saved 00e0e0
+  Color snap_normal_used  c10640
+  Color snap_reserved     f15aef
+  Color snap_reserve_used 820c81
 </Type>
 <Type disk_latency>
   Module GenericIO
@@ -234,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"
@@ -256,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
@@ -386,13 +397,27 @@ GraphWidth 400
   DSName "buffered Buffered"
   DSName   "locked Locked  "
   DSName     "used Used    "
+  DSName     "available Available    "
+  DSName  "system_cache System Cache "
+  DSName    "pool_paged Paged Pool   "
+  DSName "pool_nonpaged Nonpaged Pool"
+  DSName   "working_set Working Set  "
+  DSName   "system_code System Code  "
+  DSName "system_driver System Driver"
   #Order used buffered cached free
-  Order free cached buffered used
+  Order free cached buffered used available system_cache system_driver system_code pool_paged pool_nonpaged working_set
   Color free      00e000
   Color cached    0000ff
   Color buffered  ffb000
   Color locked    ff00ff
   Color used      ff0000
+  Color available      00e000
+  Color system_cache   0000ff
+  Color system_driver  ff00ff
+  Color system_code    a000a0
+  Color pool_paged     ffb000
+  Color pool_nonpaged  ff8000
+  Color working_set    ff0000
 </Type>
 <Type mysql_commands>
   Module GenericStacked
@@ -517,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"
@@ -542,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
@@ -569,6 +604,34 @@ GraphWidth 400
   Color blocked  ff00ff
   Color stopped  a000a0
 </Type>
+<Type signal_power>
+  DataSources value
+  RRDTitle "Signal power ({instance})"
+  RRDVerticalLabel "dB"
+  RRDFormat "%5.1lf"
+  DSName "value Signal power"
+</Type>
+<Type signal_quality>
+  DataSources value
+  RRDTitle "Signal quality ({instance})"
+  RRDVerticalLabel "Percent"
+  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})"
+  RRDVerticalLabel "dBm"
+  RRDFormat "%5.1lf"
+  DSName "value S/N"
+</Type>
 <Type swap>
   Module GenericStacked
   DataSources value
@@ -644,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