write_http plugin: Remove custom string and boolean config handlers.

[collectd.git] / src / collectd.conf.pod

diff --git a/src/collectd.conf.pod b/src/collectd.conf.pod
index 43803ba..a14a8f6 100644 (file)
--- a/src/collectd.conf.pod
+++ b/src/collectd.conf.pod
@@ -9,14 +9,14 @@ collectd.conf - Configuration for the system statistics collection daemon B<coll
   BaseDir "/path/to/data/"
   PIDFile "/path/to/pidfile/collectd.pid"
   Server  "123.123.123.123" 12345
   BaseDir "/path/to/data/"
   PIDFile "/path/to/pidfile/collectd.pid"
   Server  "123.123.123.123" 12345

-  
+

   LoadPlugin cpu
   LoadPlugin load
   LoadPlugin cpu
   LoadPlugin load

-  
+

   <LoadPlugin df>
     Interval 3600
   </LoadPlugin>
   <LoadPlugin df>
     Interval 3600
   </LoadPlugin>

-  
+

   LoadPlugin ping
   <Plugin ping>
     Host "example.org"
   LoadPlugin ping
   <Plugin ping>
     Host "example.org"


@@ -235,23 +235,35 @@ Number of threads to start for dispatching value lists to write plugins. The
 default value is B<5>, but you may want to increase this if you have more than
 five plugins that may take relatively long to write to.
 
 default value is B<5>, but you may want to increase this if you have more than
 five plugins that may take relatively long to write to.
 

-=item B<WriteQueueLengthLimitHigh> I<Num>
+=item B<WriteQueueLimitHigh> I<HighNum>

 
 

-=item B<WriteQueueLengthLimitLow> I<Num>
+=item B<WriteQueueLimitLow> I<LowNum>

 
 

-Default value for high limit is 0 (no limit).
-Default value for low limit is 50% of high limit.
+Metrics are read by the I<read threads> and then put into a queue to be handled
+by the I<write threads>. If one of the I<write plugins> is slow (e.g. network
+timeouts, I/O saturation of the disk) this queue will grow. In order to avoid
+running into memory issues in such a case, you can limit the size of this
+queue.

 
 

-When the write queue size becomes bigger than the high limit, values I<will> be dropped.
-When the write queue size is between low and high, values I<may> be dropped (depending
-on the queue size)
+By default, there is no limit and memory may grow indefinitely. This is most
+likely not an issue for clients, i.e. instances that only handle the local
+metrics. For servers it is recommended to set this to a non-zero value, though.

 
 

-If high limit is set to 0, there is no limit. This is the default.
-If high limit is set, but not low limit, low will be computed as 50% of high.
+You can set the limits using B<WriteQueueLimitHigh> and B<WriteQueueLimitLow>.
+Each of them takes a numerical argument which is the number of metrics in the
+queue. If there are I<HighNum> metrics in the queue, any new metrics I<will> be
+dropped. If there are less than I<LowNum> metrics in the queue, all new metrics
+I<will> be enqueued. If the number of metrics currently in the queue is between
+I<LowNum> and I<HighNum>, the metric is dropped with a probability that is
+proportional to the number of metrics in the queue (i.e. it increases linearly
+until it reaches 100%.)

 
 

-If you do not want to randomly drop values when the queue size is between low
-and high value, set the same value for low and high. When low=high and when the
-queue size is bigger, values are just dropped until the queue size becomes smaller.
+If B<WriteQueueLimitHigh> is set to non-zero and B<WriteQueueLimitLow> is
+unset, the latter will default to half of B<WriteQueueLimitHigh>.
+
+If you do not want to randomly drop values when the queue size is between
+I<LowNum> and I<HighNum>, set If B<WriteQueueLimitHigh> and
+B<WriteQueueLimitLow> to same value.

 
 =item B<Hostname> I<Name>
 
 
 =item B<Hostname> I<Name>
 


@@ -329,10 +341,10 @@ The full example configuration looks like this:
    <Aggregation>
      Plugin "cpu"
      Type "cpu"
    <Aggregation>
      Plugin "cpu"
      Type "cpu"

