Merge pull request #2199 from jaroug/support_attributes_kairosdb

Add support for 'Attribute' option on KAIROSDB output format

diff --combined src/collectd.conf.in
index a23816d,ff83d18..9508338
--- 1/src/collectd.conf.in
--- 2/src/collectd.conf.in
+++ b/src/collectd.conf.in
@@@ -1027,8 -1027,8 +1027,8 @@@
  #  Address "127.0.0.1"
  #  Socket "/var/run/openvswitch/db.sock"
  #  Interfaces "br0" "veth0"
 -#  SendNotification false
 -#  DispatchValues true
 +#  SendNotification true
 +#  DispatchValues false
  #</Plugin>
  
  #<Plugin ovs_stats>
@@@ -1535,6 -1535,7 +1535,7 @@@
  #             Header "X-Custom-Header: custom_value"
  #             SSLVersion "TLSv1"
  #             Format "Command"
+ #             Attribute "key" "value"     # only available for KAIROSDB format
  #             Metrics true
  #             Notifications false
  #             StoreRates false

diff --combined src/collectd.conf.pod
index 419eb1c,7dc4e97..c18f8ef
--- 1/src/collectd.conf.pod
--- 2/src/collectd.conf.pod
+++ b/src/collectd.conf.pod
@@@ -5637,8 -5637,8 +5637,8 @@@ B<Synopsis:
     Address "127.0.0.1"
     Socket "/var/run/openvswitch/db.sock"
     Interfaces "br0" "veth0"
 -   SendNotification false
 -   DispatchValues true
 +   SendNotification true
 +   DispatchValues false
   </Plugin>
  
  The plugin provides the following configuration options:
@@@ -5676,12 -5676,12 +5676,12 @@@ Default: empty (all interfaces on all b
  =item B<SendNotification> I<true|false>
  
  If set to true, OVS link notifications (interface status and OVS DB connection
 -terminate) are sent to collectd. Default value is false.
 +terminate) are sent to collectd. Default value is true.
  
  =item B<DispatchValues> I<true|false>
  
  Dispatch the OVS DB interface link status value with configured plugin interval.
 -Defaults to true. Please note, if B<SendNotification> and B<DispatchValues>
 +Defaults to false. Please note, if B<SendNotification> and B<DispatchValues>
  options are false, no OVS information will be provided by the plugin.
  
  =back
@@@ -8725,6 -8725,15 +8725,15 @@@ create output in the I<JavaScript Objec
  
  Defaults to B<Command>.
  
+ =item B<Attribute> I<String> I<String>
+ 
+ Only available for KAIROSDB output format.
+ 
+ Consider the two given strings to be the key and value of an additional tag for
+ each metric being sent out.
+ 
+ You can add multiple B<Attribute>.
+ 
  =item B<Metrics> B<true>|B<false>
  
  Controls whether I<metrics> are POSTed to this location. Defaults to B<true>.