projects
/
collectd.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
write_redis plugin: Use the prefix for the "values" set, too.
[collectd.git]
/
src
/
write_redis.c
diff --git
a/src/write_redis.c
b/src/write_redis.c
index
02663c6
..
909f51d
100644
(file)
--- a/
src/write_redis.c
+++ b/
src/write_redis.c
@@
-1,6
+1,6
@@
/**
* collectd - src/write_redis.c
/**
* 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"),
*
* Permission is hereby granted, free of charge, to any person obtaining a
* copy of this software and associated documentation files (the "Software"),
@@
-33,6
+33,10
@@
#include <sys/time.h>
#include <hiredis/hiredis.h>
#include <sys/time.h>
#include <hiredis/hiredis.h>
+#ifndef REDIS_DEFAULT_PREFIX
+# define REDIS_DEFAULT_PREFIX "collectd/"
+#endif
+
struct wr_node_s
{
char name[DATA_MAX_NAME_LEN];
struct wr_node_s
{
char name[DATA_MAX_NAME_LEN];
@@
-40,6
+44,7
@@
struct wr_node_s
char *host;
int port;
struct timeval timeout;
char *host;
int port;
struct timeval timeout;
+ char *prefix;
redisContext *conn;
pthread_mutex_t lock;
redisContext *conn;
pthread_mutex_t lock;
@@
-67,7
+72,9
@@
static int wr_write (const data_set_t *ds, /* {{{ */
status = FORMAT_VL (ident, sizeof (ident), vl);
if (status != 0)
return (status);
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));
ssnprintf (time, sizeof (time), "%.9f", CDTIME_T_TO_DOUBLE(vl->time));
memset (value, 0, sizeof (value));
@@
-137,7
+144,9
@@
static int wr_write (const data_set_t *ds, /* {{{ */
if (rr==NULL)
WARNING("ZADD command error. key:%s message:%s", key, node->conn->errstr);
if (rr==NULL)
WARNING("ZADD command error. key:%s message:%s", key, node->conn->errstr);
- 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);
if (rr==NULL)
WARNING("SADD command error. ident:%s message:%s", ident, node->conn->errstr);
@@
-179,6
+188,7
@@
static int wr_config_node (oconfig_item_t *ci) /* {{{ */
node->timeout.tv_sec = 0;
node->timeout.tv_usec = 1000;
node->conn = NULL;
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));
pthread_mutex_init (&node->lock, /* attr = */ NULL);
status = cf_util_get_string_buffer (ci, node->name, sizeof (node->name));
@@
-207,6
+217,9
@@
static int wr_config_node (oconfig_item_t *ci) /* {{{ */
status = cf_util_get_int (child, &timeout);
if (status == 0) node->timeout.tv_usec = timeout;
}
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);
else
WARNING ("write_redis plugin: Ignoring unknown config option \"%s\".",
child->key);