-     
+

      GroupBy "Host"
      GroupBy "TypeInstance"
      GroupBy "Host"
      GroupBy "TypeInstance"

-     
+

      CalculateSum true
      CalculateAverage true
    </Aggregation>
      CalculateSum true
      CalculateAverage true
    </Aggregation>


@@ -408,13 +420,13 @@ The following example calculates the average usage of all "even" CPUs:
      Plugin "cpu"
      PluginInstance "/[0,2,4,6,8]$/"
      Type "cpu"
      Plugin "cpu"
      PluginInstance "/[0,2,4,6,8]$/"
      Type "cpu"

-     
+

      SetPlugin "cpu"
      SetPluginInstance "even-%{aggregation}"
      SetPlugin "cpu"
      SetPluginInstance "even-%{aggregation}"

-     
+

      GroupBy "Host"
      GroupBy "TypeInstance"
      GroupBy "Host"
      GroupBy "TypeInstance"

-     
+

      CalculateAverage true
    </Aggregation>
  </Plugin>
      CalculateAverage true
    </Aggregation>
  </Plugin>


@@ -483,7 +495,7 @@ possibly filtering or messages.
  #   GraphitePrefix "collectd."
  #   GraphiteEscapeChar "_"
    </Publish>
  #   GraphitePrefix "collectd."
  #   GraphiteEscapeChar "_"
    </Publish>

-   
+

    # Receive values from an AMQP broker
    <Subscribe "some_name">
      Host "localhost"
    # Receive values from an AMQP broker
    <Subscribe "some_name">
      Host "localhost"


@@ -718,6 +730,29 @@ default for backwards compatibility, the time will be reported in minutes.
 
 =back
 
 
 =back
 

+=head2 Plugin C<aquaero>
+
+This plugin collects the value of the available sensors in an
+I<AquaeroE<nbsp>5> board. AquaeroE<nbsp>5 is a water-cooling controller board,
+manufactured by Aqua Computer GmbH L<http://www.aquacomputer.de/>, with a USB2
+connection for monitoring and configuration. The board can handle multiple
+temperature sensors, fans, water pumps and water level sensors and adjust the
+output settings such as fan voltage or power used by the water pump based on
+the available inputs using a configurable controller included in the board.
+This plugin collects all the available inputs as well as some of the output
+values chosen by this controller. The plugin is based on the I<libaquaero5>
+library provided by I<aquatools-ng>.
+
+=over 4
+
+=item B<Device> I<DevicePath>
+
+Device path of the AquaeroE<nbsp>5's USB HID (human interface device), usually
+in the form C</dev/usb/hiddevX>. If this option is no set the plugin will try
+to auto-detect the Aquaero 5 USB device based on vendor-ID and product-ID.
+
+=back
+

 =head2 Plugin C<ascent>
 
 This plugin collects information about an Ascent server, a free server for the
 =head2 Plugin C<ascent>
 
 This plugin collects information about an Ascent server, a free server for the


@@ -787,17 +822,17 @@ Synopsis:
    ParseTime       false
    OpCodes         true
    QTypes          true
    ParseTime       false
    OpCodes         true
    QTypes          true

- 
+

    ServerStats     true
    ZoneMaintStats  true
    ResolverStats   false
    MemoryStats     true
    ServerStats     true
    ZoneMaintStats  true
    ResolverStats   false
    MemoryStats     true

- 
+

    <View "_default">
      QTypes        true
      ResolverStats true
      CacheRRSets   true
    <View "_default">
      QTypes        true
      ResolverStats true
      CacheRRSets   true

- 
+

      Zone "127.in-addr.arpa/IN"
    </View>
  </Plugin>
      Zone "127.in-addr.arpa/IN"
    </View>
  </Plugin>


@@ -938,6 +973,31 @@ at all, B<all> cgroups are selected.
 
 =back
 
 
 =back
 

