char *host;
int port;
struct timeval timeout;
+ char *prefix;
redisContext *conn;
pthread_mutex_t lock;
status = FORMAT_VL (ident, sizeof (ident), vl);
if (status != 0)
return (status);
- ssnprintf (key, sizeof (key), "collectd/%s", ident);
+ if (node->prefix == NULL) {
+ ssnprintf (key, sizeof (key), "collectd/%s", ident);
+ }
+ else {
+ ssnprintf (key, sizeof (key), "%s/collectd/%s", node->prefix, ident);
+ }
ssnprintf (time, sizeof (time), "%.9f", CDTIME_T_TO_DOUBLE(vl->time));
memset (value, 0, sizeof (value));
if (node->conn == NULL)
{
node->conn = redisConnectWithTimeout ((char *)node->host, node->port, node->timeout);
- if (node->conn != NULL && node->conn->err)
+ if (node->conn == NULL)
+ {
+ ERROR ("write_redis plugin: Connecting to host \"%s\" (port %i) failed: Unkown reason",
+ (node->host != NULL) ? node->host : "localhost",
+ (node->port != 0) ? node->port : 6379);
+ pthread_mutex_unlock (&node->lock);
+ return (-1);
+ }
+ else if (node->conn->err)
{
ERROR ("write_redis plugin: Connecting to host \"%s\" (port %i) failed: %s",
(node->host != NULL) ? node->host : "localhost",
}
}
- assert (node->conn != NULL);
rr = redisCommand (node->conn, "ZADD %s %s %s", key, time, value);
if (rr==NULL)
- WARNING("ZADD command error. key:%s", key);
+ WARNING("ZADD command error. key:%s message:%s", key, node->conn->errstr);
rr = redisCommand (node->conn, "SADD collectd/values %s", ident);
if (rr==NULL)
- WARNING("SADD command error. ident:%s", ident);
+ WARNING("SADD command error. ident:%s message:%s", ident, node->conn->errstr);
pthread_mutex_unlock (&node->lock);
node->timeout.tv_sec = 0;
node->timeout.tv_usec = 1000;
node->conn = NULL;
+ node->prefix = NULL;
pthread_mutex_init (&node->lock, /* attr = */ NULL);
status = cf_util_get_string_buffer (ci, node->name, sizeof (node->name));
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
WARNING ("write_redis plugin: Ignoring unknown config option \"%s\".",
child->key);