From: Marc Fournier <marc.fournier@camptocamp.com>
Date: Mon, 5 Sep 2016 19:25:40 +0000 (+0200)
Subject: target_set.c: rename 'MetaDataSet' option
X-Git-Tag: collectd-5.6.0~4
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=de6dd1339b0191713d13484dab95f031374fcc27;p=collectd.git

target_set.c: rename 'MetaDataSet' option

Fixes #1910
---

diff --git a/src/collectd.conf.pod b/src/collectd.conf.pod
index e302e816..4c0a84c2 100644
--- a/src/collectd.conf.pod
+++ b/src/collectd.conf.pod
@@ -9384,7 +9384,7 @@ Available options:
 
 =item B<TypeInstance> I<String>
 
-=item B<MetaDataSet> I<String> I<String>
+=item B<MetaData> I<String> I<String>
 
 Set the appropriate field to the given string. The strings for plugin instance
 and type instance may be empty, the strings for host and plugin may not be
diff --git a/src/target_set.c b/src/target_set.c
index fee5ffdc..4f00cbbd 100644
--- a/src/target_set.c
+++ b/src/target_set.c
@@ -181,7 +181,7 @@ static int ts_create (const oconfig_item_t *ci, void **user_data) /* {{{ */
     else if (strcasecmp ("TypeInstance", child->key) == 0)
       status = ts_config_add_string (&data->type_instance, child,
           /* may be empty = */ 1);
-    else if (strcasecmp ("MetaDataSet", child->key) == 0)
+    else if (strcasecmp ("MetaData", child->key) == 0)
       status = ts_config_add_meta (&data->meta, child,
           /* may be empty = */ 1);
     else
@@ -206,8 +206,7 @@ static int ts_create (const oconfig_item_t *ci, void **user_data) /* {{{ */
         && (data->meta == NULL))
     {
       ERROR ("Target `set': You need to set at least one of `Host', "
-          "`Plugin', `PluginInstance', `TypeInstance', "
-          "`MetaDataSet' or `MetaDataEval'.");
+          "`Plugin', `PluginInstance', `TypeInstance', `MetaData'.");
       status = -1;
     }