+=head2 Plugin C<cpu>
+
+The I<CPU plugin> collects CPU usage metrics.
+
+The following configuration options are available:
+
+=over 4
+
+=item B<ReportActive> B<false>|B<true>
+
+Reports non-idle CPU usage as the "active" value. Defaults to false.
+
+=item B<ReportByCpu> B<false>|B<true>
+
+When true reports usage for all cores. When false, reports cpu usage
+aggregated over all cores. Implies ValuesPercentage when false.
+Defaults to true.
+
+=item B<ValuesPercentage> B<false>|B<true>
+
+When true report percentage usage instead of tick values. Defaults to false.
+
+=back
+
+

 =head2 Plugin C<cpufreq>
 
 This plugin doesn't have any options. It reads
 =head2 Plugin C<cpufreq>
 
 This plugin doesn't have any options. It reads


@@ -1011,6 +1071,10 @@ Username to use if authorization is required to read the page.
 
 Password to use if authorization is required to read the page.
 
 
 Password to use if authorization is required to read the page.
 

+=item B<Digest> B<true>|B<false>
+
+Enable HTTP digest authentication.
+

 =item B<VerifyPeer> B<true>|B<false>
 
 Enable or disable peer SSL certificate verification. See
 =item B<VerifyPeer> B<true>|B<false>
 
 Enable or disable peer SSL certificate verification. See


@@ -1060,13 +1124,15 @@ is set to B<true>, B<Match> blocks are optional.
 
 =head2 Plugin C<curl_json>
 
 
 =head2 Plugin C<curl_json>
 

