X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=src%2Ftarget_set.c;h=6b44bcc4c78f7bb7ef0997d2951d1004b2ec4b85;hb=0a8741b9061f8df4a78a448c021612db06e17425;hp=013a1350b31199493639ed9c273abd1ca7d23fa5;hpb=0377ab15b414528ed5ae8a31840eba745cf2a6b2;p=collectd.git diff --git a/src/target_set.c b/src/target_set.c index 013a1350..6b44bcc4 100644 --- a/src/target_set.c +++ b/src/target_set.c @@ -28,6 +28,8 @@ #include "common.h" #include "filter_chain.h" +#include "meta_data.h" +#include "utils_subst.h" struct ts_key_list_s { @@ -41,12 +43,12 @@ static void ts_key_list_free (ts_key_list_t *l) /* {{{ */ if (l == NULL) return; - free (l->key); + sfree (l->key); if (l->next != NULL) ts_key_list_free (l->next); - free (l); + sfree (l); } /* }}} void ts_name_list_free */ struct ts_data_s @@ -143,35 +145,75 @@ static int ts_config_add_meta_delete (ts_key_list_t **dest, /* {{{ */ { ts_key_list_t *entry = NULL; - if ((ci->values_num != 1) - || (ci->values[0].type != OCONFIG_TYPE_STRING)) + entry = calloc (1, sizeof (*entry)); + if (entry == NULL) { - ERROR ("ts_config_add_meta_delete: The %s option requires " - "exactly one string argument.", ci->key); - return (-1); + ERROR ("ts_config_add_meta_delete: calloc failed."); + return (-ENOMEM); } - if (strlen (ci->values[0].value.string) == 0) + if (cf_util_get_string (ci, &entry->key) != 0) { - ERROR ("Target `set': The `%s' option does not accept empty string as " - "first argument.", ci->key); - return (-1); + ts_key_list_free (entry); + return (-1); /* An error has already been reported. */ } - entry = calloc (1, sizeof (*entry)); - if (entry == NULL) + if (strlen (entry->key) == 0) { - ERROR ("ts_config_add_meta_delete: calloc failed."); - return (-ENOMEM); + ERROR ("Target `set': The `%s' option does not accept empty string as " + "first argument.", ci->key); + ts_key_list_free (entry); + return (-1); } - entry->key = sstrdup (ci->values[0].value.string); entry->next = *dest; *dest = entry; return (0); } /* }}} int ts_config_add_meta_delete */ +static void ts_subst (char *dest, size_t size, const char *string, /* {{{ */ + const value_list_t *vl) +{ + char temp[DATA_MAX_NAME_LEN]; + + /* Initialize the field with the template. */ + sstrncpy (dest, string, size); + + if (strchr (dest, '%') == NULL) + return; + +#define REPLACE_FIELD(t, v) \ + if (subst_string (temp, sizeof (temp), dest, t, v) != NULL) \ + sstrncpy (dest, temp, size); + REPLACE_FIELD ("%{host}", vl->host); + REPLACE_FIELD ("%{plugin}", vl->plugin); + REPLACE_FIELD ("%{plugin_instance}", vl->plugin_instance); + REPLACE_FIELD ("%{type}", vl->type); + REPLACE_FIELD ("%{type_instance}", vl->type_instance); + + if (vl->meta != NULL) + { + char **meta_toc; + int meta_entries = meta_data_toc (vl->meta, &meta_toc); + for (int i = 0; i < meta_entries; i++) + { + char meta_name[DATA_MAX_NAME_LEN]; + char *value_str; + const char *key = meta_toc[i]; + + ssnprintf (meta_name, sizeof (meta_name), "%%{meta:%s}", key); + if (meta_data_as_string (vl->meta, key, &value_str) != 0) + continue; + + REPLACE_FIELD (meta_name, value_str); + sfree (value_str); + } + + strarray_free (meta_toc, (size_t) meta_entries); + } +} /* }}} int ts_subst */ + static int ts_destroy (void **user_data) /* {{{ */ { ts_data_t *data; @@ -303,6 +345,8 @@ static int ts_invoke (const data_set_t *ds, value_list_t *vl, /* {{{ */ notification_meta_t __attribute__((unused)) **meta, void **user_data) { ts_data_t *data; + value_list_t orig; + meta_data_t *new_meta = NULL; if ((ds == NULL) || (vl == NULL) || (user_data == NULL)) return (-EINVAL); @@ -314,24 +358,81 @@ static int ts_invoke (const data_set_t *ds, value_list_t *vl, /* {{{ */ return (-EINVAL); } + orig = *vl; + if (data->meta != NULL) { - meta_data_clone_merge(&(vl->meta), data->meta); + char temp[DATA_MAX_NAME_LEN*2]; + int meta_entries; + char **meta_toc; + + if ((new_meta = meta_data_create()) == NULL) + { + ERROR ("Target `set': failed to create replacement metadata."); + return (-ENOMEM); + } + + meta_entries = meta_data_toc (data->meta, &meta_toc); + for (int i = 0; i < meta_entries; i++) + { + const char *key = meta_toc[i]; + char *string; + int status; + + status = meta_data_get_string (data->meta, key, &string); + if (status) + { + ERROR ("Target `set': Unable to get replacement metadata value `%s'.", + key); + strarray_free (meta_toc, (size_t) meta_entries); + return (status); + } + + ts_subst (temp, sizeof (temp), string, &orig); + + DEBUG ("target_set: ts_invoke: setting metadata value for key `%s': " + "`%s'.", key, temp); + + sfree (string); + + status = meta_data_add_string (new_meta, key, temp); + if (status) + { + ERROR ("Target `set': Unable to set metadata value `%s'.", key); + strarray_free (meta_toc, (size_t) meta_entries); + return (status); + } + } + + strarray_free (meta_toc, (size_t) meta_entries); + } + +#define SUBST_FIELD(f) \ + if (data->f != NULL) { \ + ts_subst (vl->f, sizeof (vl->f), data->f, &orig); \ + DEBUG ("target_set: ts_invoke: setting "#f": `%s'.", vl->f); \ + } + SUBST_FIELD (host); + SUBST_FIELD (plugin); + SUBST_FIELD (plugin_instance); + /* SUBST_FIELD (type); */ + SUBST_FIELD (type_instance); + + /* Need to merge the metadata in now, because of the shallow copy. */ + if (new_meta != NULL) + { + meta_data_clone_merge(&(vl->meta), new_meta); + meta_data_destroy(new_meta); } /* If data->meta_delete is NULL, this loop is a no-op. */ for (ts_key_list_t *l=data->meta_delete; l != NULL; l = l->next) { + DEBUG ("target_set: ts_invoke: deleting metadata value for key `%s'.", + l->key); meta_data_delete(vl->meta, l->key); } -#define SET_FIELD(f) if (data->f != NULL) { sstrncpy (vl->f, data->f, sizeof (vl->f)); } - SET_FIELD (host); - SET_FIELD (plugin); - SET_FIELD (plugin_instance); - /* SET_FIELD (type); */ - SET_FIELD (type_instance); - return (FC_TARGET_CONTINUE); } /* }}} int ts_invoke */