X-Git-Url: https://git.verplant.org/?a=blobdiff_plain;f=src%2Fwrite_graphite.c;h=8b5afb812bb62c47fe24af4378a10700db23ae99;hb=b2c7ba100aabd35751e379561773878013f31e04;hp=8090c8b3c8fb242154f19dd9e67ce5a64032260d;hpb=352eee4ecccdd9855191de35a09b0e8f6b3f7bb7;p=collectd.git diff --git a/src/write_graphite.c b/src/write_graphite.c index 8090c8b3..8b5afb81 100644 --- a/src/write_graphite.c +++ b/src/write_graphite.c @@ -24,7 +24,7 @@ /* write_graphite plugin configuation example * * - * + * * Host "localhost" * Port 2003 * Prefix "collectd" @@ -51,9 +51,15 @@ #include #ifndef WG_FORMAT_NAME -#define WG_FORMAT_NAME(ret, ret_len, vl, prefix, name) \ - wg_format_name (ret, ret_len, (vl)->host, (vl)->plugin, (vl)->plugin_instance, \ - (vl)->type, (vl)->type_instance, prefix, name) +#define WG_FORMAT_NAME(ret, ret_len, vl, cb, name) \ + wg_format_name (ret, ret_len, (vl)->host, (vl)->plugin, \ + (vl)->plugin_instance, (vl)->type, \ + (vl)->type_instance, (cb)->prefix, (cb)->postfix, \ + name, (cb)->dotchar) +#endif + +#ifndef WG_SEND_BUF_SIZE +#define WG_SEND_BUF_SIZE 4096 #endif /* @@ -61,16 +67,16 @@ */ struct wg_callback { - char *name; - int sock_fd; struct hostent *server; char *host; int port; char *prefix; + char *postfix; + char dotchar; - char send_buf[4096]; + char send_buf[WG_SEND_BUF_SIZE]; size_t send_buf_free; size_t send_buf_fill; cdtime_t send_buf_init_time; @@ -102,7 +108,7 @@ static int wg_send_buffer (struct wg_callback *cb) status, strerror (errno)); - pthread_mutex_lock (&cb->send_lock); + pthread_mutex_trylock (&cb->send_lock); DEBUG ("write_graphite plugin: closing socket and restting fd " "so reinit will occur"); @@ -171,11 +177,13 @@ static int wg_callback_init (struct wg_callback *cb) memset (&serv_addr, 0, sizeof (serv_addr)); serv_addr.sin_family = AF_INET; memcpy (&serv_addr.sin_addr.s_addr, - cb->server->h_addr, - cb->server->h_length); + cb->server->h_addr, + cb->server->h_length); serv_addr.sin_port = htons(cb->port); - status = connect(cb->sock_fd, (struct sockaddr *) &serv_addr, sizeof(serv_addr)); + status = connect(cb->sock_fd, + (struct sockaddr *) &serv_addr, + sizeof(serv_addr)); if (status < 0) { char errbuf[1024]; @@ -203,9 +211,9 @@ static void wg_callback_free (void *data) wg_flush_nolock (/* timeout = */ 0, cb); close(cb->sock_fd); - sfree(cb->name); sfree(cb->host); sfree(cb->prefix); + sfree(cb->postfix); sfree(cb); } @@ -304,7 +312,8 @@ static int wg_format_values (char *ret, size_t ret_len, return (0); } -static int normalize_hostname (char *dst, const char *src) +static int swap_chars (char *dst, const char *src, + const char from, const char to) { size_t i; @@ -312,9 +321,9 @@ static int normalize_hostname (char *dst, const char *src) for (i = 0; i < strlen(src) ; i++) { - if (src[i] == '.') + if (src[i] == from) { - dst[i] = '_'; + dst[i] = to; ++reps; } else @@ -326,13 +335,15 @@ static int normalize_hostname (char *dst, const char *src) } static int wg_format_name (char *ret, int ret_len, - const char *hostname, - const char *plugin, const char *plugin_instance, - const char *type, const char *type_instance, - const char *prefix, const char *ds_name) + const char *hostname, + const char *plugin, const char *plugin_instance, + const char *type, const char *type_instance, + const char *prefix, const char *postfix, + const char *ds_name, const char dotchar) { int status; - char *n_hostname; + char *n_hostname = 0; + char *n_type_instance = 0; assert (plugin != NULL); assert (type != NULL); @@ -343,69 +354,84 @@ static int wg_format_name (char *ret, int ret_len, return (-1); } - if (normalize_hostname(n_hostname, hostname) == -1) + if (swap_chars(n_hostname, hostname, '.', dotchar) == -1) { ERROR ("Unable to normalize hostname"); return (-1); } - if ((plugin_instance == NULL) || (strlen (plugin_instance) == 0)) + if (type_instance && type_instance[0] != '\0') { + if ((n_type_instance = malloc(strlen(type_instance)+1)) == NULL) + { + ERROR ("Unable to allocate memory for normalized datasource name buffer"); + return (-1); + } + if (swap_chars(n_type_instance, type_instance, '.', dotchar) == -1) + { + ERROR ("Unable to normalize datasource name"); + return (-1); + } + } + + if ((plugin_instance == NULL) || (plugin_instance[0] == '\0')) { - if ((type_instance == NULL) || (strlen (type_instance) == 0)) + if ((n_type_instance == NULL) || (n_type_instance[0] == '\0')) { - if ((ds_name == NULL) || (strlen (ds_name) == 0)) - status = ssnprintf (ret, ret_len, "%s.%s.%s.%s", - prefix, n_hostname, plugin, type); + if ((ds_name == NULL) || (ds_name[0] == '\0')) + status = ssnprintf (ret, ret_len, "%s%s%s.%s.%s", + prefix, n_hostname, postfix, plugin, type); else - status = ssnprintf (ret, ret_len, "%s.%s.%s.%s.%s", - prefix, n_hostname, plugin, type, ds_name); + status = ssnprintf (ret, ret_len, "%s%s%s.%s.%s.%s", + prefix, n_hostname, postfix, plugin, type, ds_name); } else { - if ((ds_name == NULL) || (strlen (ds_name) == 0)) - status = ssnprintf (ret, ret_len, "%s.%s.%s.%s-%s", - prefix, n_hostname, plugin, type, - type_instance); + if ((ds_name == NULL) || (ds_name[0] == '\0')) + status = ssnprintf (ret, ret_len, "%s%s%s.%s.%s-%s", + prefix, n_hostname, postfix, plugin, type, + n_type_instance); else - status = ssnprintf (ret, ret_len, "%s.%s.%s.%s-%s.%s", - prefix, n_hostname, plugin, type, - type_instance, ds_name); + status = ssnprintf (ret, ret_len, "%s%s%s.%s.%s-%s.%s", + prefix, n_hostname, postfix, plugin, type, + n_type_instance, ds_name); } } else { - if ((type_instance == NULL) || (strlen (type_instance) == 0)) + if ((n_type_instance == NULL) || (n_type_instance[0] == '\0')) { - if ((ds_name == NULL) || (strlen (ds_name) == 0)) - status = ssnprintf (ret, ret_len, "%s.%s.%s.%s.%s", - prefix, n_hostname, plugin, + if ((ds_name == NULL) || (ds_name[0] == '\0')) + status = ssnprintf (ret, ret_len, "%s%s%s.%s.%s.%s", + prefix, n_hostname, postfix, plugin, plugin_instance, type); else - status = ssnprintf (ret, ret_len, "%s.%s.%s.%s.%s.%s", - prefix, n_hostname, plugin, + status = ssnprintf (ret, ret_len, "%s%s%s.%s.%s.%s.%s", + prefix, n_hostname, postfix, plugin, plugin_instance, type, ds_name); } else { - if ((ds_name == NULL) || (strlen (ds_name) == 0)) - status = ssnprintf (ret, ret_len, "%s.%s.%s.%s.%s-%s", - prefix, n_hostname, plugin, - plugin_instance, type, type_instance); + if ((ds_name == NULL) || (ds_name[0] == '\0')) + status = ssnprintf (ret, ret_len, "%s%s%s.%s.%s.%s-%s", + prefix, n_hostname, postfix, plugin, + plugin_instance, type, n_type_instance); else - status = ssnprintf (ret, ret_len, "%s.%s.%s.%s.%s-%s.%s", - prefix, n_hostname, plugin, - plugin_instance, type, type_instance, ds_name); + status = ssnprintf (ret, ret_len, "%s%s%s.%s.%s.%s-%s.%s", + prefix, n_hostname, postfix, plugin, + plugin_instance, type, n_type_instance, ds_name); } } sfree(n_hostname); + sfree(n_type_instance); if ((status < 1) || (status >= ret_len)) return (-1); return (0); } -static int wg_send_message (const char* key, const char* value, cdtime_t time, struct wg_callback *cb) +static int wg_send_message (const char* key, const char* value, + cdtime_t time, struct wg_callback *cb) { int status; size_t message_len; @@ -468,7 +494,7 @@ static int wg_send_message (const char* key, const char* value, cdtime_t time, s } static int wg_write_messages (const data_set_t *ds, const value_list_t *vl, - struct wg_callback *cb) + struct wg_callback *cb) { char key[10*DATA_MAX_NAME_LEN]; char values[512]; @@ -487,7 +513,7 @@ static int wg_write_messages (const data_set_t *ds, const value_list_t *vl, for (i = 0; i < ds->ds_num; i++) { /* Copy the identifier to `key' and escape it. */ - status = WG_FORMAT_NAME (key, sizeof (key), vl, cb->prefix, ds->ds[i].name); + status = WG_FORMAT_NAME (key, sizeof (key), vl, cb, ds->ds[i].name); if (status != 0) { ERROR ("write_graphite plugin: error with format_name"); @@ -495,8 +521,8 @@ static int wg_write_messages (const data_set_t *ds, const value_list_t *vl, } escape_string (key, sizeof (key)); - /* Convert the values to an ASCII representation and put that into - * `values'. */ + /* Convert the values to an ASCII representation and put that + * into `values'. */ status = wg_format_values (values, sizeof (values), i, ds, vl, 0); if (status != 0) { @@ -518,7 +544,7 @@ static int wg_write_messages (const data_set_t *ds, const value_list_t *vl, else { /* Copy the identifier to `key' and escape it. */ - status = WG_FORMAT_NAME (key, sizeof (key), vl, cb->prefix, NULL); + status = WG_FORMAT_NAME (key, sizeof (key), vl, cb, NULL); if (status != 0) { ERROR ("write_graphite plugin: error with format_name"); @@ -580,6 +606,21 @@ static int config_set_number (int *dest, return (0); } +static int config_set_char (char *dest, + oconfig_item_t *ci) +{ + if ((ci->values_num != 1) || (ci->values[0].type != OCONFIG_TYPE_STRING)) + { + WARNING ("write_graphite plugin: The `%s' config option " + "needs exactly one string argument.", ci->key); + return (-1); + } + + *dest = ci->values[0].value.string[0]; + + return (0); +} + static int config_set_string (char **ret_string, oconfig_item_t *ci) { @@ -622,17 +663,14 @@ static int wg_config_carbon (oconfig_item_t *ci) memset (cb, 0, sizeof (*cb)); cb->sock_fd = -1; cb->host = NULL; - cb->name = NULL; cb->port = 2003; cb->prefix = NULL; + cb->postfix = NULL; cb->server = NULL; + cb->dotchar = '_'; pthread_mutex_init (&cb->send_lock, /* attr = */ NULL); - config_set_string (&cb->name, ci); - if (cb->name == NULL) - return (-1); - for (i = 0; i < ci->children_num; i++) { oconfig_item_t *child = ci->children + i; @@ -643,6 +681,10 @@ static int wg_config_carbon (oconfig_item_t *ci) config_set_number (&cb->port, child); else if (strcasecmp ("Prefix", child->key) == 0) config_set_string (&cb->prefix, child); + else if (strcasecmp ("Postfix", child->key) == 0) + config_set_string (&cb->postfix, child); + else if (strcasecmp ("DotCharacter", child->key) == 0) + config_set_char (&cb->dotchar, child); else { ERROR ("write_graphite plugin: Invalid configuration " @@ -650,6 +692,24 @@ static int wg_config_carbon (oconfig_item_t *ci) } } + if (cb->prefix == NULL) { + if ((cb->prefix = malloc((int)sizeof(char))) == NULL) + { + ERROR ("Unable to allocate memory for hostname prefix buffer"); + return (-1); + } + cb->postfix[0] = '\0'; + } + + if (cb->postfix == NULL) { + if ((cb->postfix = malloc((int)sizeof(char))) == NULL) + { + ERROR ("Unable to allocate memory for hostname postfix buffer"); + return (-1); + } + cb->postfix[0] = '\0'; + } + DEBUG ("write_graphite: Registering write callback to carbon agent " "%s:%d", cb->host, cb->port); @@ -677,7 +737,7 @@ static int wg_config (oconfig_item_t *ci) else { ERROR ("write_graphite plugin: Invalid configuration " - "option: %s.", child->key); + "option: %s.", child->key); } }