-The B<curl_json plugin> uses B<libcurl> (L<http://curl.haxx.se/>) and
-B<libyajl> (L<http://www.lloydforge.org/projects/yajl/>) to retrieve JSON data
-via cURL. This can be used to collect values from CouchDB documents (which are
-stored JSON notation), for example.
+The B<curl_json plugin> collects values from JSON data to be parsed by
+B<libyajl> (L<http://www.lloydforge.org/projects/yajl/>) retrieved via
+either B<libcurl> (L<http://curl.haxx.se/>) or read directly from a
+unix socket. The former can be used, for example, to collect values
+from CouchDB documents (which are stored JSON notation), and the
+latter to collect values from a uWSGI stats socket.

 
 

-The following example will collect several values from the built-in `_stats'
-runtime statistics module of CouchDB
+The following example will collect several values from the built-in
+C<_stats> runtime statistics module of I<CouchDB>

 (L<http://wiki.apache.org/couchdb/Runtime_Statistics>).
 
   <Plugin curl_json>
 (L<http://wiki.apache.org/couchdb/Runtime_Statistics>).
 
   <Plugin curl_json>


@@ -1086,11 +1152,30 @@ runtime statistics module of CouchDB
     </URL>
   </Plugin>
 
     </URL>
   </Plugin>
 

-In the B<Plugin> block, there may be one or more B<URL> blocks, each defining
-a URL to be fetched via HTTP (using libcurl) and one or more B<Key> blocks.
-The B<Key> string argument must be in a path format, which is used to collect a
-value from a JSON map object. If a path element of B<Key> is the
-I<*>E<nbsp>wildcard, the values for all keys will be collectd.
+This example will collect data directly from a I<uWSGI> "Stats Server" socket.
+
+  <Plugin curl_json>
+    <Sock "/var/run/uwsgi.stats.sock">
+      Instance "uwsgi"
+      <Key "workers/*/requests">
+        Type "http_requests"
+      </Key>
+
+      <Key "workers/*/apps/*/requests">
+        Type "http_requests"
+      </Key>
+    </Sock>
+  </Plugin>
+
+In the B<Plugin> block, there may be one or more B<URL> blocks, each
+defining a URL to be fetched via HTTP (using libcurl) or B<Sock>
+blocks defining a unix socket to read JSON from directly.  Each of
+these blocks may have one or more B<Key> blocks.
+
+The B<Key> string argument must be in a path format. Each component is
+used to match the key from a JSON map or the index of an JSON
+array. If a path component of a B<Key> is a I<*>E<nbsp>wildcard, the
+values for all map keys or array indices will be collectd.

 
 The following options are valid within B<URL> blocks:
 
 
 The following options are valid within B<URL> blocks:
 


@@ -1101,11 +1186,19 @@ The following options are valid within B<URL> blocks:
 Sets the plugin instance to I<Instance>.
 
 =item B<User> I<Name>
 Sets the plugin instance to I<Instance>.
 
 =item B<User> I<Name>

+

 =item B<Password> I<Password>
 =item B<Password> I<Password>

+
+=item B<Digest> B<true>|B<false>
+

 =item B<VerifyPeer> B<true>|B<false>
 =item B<VerifyPeer> B<true>|B<false>

+

 =item B<VerifyHost> B<true>|B<false>
 =item B<VerifyHost> B<true>|B<false>

+

 =item B<CACert> I<file>
 =item B<CACert> I<file>

+

 =item B<Header> I<Header>
 =item B<Header> I<Header>

+

 =item B<Post> I<Body>
 
 These options behave exactly equivalent to the appropriate options of the
 =item B<Post> I<Body>
 
 These options behave exactly equivalent to the appropriate options of the


@@ -1194,6 +1287,8 @@ Examples:
 
 =item B<Password> I<Password>
 
 
 =item B<Password> I<Password>
 

+=item B<Digest> B<true>|B<false>
+

 =item B<VerifyPeer> B<true>|B<false>
 
 =item B<VerifyHost> B<true>|B<false>
 =item B<VerifyPeer> B<true>|B<false>
 
 =item B<VerifyHost> B<true>|B<false>


@@ -1547,17 +1642,17 @@ transfer agents and web caches.
 
 =item B<ValuesAbsolute> B<true>|B<false>
 
 
 =item B<ValuesAbsolute> B<true>|B<false>
 

-Enables or disables reporting of free, used and used disk space in 1K-blocks. 
-Defaults to true.
+Enables or disables reporting of free and used disk space in 1K-blocks.
+Defaults to B<true>.

 
 

-=item B<ValuesPercentage> B<true>|B<false>
+=item B<ValuesPercentage> B<false>|B<true>

 
 

-Enables or disables reporting of free, used and used disk space in percentage.
-Defaults to false.
+Enables or disables reporting of free and used disk space in percentage.
+Defaults to B<false>.

 
 

-This is useful for deploying collectd on the cloud, where machines with
-different disk size may exist. Then it is more practical to configure thresholds
-based on relative disk size.
+This is useful for deploying I<collectd> on the cloud, where machines with
+different disk size may exist. Then it is more practical to configure
+thresholds based on relative disk size.

 
 =back
 
 
 =back
 


@@ -2143,6 +2238,25 @@ interface path might change between reboots of a guest or across migrations.
 
 =back
 
 
 =back
 

++=head2 Plugin C<load>
+
+The I<Load plugin> collects the system load. These numbers give a rough overview
+over the utilization of a machine. The system load is defined as the number of
+runnable tasks in the run-queue and is provided by many operating systems as a
+one, five or fifteen minute average.
+
+The following configuration options are available:
+
+=over 4
+
+=item B<ReportRelative> B<false>|B<true>
+
+When enabled, system load divided by number of available CPU cores is reported
+for intervals 1 min, 5 min and 15 min. Defaults to false.
+
+=back
+
+

 =head2 Plugin C<logfile>
 
 =over 4
 =head2 Plugin C<logfile>
 
 =over 4


@@ -2350,7 +2464,7 @@ B<Synopsis:>
    ShowCPU true
    ShowCPUCores true
    ShowMemory true
    ShowCPU true
    ShowCPUCores true
    ShowMemory true

-   
+

    ShowTemperatures true
    Temperature vddg
    Temperature vddq
    ShowTemperatures true
    Temperature vddg
    Temperature vddq


@@ -2359,7 +2473,7 @@ B<Synopsis:>
    ShowPower true
    Power total0
    Power total1
    ShowPower true
    Power total0
    Power total1

-   IgnoreSelectedPower true   
+   IgnoreSelectedPower true

  </Plugin>
 
 The following options are valid inside the B<PluginE<nbsp>mic> block:
  </Plugin>
 
 The following options are valid inside the B<PluginE<nbsp>mic> block:


@@ -2416,7 +2530,7 @@ Fan In
 
 =item fout
 
 
 =item fout
 

-Fan Out 
+Fan Out

 
 =item vccp
 
 
 =item vccp
 


@@ -2457,11 +2571,11 @@ Known power names are:
 
 =item total0
 
 
 =item total0
 

-Total power utilization averaged over Time Window 0 (uWatts). 
+Total power utilization averaged over Time Window 0 (uWatts).

 
 =item total1
 
 
 =item total1
 

-Total power utilization averaged over Time Window 0 (uWatts). 
+Total power utilization averaged over Time Window 0 (uWatts).

 
 =item inst
 
 
 =item inst
 


@@ -2469,36 +2583,57 @@ Instantaneous power (uWatts).
 
 =item imax
 
 
 =item imax
 

-Max instantaneous power (uWatts). 
+Max instantaneous power (uWatts).

 
 =item pcie
 
 
 =item pcie
 

-PCI-E connector power (uWatts). 
+PCI-E connector power (uWatts).

 
 =item c2x3
 
 
 =item c2x3
 

-2x3 connector power (uWatts). 
+2x3 connector power (uWatts).

 
 =item c2x4
 
 
 =item c2x4
 

-2x4 connector power (uWatts). 
+2x4 connector power (uWatts).

 
 =item vccp
 
 
 =item vccp
 

-Core rail (uVolts). 
+Core rail (uVolts).

 
 =item vddg
 
 
 =item vddg
 

-Uncore rail (uVolts). 
+Uncore rail (uVolts).

 
 =item vddq
 
 
 =item vddq
 

-Memory subsystem rail (uVolts). 
+Memory subsystem rail (uVolts).

 
 =back
 
 =back
 
 
 =back
 
 =back
 

+=head2 Plugin C<memory>
+
+The I<memory plugin> provides the following configuration options:
+
+=over 4
+
+=item B<ValuesAbsolute> B<true>|B<false>
+
+Enables or disables reporting of physical memory usage in absolute numbers,
+i.e. bytes. Defaults to B<true>.
+
+=item B<ValuesPercentage> B<false>|B<true>
+
+Enables or disables reporting of physical memory usage in percentages, e.g.
+percent of physical memory used. Defaults to B<false>.
+
+This is useful for deploying I<collectd> in a heterogeneous environment in
+which the sizes of physical memory vary.
+
+=back
+

 =head2 Plugin C<modbus>
 
 The B<modbus plugin> connects to a Modbus "slave" via Modbus/TCP and reads
 =head2 Plugin C<modbus>
 
 The B<modbus plugin> connects to a Modbus "slave" via Modbus/TCP and reads


@@ -2514,19 +2649,19 @@ B<Synopsis:>
    Type voltage
    Instance "input-1"
  </Data>
    Type voltage
    Instance "input-1"
  </Data>

- 
+

  <Data "voltage-input-2">
    RegisterBase 2
    RegisterType float
    Type voltage
    Instance "input-2"
  </Data>
  <Data "voltage-input-2">
    RegisterBase 2
    RegisterType float
    Type voltage
    Instance "input-2"
  </Data>

- 
+

  <Host "modbus.example.com">
    Address "192.168.0.42"
    Port    "502"
    Interval 60
  <Host "modbus.example.com">
    Address "192.168.0.42"
    Port    "502"
    Interval 60

-   
+

    <Slave 1>
      Instance "power-supply"
      Collect  "voltage-input-1"
    <Slave 1>
      Instance "power-supply"
      Collect  "voltage-input-1"


@@ -2759,7 +2894,7 @@ Required capabilities are documented below.
     User          "username"
     Password      "aef4Aebe"
     Interval      30
     User          "username"
     Password      "aef4Aebe"
     Interval      30

-    
+

     <WAFL>
       Interval 30
       GetNameCache   true
     <WAFL>
       Interval 30
       GetNameCache   true


@@ -2767,12 +2902,12 @@ Required capabilities are documented below.
       GetBufferCache true
       GetInodeCache  true
     </WAFL>
       GetBufferCache true
       GetInodeCache  true
     </WAFL>

-    
+

     <Disks>
       Interval 30
       GetBusy true
     </Disks>
     <Disks>
       Interval 30
       GetBusy true
     </Disks>

-    
+

     <VolumePerf>
       Interval 30
       GetIO      "volume0"
     <VolumePerf>
       Interval 30
       GetIO      "volume0"


@@ -2782,7 +2917,7 @@ Required capabilities are documented below.
       GetLatency "volume0"
       IgnoreSelectedLatency false
     </VolumePerf>
       GetLatency "volume0"
       IgnoreSelectedLatency false
     </VolumePerf>

-    
+

     <VolumeUsage>
       Interval 30
       GetCapacity "vol0"
     <VolumeUsage>
       Interval 30
       GetCapacity "vol0"


@@ -2792,15 +2927,15 @@ Required capabilities are documented below.
       GetSnapshot "vol3"
       IgnoreSelectedSnapshot false
     </VolumeUsage>
       GetSnapshot "vol3"
       IgnoreSelectedSnapshot false
     </VolumeUsage>

-    
+

     <Quota>
       Interval 60
     </Quota>
     <Quota>
       Interval 60
     </Quota>

-    
+

     <Snapvault>
       Interval 30
     </Snapvault>
     <Snapvault>
       Interval 30
     </Snapvault>

-    
+

     <System>
       Interval 30
       GetCPULoad     true
     <System>
       Interval 30
       GetCPULoad     true


@@ -3361,7 +3496,7 @@ signature):
    # Export to an internal server
    # (demonstrates usage without additional options)
    Server "collectd.internal.tld"
    # Export to an internal server
    # (demonstrates usage without additional options)
    Server "collectd.internal.tld"

-   
+

    # Export to an external server
    # (demonstrates usage with signature options)
    <Server "collectd.external.tld">
    # Export to an external server
    # (demonstrates usage with signature options)
    <Server "collectd.external.tld">


@@ -5136,12 +5271,129 @@ and all other sensors are collected.
 
 =back
 
 
 =back
 

+=head2 Plugin C<sigrok>
+
+The I<sigrok plugin> uses I<libsigrok> to retrieve measurements from any device
+supported by the L<sigrok|http://sigrok.org/> project.
+
+B<Synopsis>
+
+ <Plugin sigrok>
+   LogLevel 3
+   <Device "AC Voltage">
+      Driver "fluke-dmm"
+      MinimumInterval 10
+      Conn "/dev/ttyUSB2"
+   </Device>
+   <Device "Sound Level">
+      Driver "cem-dt-885x"
+      Conn "/dev/ttyUSB1"
+   </Device>
+ </Plugin>
+
+=over 4
+
+=item B<LogLevel> B<0-5>
+
+The I<sigrok> logging level to pass on to the I<collectd> log, as a number
+between B<0> and B<5> (inclusive). These levels correspond to C<None>,
+C<Errors>, C<Warnings>, C<Informational>, C<Debug >and C<Spew>, respectively.
+The default is B<2> (C<Warnings>). The I<sigrok> log messages, regardless of
+their level, are always submitted to I<collectd> at its INFO log level.
+
+=item E<lt>B<Device> I<Name>E<gt>
+
+A sigrok-supported device, uniquely identified by this section's options. The
+I<Name> is passed to I<collectd> as the I<plugin instance>.
+
+=item B<Driver> I<DriverName>
+
+The sigrok driver to use for this device.
+
+=item B<Conn> I<ConnectionSpec>
+
+If the device cannot be auto-discovered, or more than one might be discovered
+by the driver, I<ConnectionSpec> specifies the connection string to the device.
+It can be of the form of a device path (e.g.E<nbsp>C</dev/ttyUSB2>), or, in
+case of a non-serial USB-connected device, the USB I<VendorID>B<.>I<ProductID>
+separated by a period (e.g.E<nbsp>C<0403.6001>). A USB device can also be
+specified as I<Bus>B<.>I<Address> (e.g.E<nbsp>C<1.41>).
+
+=item B<SerialComm> I<SerialSpec>
+
+For serial devices with non-standard port settings, this option can be used
+to specify them in a form understood by I<sigrok>, e.g.E<nbsp>C<9600/8n1>.
+This should not be necessary; drivers know how to communicate with devices they
+support.
+
+=item B<MinimumInterval> I<Seconds>
+
+Specifies the minimum time between measurement dispatches to I<collectd>, in
+seconds. Since some I<sigrok> supported devices can acquire measurements many
+times per second, it may be necessary to throttle these. For example, the
+I<RRD plugin> cannot process writes more than once per second.
+
+The default B<MinimumInterval> is B<0>, meaning measurements received from the
+device are always dispatched to I<collectd>. When throttled, unused
+measurements are discarded.
+
+=back
+

 =head2 Plugin C<snmp>
 
 Since the configuration of the C<snmp plugin> is a little more complicated than
 other plugins, its documentation has been moved to an own manpage,
 L<collectd-snmp(5)>. Please see there for details.
 
 =head2 Plugin C<snmp>
 
 Since the configuration of the C<snmp plugin> is a little more complicated than
 other plugins, its documentation has been moved to an own manpage,
 L<collectd-snmp(5)>. Please see there for details.
 

+=head2 Plugin C<statsd>
+
+The I<statsd plugin> listens to a UDP socket, reads "events" in the statsd
+protocol and dispatches rates or other aggregates of these numbers
+periodically.
+
+The plugin implements the I<Counter>, I<Timer>, I<Gauge> and I<Set> types which
+are dispatched as the I<collectd> types C<derive>, C<latency>, C<gauge> and
+C<objects> respectively.
+
+The following configuration options are valid:
+
+=over 4
+
+=item B<Host> I<Host>
+
+Bind to the hostname / address I<Host>. By default, the plugin will bind to the
+"any" address, i.e. accept packets sent to any of the hosts addresses.
+
+=item B<Port> I<Port>
+
+UDP port to listen to. This can be either a service name or a port number.
+Defaults to C<8125>.
+
+=item B<DeleteCounters> B<false>|B<true>
+
+=item B<DeleteTimers> B<false>|B<true>
+
+=item B<DeleteGauges> B<false>|B<true>
+
+=item B<DeleteSets> B<false>|B<true>
+
+These options control what happens if metrics are not updated in an interval.
+If set to B<False>, the default, metrics are dispatched unchanged, i.e. the
+rate of counters and size of sets will be zero, timers report C<NaN> and gauges
+are unchanged. If set to B<True>, the such metrics are not dispatched and
+removed from the internal cache.
+
+=item B<TimerPercentile> I<Percent>
+
+Calculate and dispatch the configured percentile, i.e. compute the latency, so
+that I<Percent> of all reported timers are smaller than or equal to the
+computed latency. This is useful for cutting off the long tail latency, as it's
+often done in I<Service Level Agreements> (SLAs).
+
+If not specified, no percentile is calculated / dispatched.
+
+=back
+

 =head2 Plugin C<swap>
 
 The I<Swap plugin> collects information about used and available swap space. On
 =head2 Plugin C<swap>
 
 The I<Swap plugin> collects information about used and available swap space. On


@@ -5164,6 +5416,19 @@ This option is only available if the I<Swap plugin> can read C</proc/swaps>
 When enabled, the I<swap I/O> is reported in bytes. When disabled, the default,
 I<swap I/O> is reported in pages. This option is available under Linux only.
 
 When enabled, the I<swap I/O> is reported in bytes. When disabled, the default,
 I<swap I/O> is reported in pages. This option is available under Linux only.
 

+=item B<ValuesAbsolute> B<true>|B<false>
+
+Enables or disables reporting of absolute swap metrics, i.e. number of I<bytes>
+available and used. Defaults to B<true>.
+
+=item B<ValuesPercentage> B<false>|B<true>
+
+Enables or disables reporting of relative swap metrics, i.e. I<percent>
+available and free. Defaults to B<false>.
+
+This is useful for deploying I<collectd> in a heterogeneous environment, where
+swap sizes differ and you want to specify generic thresholds or similar.
+

 =back
 
 =head2 Plugin C<syslog>
 =back
 
 =head2 Plugin C<syslog>


@@ -5299,6 +5564,7 @@ user using (extended) regular expressions, as described in L<regex(7)>.
   <Plugin "tail">
     <File "/var/log/exim4/mainlog">
       Instance "exim"
   <Plugin "tail">
     <File "/var/log/exim4/mainlog">
       Instance "exim"

+      Interval 60

       <Match>
         Regex "S=([1-9][0-9]*)"
         DSType "CounterAdd"
       <Match>
         Regex "S=([1-9][0-9]*)"
         DSType "CounterAdd"


@@ -5325,6 +5591,9 @@ This plugin instance is for all B<Match> blocks that B<follow> it, until the
 next B<Instance> option. This way you can extract several plugin instances from
 one logfile, handy when parsing syslog and the like.
 
 next B<Instance> option. This way you can extract several plugin instances from
 one logfile, handy when parsing syslog and the like.
 

+The B<Interval> option allows you to define the length of time between reads. If
+this is not set, the default Interval will be used.
+

 Each B<Match> block has the following options to describe how the match should
 be performed:
 
 Each B<Match> block has the following options to describe how the match should
 be performed:
 


@@ -5912,7 +6181,7 @@ Synopsis:
    <Node "example">
      Host "localhost"
      Port "2003"
    <Node "example">
      Host "localhost"
      Port "2003"

-     Protocol "udp"
+     Protocol "tcp"

      LogSendErrors true
      Prefix "collectd"
    </Node>
      LogSendErrors true
      Prefix "collectd"
    </Node>


@@ -6115,6 +6384,7 @@ Synopsis:
      TTLFactor 2.0
    </Node>
    Tag "foobar"
      TTLFactor 2.0
    </Node>
    Tag "foobar"

+   Attribute "foo" "bar"

  </Plugin>
 
 The following options are understood by the I<write_riemann plugin>:
  </Plugin>
 
 The following options are understood by the I<write_riemann plugin>:


@@ -6175,6 +6445,11 @@ default value.
 Add the given string as an additional tag to the metric being sent to
 I<Riemann>.
 
 Add the given string as an additional tag to the metric being sent to
 I<Riemann>.
 

+=item B<Attribute> I<String> I<String>
+
+Consider the two given strings to be the key and value of an additional
+attribute for each metric being sent out to I<Riemann>.
+

 =back
 
 =head1 THRESHOLD CONFIGURATION
 =back
 
 =head1 THRESHOLD CONFIGURATION


@@ -6209,7 +6484,7 @@ When a value comes within range again or is received after it was missing, an
 Here is a configuration example to get you started. Read below for more
 information.
 
 Here is a configuration example to get you started. Read below for more
 information.
 

- <Threshold>
+ <Plugin threshold>

    <Type "foo">
      WarningMin    0.00
      WarningMax 1000.00
    <Type "foo">
      WarningMin    0.00
      WarningMax 1000.00


@@ -6240,7 +6515,7 @@ information.
        </Type>
      </Plugin>
    </Host>
        </Type>
      </Plugin>
    </Host>

- </Threshold>
+ </Plugin>

 
 There are basically two types of configuration statements: The C<Host>,
 C<Plugin>, and C<Type> blocks select the value for which a threshold should be
 
 There are basically two types of configuration statements: The C<Host>,
 C<Plugin>, and C<Type> blocks select the value for which a threshold should be


@@ -6829,7 +7104,7 @@ Example:
    Max 100
    Satisfy "All"
  </Match>
    Max 100
    Satisfy "All"
  </Match>

- 
+

  # Match if the value of any data source is outside the range of 0 - 100.
  <Match "value">
    Min   0
  # Match if the value of any data source is outside the range of 0 - 100.
  <Match "value">
    Min   0


@@ -7011,7 +7286,7 @@ Example:
  <Target "replace">
    # Replace "example.net" with "example.com"
    Host "\\<example.net\\>" "example.com"
  <Target "replace">
    # Replace "example.net" with "example.com"
    Host "\\<example.net\\>" "example.com"

- 
+

    # Strip "www." from hostnames
    Host "\\<www\\." ""
  </Target>
    # Strip "www." from hostnames
    Host "\\<www\\." ""
  </Target>