Merge branch 'collectd-4.10' into collectd-5.1

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

diff --git a/contrib/collection3/etc/collection.conf b/contrib/collection3/etc/collection.conf
index 9497d8e..5d1024f 100644 (file)
--- a/contrib/collection3/etc/collection.conf
+++ b/contrib/collection3/etc/collection.conf
@@ -2,7 +2,7 @@
 GraphWidth 400
 #UnixSockAddr "/var/run/collectd-unixsock"
 <Type apache_bytes>
 GraphWidth 400
 #UnixSockAddr "/var/run/collectd-unixsock"
 <Type apache_bytes>

-  DataSources count
+  DataSources value

   DSName "count Bytes/s"
   RRDTitle "Apache Traffic"
   RRDVerticalLabel "Bytes/s"
   DSName "count Bytes/s"
   RRDTitle "Apache Traffic"
   RRDVerticalLabel "Bytes/s"


@@ -10,7 +10,7 @@ GraphWidth 400
   Color count 0000ff
 </Type>
 <Type apache_requests>
   Color count 0000ff
 </Type>
 <Type apache_requests>

-  DataSources count
+  DataSources value

   DSName "count Requests/s"
   RRDTitle "Apache Traffic"
   RRDVerticalLabel "Requests/s"
   DSName "count Requests/s"
   RRDTitle "Apache Traffic"
   RRDVerticalLabel "Requests/s"


@@ -19,7 +19,7 @@ GraphWidth 400
 </Type>
 <Type apache_scoreboard>
   Module GenericStacked
 </Type>
 <Type apache_scoreboard>
   Module GenericStacked

-  DataSources count
+  DataSources value

   RRDTitle "Apache scoreboard on {hostname}"
   RRDVerticalLabel "Slots"
   RRDFormat "%6.2lf"
   RRDTitle "Apache scoreboard on {hostname}"
   RRDVerticalLabel "Slots"
   RRDFormat "%6.2lf"


@@ -47,6 +47,66 @@ GraphWidth 400
   Color starting     ff00ff
   Color waiting      ffb000
 </Type>
   Color starting     ff00ff
   Color waiting      ffb000
 </Type>

+<Type arc_counts>
+  Module ArcCounts
+  RRDTitle "ARC {type_instance} on {hostname}"
+# RRDOptions ...
+</Type>
+<Type arc_l2_bytes>
+  Module GenericIO
+  DataSources read write
+  DSName  "read Read   "
+  DSName "write Written"
+  RRDTitle "L2ARC traffic"
+  RRDVerticalLabel "Bytes per second"
+# RRDOptions ...
+  RRDFormat "%5.1lf%s"
+</Type>
+<Type arc_l2_size>
+  RRDTitle "L2ARC size on {hostname}"
+  RRDVerticalLabel "Size"
+  RRDFormat "%4.0lf%s"
+  RRDOptions -b 1024
+  DSName "value Current size"
+  Color value  00e000
+</Type>
+<Type arc_size>
+  DataSources "current target minlimit maxlimit"
+  RRDTitle "ARC size on {hostname}"
+  RRDVerticalLabel "Size"
+  RRDFormat "%4.0lf%s"
+  RRDOptions -b 1024
+  DSName  "current Current size"
+  DSName   "target Target size "
+  DSName "maxlimit Max size    "
+  DSName "minlimit Min size    "
+  Color current  00e000
+  Color target   0000ff
+  Color minlimit ff0000
+  Color maxlimit ff00ff
+</Type>
+<Type arc_ratio>
+  DataSources value
+  RRDTitle "{type_instance}ARC ratio on {hostname}"
+  RRDVerticalLabel "Ratio"
+  RRDFormat "%4.1lf"
+  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
+  RRDTitle "Cache hit ratio for {plugin_instance} {type_instance}"
+  RRDVerticalLabel "Percent"
+  RRDFormat "%5.1lf %%"
+</Type>

 <Type cpu>
   Module GenericStacked
   DataSources value
 <Type cpu>
   Module GenericStacked
   DataSources value


@@ -83,6 +143,39 @@ GraphWidth 400
   Module Df
   DataSources free used
 </Type>
   Module Df
   DataSources free used
 </Type>

