From 7aaf833b3182b21150da980551f58703f529ca56 Mon Sep 17 00:00:00 2001
From: Pierre-Yves Ritschard <pyr@spootnik.org>
Date: Mon, 28 Oct 2013 14:18:02 +0100
Subject: [PATCH] Add documentation bits for the new 'Attribute' directive

---
 src/collectd.conf.in  | 1 +
 src/collectd.conf.pod | 6 ++++++
 2 files changed, 7 insertions(+)

diff --git a/src/collectd.conf.in b/src/collectd.conf.in
index d4d5a205..4542a4b5 100644
--- 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 691a7494..fe72534e 100644
--- 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
-- 
2.11.0