X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=src%2Fwrite_redis.c;h=bafbfe511930fc30e70ff513019e9cb0c4dc8f95;hb=8c5927c52f4eefebaad3a6ecadc253ee9007ebb5;hp=231738c5bc6993e6c25b0f66dcc1c53a635ba4b0;hpb=2c7b491427fd84c9e24c9d41686a15ce42219a0b;p=collectd.git diff --git a/src/write_redis.c b/src/write_redis.c index 231738c5..bafbfe51 100644 --- a/src/write_redis.c +++ b/src/write_redis.c @@ -1,6 +1,6 @@ /** * collectd - src/write_redis.c - * Copyright (C) 2010 Florian Forster + * Copyright (C) 2010-2015 Florian Forster * * Permission is hereby granted, free of charge, to any person obtaining a * copy of this software and associated documentation files (the "Software"), @@ -25,14 +25,17 @@ **/ #include "collectd.h" + #include "plugin.h" #include "common.h" -#include "configfile.h" -#include #include #include +#ifndef REDIS_DEFAULT_PREFIX +# define REDIS_DEFAULT_PREFIX "collectd/" +#endif + struct wr_node_s { char name[DATA_MAX_NAME_LEN]; @@ -40,6 +43,10 @@ struct wr_node_s char *host; int port; struct timeval timeout; + char *prefix; + int database; + int max_set_size; + _Bool store_rates; redisContext *conn; pthread_mutex_t lock; @@ -56,7 +63,7 @@ static int wr_write (const data_set_t *ds, /* {{{ */ wr_node_t *node = ud->data; char ident[512]; char key[512]; - char value[512]; + char value[512] = { 0 }; char time[24]; size_t value_size; char *value_ptr; @@ -66,13 +73,14 @@ static int wr_write (const data_set_t *ds, /* {{{ */ status = FORMAT_VL (ident, sizeof (ident), vl); if (status != 0) return (status); - ssnprintf (key, sizeof (key), "collectd/%s", ident); + ssnprintf (key, sizeof (key), "%s%s", + (node->prefix != NULL) ? node->prefix : REDIS_DEFAULT_PREFIX, + ident); ssnprintf (time, sizeof (time), "%.9f", CDTIME_T_TO_DOUBLE(vl->time)); - memset (value, 0, sizeof (value)); value_size = sizeof (value); value_ptr = &value[0]; - status = format_values (value_ptr, value_size, ds, vl, /* store rates = */ 0); + status = format_values (value_ptr, value_size, ds, vl, node->store_rates); if (status != 0) return (status); @@ -83,7 +91,7 @@ static int wr_write (const data_set_t *ds, /* {{{ */ node->conn = redisConnectWithTimeout ((char *)node->host, node->port, node->timeout); if (node->conn == NULL) { - ERROR ("write_redis plugin: Connecting to host \"%s\" (port %i) failed: Unkown reason", + ERROR ("write_redis plugin: Connecting to host \"%s\" (port %i) failed: Unknown reason", (node->host != NULL) ? node->host : "localhost", (node->port != 0) ? node->port : 6379); pthread_mutex_unlock (&node->lock); @@ -98,6 +106,12 @@ static int wr_write (const data_set_t *ds, /* {{{ */ pthread_mutex_unlock (&node->lock); return (-1); } + + rr = redisCommand(node->conn, "SELECT %d", node->database); + if (rr == NULL) + WARNING("SELECT command error. database:%d message:%s", node->database, node->conn->errstr); + else + freeReplyObject (rr); } rr = redisCommand (node->conn, "ZADD %s %s %s", key, time, value); @@ -106,10 +120,21 @@ static int wr_write (const data_set_t *ds, /* {{{ */ else freeReplyObject (rr); + if (node->max_set_size >= 0) + { + rr = redisCommand (node->conn, "ZREMRANGEBYRANK %s %d %d", key, 0, (-1 * node->max_set_size) - 1); + if (rr == NULL) + WARNING("ZREMRANGEBYRANK command error. key:%s message:%s", key, node->conn->errstr); + else + freeReplyObject (rr); + } + /* TODO(octo): This is more overhead than necessary. Use the cache and * metadata to determine if it is a new metric and call SADD only once for * each metric. */ - rr = redisCommand (node->conn, "SADD collectd/values %s", ident); + rr = redisCommand (node->conn, "SADD %svalues %s", + (node->prefix != NULL) ? node->prefix : REDIS_DEFAULT_PREFIX, + ident); if (rr==NULL) WARNING("SADD command error. ident:%s message:%s", ident, node->conn->errstr); else @@ -142,17 +167,19 @@ static int wr_config_node (oconfig_item_t *ci) /* {{{ */ wr_node_t *node; int timeout; int status; - int i; - node = malloc (sizeof (*node)); + node = calloc (1, sizeof (*node)); if (node == NULL) return (ENOMEM); - memset (node, 0, sizeof (*node)); node->host = NULL; node->port = 0; node->timeout.tv_sec = 0; node->timeout.tv_usec = 1000; node->conn = NULL; + node->prefix = NULL; + node->database = 0; + node->max_set_size = -1; + node->store_rates = 1; pthread_mutex_init (&node->lock, /* attr = */ NULL); status = cf_util_get_string_buffer (ci, node->name, sizeof (node->name)); @@ -162,7 +189,7 @@ static int wr_config_node (oconfig_item_t *ci) /* {{{ */ return (status); } - for (i = 0; i < ci->children_num; i++) + for (int i = 0; i < ci->children_num; i++) { oconfig_item_t *child = ci->children + i; @@ -181,6 +208,18 @@ static int wr_config_node (oconfig_item_t *ci) /* {{{ */ status = cf_util_get_int (child, &timeout); if (status == 0) node->timeout.tv_usec = timeout; } + else if (strcasecmp ("Prefix", child->key) == 0) { + status = cf_util_get_string (child, &node->prefix); + } + else if (strcasecmp ("Database", child->key) == 0) { + status = cf_util_get_int (child, &node->database); + } + else if (strcasecmp ("MaxSetSize", child->key) == 0) { + status = cf_util_get_int (child, &node->max_set_size); + } + else if (strcasecmp ("StoreRates", child->key) == 0) { + status = cf_util_get_boolean (child, &node->store_rates); + } else WARNING ("write_redis plugin: Ignoring unknown config option \"%s\".", child->key); @@ -192,14 +231,14 @@ static int wr_config_node (oconfig_item_t *ci) /* {{{ */ if (status == 0) { char cb_name[DATA_MAX_NAME_LEN]; - user_data_t ud; ssnprintf (cb_name, sizeof (cb_name), "write_redis/%s", node->name); - ud.data = node; - ud.free_func = wr_config_free; - - status = plugin_register_write (cb_name, wr_write, &ud); + status = plugin_register_write (cb_name, wr_write, + &(user_data_t) { + .data = node, + .free_func = wr_config_free, + }); } if (status != 0) @@ -210,9 +249,7 @@ static int wr_config_node (oconfig_item_t *ci) /* {{{ */ static int wr_config (oconfig_item_t *ci) /* {{{ */ { - int i; - - for (i = 0; i < ci->children_num; i++) + for (int i = 0; i < ci->children_num; i++) { oconfig_item_t *child = ci->children + i;