+<Type df_complex>
+  Module GenericStacked
+  DataSources value
+  RRDTitle "Disk/Volume usage on {plugin_instance}"
+  RRDVerticalLabel "Byte"
+  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_normal_used  c10640
+  Color snap_reserved     f15aef
+  Color snap_reserve_used 820c81
+</Type>
+<Type disk_latency>
+  Module GenericIO
+  DataSources read write
+  DSName "read Read "
+  DSName write Write
+  RRDTitle "Disk Latency for {plugin_instance}"
+  RRDVerticalLabel "seconds"
+  Scale 0.000001
+  RRDFormat "%5.1lf %ss"
+</Type>

 <Type disk_octets>
   Module GenericIO
   DataSources read write
 <Type disk_octets>
   Module GenericIO
   DataSources read write


@@ -103,6 +196,26 @@ GraphWidth 400
 # RRDOptions ...
   RRDFormat "%5.1lf"
 </Type>
 # RRDOptions ...
   RRDFormat "%5.1lf"
 </Type>

+<Type disk_ops_complex>
+  Module GenericStacked
+  DataSources value
+  RRDTitle "Netapp disc ops on {plugin_instance}"
+  RRDVerticalLabel "Ops"
+  RRDFormat "%6.2lf"
+  DSName fcp_ops   FCP-Ops
+  DSName nfs_ops   NFS-Ops
+  DSName http_ops  HTTP-Ops
+  DSName cifs_ops  CIFS-Ops
+  DSName dafs_ops  DAFS-Ops
+  DSName iscsi_ops iSCSI-Ops
+  Order fcp_ops nfs_ops http_ops cifs_ops dafs_ops iscsi_ops
+  Color fcp_ops    000080
+  Color nfs_ops    ff0000
+  Color http_ops   ffb000
+  Color cifs_ops   00e0a0
+  Color dafs_ops   00e000
+  Color iscsi_ops  00e0ff
+</Type>

 <Type disk_merged>
   Module GenericIO
   DataSources read write
 <Type disk_merged>
   Module GenericIO
   DataSources read write


@@ -131,8 +244,15 @@ GraphWidth 400
   RRDVerticalLabel "Queries/s"
   RRDFormat "%6.1lf"
 </Type>
   RRDVerticalLabel "Queries/s"
   RRDFormat "%6.1lf"
 </Type>

+<Type conntrack>
+  DataSources value
+  DSName conntrack Conntrack count
+  RRDTitle "nf_conntrack connections on {hostname}"
+  RRDVerticalLabel "Count"
+  RRDFormat "%4.0lf"
+</Type>

 <Type entropy>
 <Type entropy>

-  DataSources entropy
+  DataSources value

   DSName entropy Entropy bits
   RRDTitle "Available entropy on {hostname}"
   RRDVerticalLabel "Bits"
   DSName entropy Entropy bits
   RRDTitle "Available entropy on {hostname}"
   RRDVerticalLabel "Bits"


@@ -147,7 +267,7 @@ GraphWidth 400
   Color value 00b000
 </Type>
 <Type frequency>
   Color value 00b000
 </Type>
 <Type frequency>

-  DataSources frequency
+  DataSources value

   DSName frequency Frequency
   RRDTitle "Frequency ({type_instance})"
   RRDVerticalLabel "Hertz"
   DSName frequency Frequency
   RRDTitle "Frequency ({type_instance})"
   RRDVerticalLabel "Hertz"


@@ -218,6 +338,13 @@ GraphWidth 400
 # RRDOptions ...
   RRDFormat "%5.1lf%s"
 </Type>
 # 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
 <Type io_octets>
   Module GenericIO
   DataSources rx tx


@@ -254,6 +381,10 @@ GraphWidth 400
 <Type load>
   Module Load
 </Type>
 <Type load>
   Module Load
 </Type>

+<Type java_memory>
+  Module JavaMemory
+  DataSources value
+</Type>

 <Type memory>
   Module GenericStacked
   DataSources value
 <Type memory>
   Module GenericStacked
   DataSources value


@@ -266,18 +397,32 @@ GraphWidth 400
   DSName "buffered Buffered"
   DSName   "locked Locked  "
   DSName     "used Used    "
   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 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 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
   DataSources value
 </Type>
 <Type mysql_commands>
   Module GenericStacked
   DataSources value

