X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=src%2Fwrite_riemann.c;h=3e2ddd75b0d5caec3bbc40b5121b1de20ab819b4;hb=a2f4c30a03dad7979c494aaf638cf2330fa39e72;hp=6ef27ca209c633d74387620ae06d36ad6d4c697a;hpb=941e316054ad263dea2a0cc2e84a07d4c8d51da6;p=collectd.git diff --git a/src/write_riemann.c b/src/write_riemann.c index 6ef27ca2..3e2ddd75 100644 --- a/src/write_riemann.c +++ b/src/write_riemann.c @@ -37,6 +37,7 @@ #define RIEMANN_HOST "localhost" #define RIEMANN_PORT "5555" +#define RIEMANN_TTL_FACTOR 2.0 struct riemann_host { char *name; @@ -49,6 +50,7 @@ struct riemann_host { char *service; _Bool use_tcp; int s; + double ttl_factor; int reference_count; }; @@ -56,16 +58,6 @@ struct riemann_host { static char **riemann_tags; static size_t riemann_tags_num; -static int riemann_send(struct riemann_host *, Msg const *); -static int riemann_notification(const notification_t *, user_data_t *); -static int riemann_write(const data_set_t *, const value_list_t *, user_data_t *); -static int riemann_connect(struct riemann_host *); -static int riemann_disconnect (struct riemann_host *host); -static void riemann_free(void *); -static int riemann_config_node(oconfig_item_t *); -static int riemann_config(oconfig_item_t *); -void module_register(void); - static void riemann_event_protobuf_free (Event *event) /* {{{ */ { if (event == NULL) @@ -102,6 +94,79 @@ static void riemann_msg_protobuf_free (Msg *msg) /* {{{ */ sfree (msg); } /* }}} void riemann_msg_protobuf_free */ +/* host->lock must be held when calling this function. */ +static int +riemann_connect(struct riemann_host *host) +{ + int e; + struct addrinfo *ai, *res, hints; + char const *node; + char const *service; + + if (host->flags & F_CONNECT) + return 0; + + memset(&hints, 0, sizeof(hints)); + memset(&service, 0, sizeof(service)); + hints.ai_family = AF_UNSPEC; + hints.ai_socktype = host->use_tcp ? SOCK_STREAM : SOCK_DGRAM; +#ifdef AI_ADDRCONFIG + hints.ai_flags |= AI_ADDRCONFIG; +#endif + + node = (host->node != NULL) ? host->node : RIEMANN_HOST; + service = (host->service != NULL) ? host->service : RIEMANN_PORT; + + if ((e = getaddrinfo(node, service, &hints, &res)) != 0) { + ERROR ("write_riemann plugin: Unable to resolve host \"%s\": %s", + node, gai_strerror(e)); + return -1; + } + + host->s = -1; + for (ai = res; ai != NULL; ai = ai->ai_next) { + if ((host->s = socket(ai->ai_family, + ai->ai_socktype, + ai->ai_protocol)) == -1) { + continue; + } + + if (connect(host->s, ai->ai_addr, ai->ai_addrlen) != 0) { + close(host->s); + host->s = -1; + continue; + } + + host->flags |= F_CONNECT; + DEBUG("write_riemann plugin: got a succesful connection for: %s:%s", + node, service); + break; + } + + freeaddrinfo(res); + + if (host->s < 0) { + WARNING("write_riemann plugin: Unable to connect to Riemann at %s:%s", + node, service); + return -1; + } + return 0; +} + +/* host->lock must be held when calling this function. */ +static int +riemann_disconnect (struct riemann_host *host) +{ + if ((host->flags & F_CONNECT) == 0) + return (0); + + close (host->s); + host->s = -1; + host->flags &= ~F_CONNECT; + + return (0); +} + static int riemann_send(struct riemann_host *host, Msg const *msg) { @@ -302,6 +367,7 @@ static Event *riemann_value_to_protobuf (struct riemann_host const *host, /* {{{ Event *event; char name_buffer[5 * DATA_MAX_NAME_LEN]; char service_buffer[6 * DATA_MAX_NAME_LEN]; + double ttl; int i; event = malloc (sizeof (*event)); @@ -316,7 +382,9 @@ static Event *riemann_value_to_protobuf (struct riemann_host const *host, /* {{{ event->host = strdup (vl->host); event->time = CDTIME_T_TO_TIME_T (vl->time); event->has_time = 1; - event->ttl = CDTIME_T_TO_TIME_T (2 * vl->interval); + + ttl = CDTIME_T_TO_DOUBLE (vl->interval) * host->ttl_factor; + event->ttl = (float) ttl; event->has_ttl = 1; riemann_event_add_attribute (event, "plugin", vl->plugin); @@ -489,79 +557,6 @@ riemann_write(const data_set_t *ds, return status; } -/* host->lock must be held when calling this function. */ -static int -riemann_connect(struct riemann_host *host) -{ - int e; - struct addrinfo *ai, *res, hints; - char const *node; - char const *service; - - if (host->flags & F_CONNECT) - return 0; - - memset(&hints, 0, sizeof(hints)); - memset(&service, 0, sizeof(service)); - hints.ai_family = AF_UNSPEC; - hints.ai_socktype = host->use_tcp ? SOCK_STREAM : SOCK_DGRAM; -#ifdef AI_ADDRCONFIG - hints.ai_flags |= AI_ADDRCONFIG; -#endif - - node = (host->node != NULL) ? host->node : RIEMANN_HOST; - service = (host->service != NULL) ? host->service : RIEMANN_PORT; - - if ((e = getaddrinfo(node, service, &hints, &res)) != 0) { - ERROR ("write_riemann plugin: Unable to resolve host \"%s\": %s", - node, gai_strerror(e)); - return -1; - } - - host->s = -1; - for (ai = res; ai != NULL; ai = ai->ai_next) { - if ((host->s = socket(ai->ai_family, - ai->ai_socktype, - ai->ai_protocol)) == -1) { - continue; - } - - if (connect(host->s, ai->ai_addr, ai->ai_addrlen) != 0) { - close(host->s); - host->s = -1; - continue; - } - - host->flags |= F_CONNECT; - DEBUG("write_riemann plugin: got a succesful connection for: %s:%s", - node, service); - break; - } - - freeaddrinfo(res); - - if (host->s < 0) { - WARNING("write_riemann plugin: Unable to connect to Riemann at %s:%s", - node, service); - return -1; - } - return 0; -} - -/* host->lock must be held when calling this function. */ -static int -riemann_disconnect (struct riemann_host *host) -{ - if ((host->flags & F_CONNECT) == 0) - return (0); - - close (host->s); - host->s = -1; - host->flags &= ~F_CONNECT; - - return (0); -} - static void riemann_free(void *p) { @@ -607,6 +602,7 @@ riemann_config_node(oconfig_item_t *ci) host->store_rates = 1; host->always_append_ds = 0; host->use_tcp = 0; + host->ttl_factor = RIEMANN_TTL_FACTOR; status = cf_util_get_string (ci, &host->name); if (status != 0) { @@ -666,6 +662,33 @@ riemann_config_node(oconfig_item_t *ci) &host->always_append_ds); if (status != 0) break; + } else if (strcasecmp ("TTLFactor", child->key) == 0) { + double tmp = NAN; + status = cf_util_get_double (child, &tmp); + if (status != 0) + break; + if (tmp >= 2.0) { + host->ttl_factor = tmp; + } else if (tmp >= 1.0) { + NOTICE ("write_riemann plugin: The configured " + "TTLFactor is very small " + "(%.1f). A value of 2.0 or " + "greater is recommended.", + tmp); + host->ttl_factor = tmp; + } else if (tmp > 0.0) { + WARNING ("write_riemann plugin: The configured " + "TTLFactor is too small to be " + "useful (%.1f). I'll use it " + "since the user knows best, " + "but under protest.", + tmp); + host->ttl_factor = tmp; + } else { /* zero, negative and NAN */ + ERROR ("write_riemann plugin: The configured " + "TTLFactor is invalid (%.1f).", + tmp); + } } else { WARNING("write_riemann plugin: ignoring unknown config " "option: \"%s\"", child->key);