diff --git a/src/redis.c b/src/redis.c
index dcede59983c00e38d281481b689c0b35d894e364..7864ead07c01c1edf079cecfb9c79474470cb277 100644 (file)
--- a/src/redis.c
+++ b/src/redis.c
#define REDIS_DEF_TIMEOUT 2000
#define MAX_REDIS_NODE_NAME 64
#define MAX_REDIS_PASSWD_LENGTH 512
#define REDIS_DEF_TIMEOUT 2000
#define MAX_REDIS_NODE_NAME 64
#define MAX_REDIS_PASSWD_LENGTH 512
+#define MAX_REDIS_VAL_SIZE 256
+#define MAX_REDIS_QUERY 2048
/* Redis plugin configuration example:
*
/* Redis plugin configuration example:
*
* </Plugin>
*/
* </Plugin>
*/
+struct redis_query_s;
+typedef struct redis_query_s redis_query_t;
+struct redis_query_s
+{
+ char query[MAX_REDIS_QUERY];
+ char type[DATA_MAX_NAME_LEN];
+ char instance[DATA_MAX_NAME_LEN];
+ redis_query_t *next;
+};
+
struct redis_node_s;
typedef struct redis_node_s redis_node_t;
struct redis_node_s
struct redis_node_s;
typedef struct redis_node_s redis_node_t;
struct redis_node_s
char host[HOST_NAME_MAX];
char passwd[MAX_REDIS_PASSWD_LENGTH];
int port;
char host[HOST_NAME_MAX];
char passwd[MAX_REDIS_PASSWD_LENGTH];
int port;
- int timeout;
+ struct timeval timeout;
+ redis_query_t *queries;
redis_node_t *next;
};
redis_node_t *next;
};
return (0);
} /* }}} */
return (0);
} /* }}} */
+static redis_query_t *redis_config_query (oconfig_item_t *ci) /* {{{ */
+{
+ redis_query_t *rq;
+ int status;
+ int i;
+
+ rq = calloc(1, sizeof(*rq));
+ if (rq == NULL) {
+ ERROR("redis plugin: calloca failed adding redis_query.");
+ return NULL;
+ }
+ status = cf_util_get_string_buffer(ci, rq->query, sizeof(rq->query));
+ if (status != 0)
+ goto err;
+
+ /*
+ * Default to a gauge type.
+ */
+ (void)strncpy(rq->type, "gauge", sizeof(rq->type));
+ (void)strncpy(rq->instance, rq->query, sizeof(rq->instance));
+ replace_special(rq->instance, sizeof(rq->instance));
+
+ for (i = 0; i < ci->children_num; i++) {
+ oconfig_item_t *option = ci->children + i;
+
+ if (strcasecmp("Type", option->key) == 0) {
+ status = cf_util_get_string_buffer(option, rq->type, sizeof(rq->type));
+ } else if (strcasecmp("Instance", option->key) == 0) {
+ status = cf_util_get_string_buffer(option, rq->instance, sizeof(rq->instance));
+ } else {
+ WARNING("redis plugin: unknown configuration option: %s", option->key);
+ status = -1;
+ }
+ if (status != 0)
+ goto err;
+ }
+ return rq;
+ err:
+ free(rq);
+ return NULL;
+} /* }}} */
static int redis_config_node (oconfig_item_t *ci) /* {{{ */
{
redis_node_t rn;
static int redis_config_node (oconfig_item_t *ci) /* {{{ */
{
redis_node_t rn;
+ redis_query_t *rq;
int i;
int status;
int i;
int status;
+ int timeout;
memset (&rn, 0, sizeof (rn));
sstrncpy (rn.host, REDIS_DEF_HOST, sizeof (rn.host));
rn.port = REDIS_DEF_PORT;
memset (&rn, 0, sizeof (rn));
sstrncpy (rn.host, REDIS_DEF_HOST, sizeof (rn.host));
rn.port = REDIS_DEF_PORT;
- rn.timeout = REDIS_DEF_TIMEOUT;
+ rn.timeout.tv_usec = REDIS_DEF_TIMEOUT;
+ rn.queries = NULL;
status = cf_util_get_string_buffer (ci, rn.name, sizeof (rn.name));
if (status != 0)
status = cf_util_get_string_buffer (ci, rn.name, sizeof (rn.name));
if (status != 0)
status = 0;
}
}
status = 0;
}
}
+ else if (strcasecmp ("Query", option->key) == 0)
+ {
+ rq = redis_config_query(option);
+ if (rq == NULL) {
+ status =1;
+ } else {
+ rq->next = rn.queries;
+ rn.queries = rq;
+ }
+ }
else if (strcasecmp ("Timeout", option->key) == 0)
else if (strcasecmp ("Timeout", option->key) == 0)
- status = cf_util_get_int (option, &rn.timeout);
+ {
+ status = cf_util_get_int (option, &timeout);
+ if (status == 0) rn.timeout.tv_usec = timeout;
+ }
else if (strcasecmp ("Password", option->key) == 0)
status = cf_util_get_string_buffer (option, rn.passwd, sizeof (rn.passwd));
else
else if (strcasecmp ("Password", option->key) == 0)
status = cf_util_get_string_buffer (option, rn.passwd, sizeof (rn.passwd));
else
.name = "default",
.host = REDIS_DEF_HOST,
.port = REDIS_DEF_PORT,
.name = "default",
.host = REDIS_DEF_HOST,
.port = REDIS_DEF_PORT,
- .timeout = REDIS_DEF_TIMEOUT,
+ .timeout.tv_sec = 0,
+ .timeout.tv_usec = REDIS_DEF_TIMEOUT,
.next = NULL
};
.next = NULL
};
@@ -250,23 +321,76 @@ int redis_handle_info (char *node, char const *info_line, char const *type, char
} /* }}} int redis_handle_info */
} /* }}} int redis_handle_info */
+int redis_handle_query (redisContext *rh, redis_node_t *rn, redis_query_t *rq) /* {{{ */
+{
+ redisReply *rr;
+ const data_set_t *ds;
+ value_t val;
+
+ ds = plugin_get_ds (rq->type);
+ if (!ds) {
+ ERROR ("redis plugin: DataSet `%s' not defined.", rq->type);
+ return (-1);
+ }
+
+ if (ds->ds_num != 1) {
+ ERROR ("redis plugin: DS `%s' has too many types.", rq->type);
+ return (-1);
+ }
+
+ if ((rr = redisCommand(rh, rq->query)) == NULL) {
+ WARNING("redis plugin: unable to carry out query `%s'.", rq->query);
+ return (-1);
+ }
+
+ switch (rr->type) {
+ case REDIS_REPLY_INTEGER:
+ switch (ds->ds[0].type) {
+ case DS_TYPE_COUNTER:
+ val.counter = (counter_t)rr->integer;
+ break;
+ case DS_TYPE_GAUGE:
+ val.gauge = (gauge_t)rr->integer;
+ break;
+ case DS_TYPE_DERIVE:
+ val.gauge = (derive_t)rr->integer;
+ break;
+ case DS_TYPE_ABSOLUTE:
+ val.gauge = (absolute_t)rr->integer;
+ break;
+ }
+ break;
+ case REDIS_REPLY_STRING:
+ if (parse_value (rr->str, &val, ds->ds[0].type) == -1) {
+ WARNING("redis plugin: Unable to parse field `%s'.", rq->type);
+ freeReplyObject (rr);
+ return (-1);
+ }
+ break;
+ default:
+ WARNING("redis plugin: Cannot coerce redis type.");
+ freeReplyObject(rr);
+ return (-1);
+ }
+
+ redis_submit(rn->name, rq->type, (strlen(rq->instance) >0)?rq->instance:NULL, val);
+ freeReplyObject (rr);
+ return 0;
+} /* }}} int redis_handle_info */
+
static int redis_read (void) /* {{{ */
{
redis_node_t *rn;
static int redis_read (void) /* {{{ */
{
redis_node_t *rn;
+ redis_query_t *rq;
for (rn = nodes_head; rn != NULL; rn = rn->next)
{
redisContext *rh;
redisReply *rr;
for (rn = nodes_head; rn != NULL; rn = rn->next)
{
redisContext *rh;
redisReply *rr;
- struct timeval tmout;
-
- tmout.tv_sec = rn->timeout;
- tmout.tv_usec = 0;
-
DEBUG ("redis plugin: querying info from node `%s' (%s:%d).", rn->name, rn->host, rn->port);
DEBUG ("redis plugin: querying info from node `%s' (%s:%d).", rn->name, rn->host, rn->port);
- rh = redisConnectWithTimeout ((char *)rn->host, rn->port, tmout);
+ rh = redisConnectWithTimeout ((char *)rn->host, rn->port, rn->timeout);
if (rh == NULL)
{
ERROR ("redis plugin: unable to connect to node `%s' (%s:%d).", rn->name, rn->host, rn->port);
if (rh == NULL)
{
ERROR ("redis plugin: unable to connect to node `%s' (%s:%d).", rn->name, rn->host, rn->port);
DEBUG ("redis plugin: authenticanting node `%s' passwd(%s).", rn->name, rn->passwd);
rr = redisCommand (rh, "AUTH %s", rn->passwd);
DEBUG ("redis plugin: authenticanting node `%s' passwd(%s).", rn->name, rn->passwd);
rr = redisCommand (rh, "AUTH %s", rn->passwd);
- if (rr == NULL || rr->type != 5)
+ if (rr == NULL || rr->type != REDIS_REPLY_STATUS)
{
WARNING ("redis plugin: unable to authenticate on node `%s'.", rn->name);
{
WARNING ("redis plugin: unable to authenticate on node `%s'.", rn->name);
+ if (rr != NULL)
+ freeReplyObject (rr);
+
redisFree (rh);
continue;
}
redisFree (rh);
continue;
}
}
redis_handle_info (rn->name, rr->str, "uptime", NULL, "uptime_in_seconds", DS_TYPE_GAUGE);
}
redis_handle_info (rn->name, rr->str, "uptime", NULL, "uptime_in_seconds", DS_TYPE_GAUGE);
- redis_handle_info (rn->name, rr->str, "connections", "clients", "connected_clients", DS_TYPE_GAUGE);
- redis_handle_info (rn->name, rr->str, "connections", "slaves", "connected_slaves", DS_TYPE_GAUGE);
+ redis_handle_info (rn->name, rr->str, "current_connections", "clients", "connected_clients", DS_TYPE_GAUGE);
redis_handle_info (rn->name, rr->str, "blocked_clients", NULL, "blocked_clients", DS_TYPE_GAUGE);
redis_handle_info (rn->name, rr->str, "memory", NULL, "used_memory", DS_TYPE_GAUGE);
redis_handle_info (rn->name, rr->str, "blocked_clients", NULL, "blocked_clients", DS_TYPE_GAUGE);
redis_handle_info (rn->name, rr->str, "memory", NULL, "used_memory", DS_TYPE_GAUGE);
- redis_handle_info (rn->name, rr->str, "changes_since_last_save", NULL, "changes_since_last_save", DS_TYPE_GAUGE);
- redis_handle_info (rn->name, rr->str, "operations", NULL, "total_commands_processed", DS_TYPE_DERIVE);
+ redis_handle_info (rn->name, rr->str, "memory_lua", NULL, "used_memory_lua", DS_TYPE_GAUGE);
+ /* changes_since_last_save: Deprecated in redis version 2.6 and above */
+ redis_handle_info (rn->name, rr->str, "volatile_changes", NULL, "changes_since_last_save", DS_TYPE_GAUGE);
+ redis_handle_info (rn->name, rr->str, "total_connections", NULL, "total_connections_received", DS_TYPE_DERIVE);
+ redis_handle_info (rn->name, rr->str, "total_operations", NULL, "total_commands_processed", DS_TYPE_DERIVE);
redis_handle_info (rn->name, rr->str, "expired_keys", NULL, "expired_keys", DS_TYPE_GAUGE);
redis_handle_info (rn->name, rr->str, "expired_keys", NULL, "expired_keys", DS_TYPE_GAUGE);
- redis_handle_info (rn->name, rr->str, "pubsub", "patterns", "pubsub_patterns", DS_TYPE_GAUGE);
redis_handle_info (rn->name, rr->str, "pubsub", "channels", "pubsub_channels", DS_TYPE_GAUGE);
redis_handle_info (rn->name, rr->str, "pubsub", "channels", "pubsub_channels", DS_TYPE_GAUGE);
+ redis_handle_info (rn->name, rr->str, "pubsub", "patterns", "pubsub_patterns", DS_TYPE_GAUGE);
+ redis_handle_info (rn->name, rr->str, "current_connections", "slaves", "connected_slaves", DS_TYPE_GAUGE);
+
+ freeReplyObject (rr);
+
+ for (rq = rn->queries; rq != NULL; rq = rq->next)
+ redis_handle_query(rh, rn, rq);
redisFree (rh);
}
redisFree (rh);
}