-  RRDTitle "MySQL commands"
+  RRDTitle "MySQL commands ({plugin_instance})"

   RRDVerticalLabel "Invocations"
   RRDFormat "%6.2lf"
 
   RRDVerticalLabel "Invocations"
   RRDFormat "%6.2lf"
 


@@ -361,7 +506,7 @@ GraphWidth 400
 <Type mysql_handler>
   Module GenericStacked
   DataSources value
 <Type mysql_handler>
   Module GenericStacked
   DataSources value

-  RRDTitle "MySQL handler"
+  RRDTitle "MySQL handler ({plugin_instance})"

   RRDVerticalLabel "Invocations"
   RRDFormat "%6.2lf"
   DSName commit commit
   RRDVerticalLabel "Invocations"
   RRDFormat "%6.2lf"
   DSName commit commit


@@ -391,13 +536,13 @@ GraphWidth 400
   DataSources rx tx
   DSName rx RX
   DSName tx TX
   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
 </Type>
 <Type percent>
   RRDVerticalLabel "Bits per second"
   RRDFormat "%5.1lf%s"
   Scale 8
 </Type>
 <Type percent>

-  DataSources percent
+  DataSources value

   DSName percent Percent
   RRDTitle "Percent ({type_instance})"
   RRDVerticalLabel "Percent"
   DSName percent Percent
   RRDTitle "Percent ({type_instance})"
   RRDVerticalLabel "Percent"


@@ -405,7 +550,7 @@ GraphWidth 400
   Color percent 0000ff
 </Type>
 <Type ping>
   Color percent 0000ff
 </Type>
 <Type ping>

-  DataSources ping
+  DataSources value

   DSName "ping Latency"
   RRDTitle "Network latency ({type_instance})"
   RRDVerticalLabel "Milliseconds"
   DSName "ping Latency"
   RRDTitle "Network latency ({type_instance})"
   RRDVerticalLabel "Milliseconds"


@@ -422,6 +567,16 @@ GraphWidth 400
 <Type ps_cputime>
   Module PsCputime
 </Type>
 <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
 <Type ps_rss>
   DataSources value
   DSName value RSS


@@ -434,7 +589,7 @@ GraphWidth 400
   DataSources value
   RRDTitle "Processes on {hostname}"
   RRDVerticalLabel "Processes"
   DataSources value
   RRDTitle "Processes on {hostname}"
   RRDVerticalLabel "Processes"

-  RRDFormat "%5.1lf%s"
+  RRDFormat "%5.1lf"

   DSName running  Running
   DSName sleeping Sleeping
   DSName paging   Paging
   DSName running  Running
   DSName sleeping Sleeping
   DSName paging   Paging


@@ -449,6 +604,27 @@ GraphWidth 400
   Color blocked  ff00ff
   Color stopped  a000a0
 </Type>
   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
 <Type swap>
   Module GenericStacked
   DataSources value


@@ -498,11 +674,33 @@ GraphWidth 400
   DataSources value
   DSName value Temp
   RRDTitle "Temperature ({instance})"
   DataSources value
   DSName value Temp
   RRDTitle "Temperature ({instance})"

-  RRDVerticalLabel "°Celsius"
-  RRDFormat "%4.1lf°C"
+  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"
+  RRDTitle "Time {instance}"
+  RRDVerticalLabel "Seconds"
+  RRDFormat "%6.2lf %ss"
+  Scale 0.001

 </Type>
 <Type users>
 </Type>
 <Type users>

-  DataSources users
+  DataSources value

   DSName users Users
   RRDTitle "Users ({type_instance}) on {hostname}"
   RRDVerticalLabel "Users"
   DSName users Users
   RRDTitle "Users ({type_instance}) on {hostname}"
   RRDVerticalLabel "Users"


@@ -525,4 +723,4 @@ GraphWidth 400
   RRDVerticalLabel "W"
   RRDFormat "%4.1lfW"
 </Type>
   RRDVerticalLabel "W"
   RRDFormat "%4.1lfW"
 </Type>

-# vim: set sw=2 sts=2 et syntax=apache fileencoding=latin-1 :
+# vim: set sw=2 sts=2 et syntax=apache fileencoding=utf-8 :