Add documentation bits for the new 'Attribute' directive

diff --git a/src/collectd.conf.in b/src/collectd.conf.in
index d4d5a205b89c7b3c784033c5083ac3f75a336f98..4542a4b59597b8606ef07afc6626b67f360778bb 100644 (file)
--- a/src/collectd.conf.in
+++ b/src/collectd.conf.in
@@ -1177,6 +1177,7 @@
 #              AlwaysAppendDS false
 #      </Node>
 #      Tag "foobar"
+#       Attribute "foo" "bar"
 #</Plugin>
 
 ##############################################################################

diff --git a/src/collectd.conf.pod b/src/collectd.conf.pod
index 691a7494fecf3b521cf3afb46dee4c7e85a9f4a3..fe72534eb18ee7748a36dcb02a8cfadb052d853a 100644 (file)
--- a/src/collectd.conf.pod
+++ b/src/collectd.conf.pod
@@ -6288,6 +6288,7 @@ Synopsis:
      TTLFactor 2.0
    </Node>
    Tag "foobar"
+   Attribute "foo" "bar"
  </Plugin>
 
 The following options are understood by the I<write_riemann plugin>:
@@ -6348,6 +6349,11 @@ default value.
 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