From: Laurent <laurent+git@u-picardie.fr>
Date: Sun, 14 Apr 2013 10:23:32 +0000 (+0200)
Subject: amqp: add Graphite{SeparateInstances,AlwaysAppendDS} options
X-Git-Tag: collectd-5.4.0~57
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=19e1e95c51fa96475bd8cd9dccfc53609454a909;p=collectd.git

amqp: add Graphite{SeparateInstances,AlwaysAppendDS} options
---

diff --git a/src/amqp.c b/src/amqp.c
index 767a8776..edd4f749 100644
--- a/src/amqp.c
+++ b/src/amqp.c
@@ -877,6 +877,7 @@ static int camqp_config_connection (oconfig_item_t *ci, /* {{{ */
     /* publish only */
     conf->delivery_mode = CAMQP_DM_VOLATILE;
     conf->store_rates = 0;
+    conf->graphite_flags = 0;
     /* publish & graphite only */
     conf->prefix = NULL;
     conf->postfix = NULL;
@@ -942,6 +943,12 @@ static int camqp_config_connection (oconfig_item_t *ci, /* {{{ */
         }
         else if ((strcasecmp ("Format", child->key) == 0) && publish)
             status = camqp_config_set_format (child, conf);
+        else if ((strcasecmp ("GraphiteSeparateInstances", child->key) == 0) && publish)
+            status = cf_util_get_flag (child, &conf->graphite_flags,
+                    GRAPHITE_SEPARATE_INSTANCES);
+        else if ((strcasecmp ("GraphiteAlwaysAppendDS", child->key) == 0) && publish)
+            status = cf_util_get_flag (child, &conf->graphite_flags,
+                    GRAPHITE_ALWAYS_APPEND_DS);
         else if ((strcasecmp ("GraphitePrefix", child->key) == 0) && publish)
             status = cf_util_get_string (child, &conf->prefix);
         else if ((strcasecmp ("GraphitePostfix", child->key) == 0) && publish)