X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=contrib%2Fcollection3%2Fetc%2Fcollection.conf;h=3bb3d8b125de6d9a2ac0209f917685a560332277;hb=83077c18c3e78739c2d2d18debf99875944eaa72;hp=f15ea56fd1fd8eeefd381758f20bc2a3e4ce3606;hpb=91743fc0c8785f84f3976d5f5d430b1b3a7d4918;p=collectd.git

diff --git a/contrib/collection3/etc/collection.conf b/contrib/collection3/etc/collection.conf
index f15ea56f..3bb3d8b1 100644
--- a/contrib/collection3/etc/collection.conf
+++ b/contrib/collection3/etc/collection.conf
@@ -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
@@ -161,7 +172,7 @@ GraphWidth 400
   DSName "read Read "
   DSName write Write
   RRDTitle "Disk Latency for {plugin_instance}"
-  RRDVerticalLabel "microseconds"
+  RRDVerticalLabel "seconds"
   Scale 0.000001
   RRDFormat "%5.1lf %ss"
 </Type>
@@ -327,6 +338,13 @@ GraphWidth 400
 # RRDOptions ...
   RRDFormat "%5.1lf%s"
 </Type>
+<Type invocations>
+  DataSources value
+  DSName "value Invocations/s"
+  RRDTitle "Invocations ({instance})"
+  RRDVerticalLabel "Invocations/s"
+  RRDFormat "%5.1lf"
+</Type>
 <Type io_octets>
   Module GenericIO
   DataSources rx tx
@@ -379,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
@@ -535,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
@@ -562,6 +604,27 @@ 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 snr>
+  DataSources value
+  RRDTitle "Signal / noise ratio ({instance})"
+  RRDVerticalLabel "dBm"
+  RRDFormat "%5.1lf"
+  DSName "value S/N"
+</Type>
 <Type swap>
   Module GenericStacked
   DataSources value
@@ -614,6 +677,20 @@ GraphWidth 400
   RRDVerticalLabel "°Celsius"
   RRDFormat "%4.1lf°C"
 </Type>
+<Type threads>
+  DataSources value
+  DSName "value Threads"
+  RRDTitle "Threads ({instance})"
+  RRDVerticalLabel "Threads"
+  RRDFormat "%5.2lf"
+</Type>
+<Type total_requests>
+  DataSources value
+  DSName "value Requests/s"
+  RRDTitle "Requests ({instance})"
+  RRDVerticalLabel "Requests/s"
+  RRDFormat "%6.2lf"
+</Type>
 <Type total_time_in_ms>
   DataSources value
   DSName "value Time"