static redis_query_t *redis_config_query (oconfig_item_t *ci) /* {{{ */
{
- redis_query_t *rc;
+ redis_query_t *rq;
int status;
int i;
- rc = calloc(1, sizeof(*rc));
- if (rc == NULL) {
+ 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, rc->type, sizeof(rc->type));
+ 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)sstrncpy(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("Exec", option->key) == 0) {
- status = cf_util_get_string_buffer(option, rc->query, sizeof(rc->query));
+ 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, rc->instance, sizeof(rc->instance));
+ 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;
}
- if (strlen(rc->query) == 0) {
- WARNING("redis plugin: invalid query definition for: %s", rc->type);
- goto err;
- }
- return rc;
+ return rq;
err:
- free(rc);
+ free(rq);
return NULL;
} /* }}} */
static int redis_config_node (oconfig_item_t *ci) /* {{{ */
{
redis_node_t rn;
- redis_query_t *rc;
+ redis_query_t *rq;
int i;
int status;
int timeout;
}
else if (strcasecmp ("Query", option->key) == 0)
{
- rc = redis_config_query(option);
- if (rc == NULL) {
+ rq = redis_config_query(option);
+ if (rq == NULL) {
status =1;
} else {
- rc->next = rn.queries;
- rn.queries = rc;
+ rq->next = rn.queries;
+ rn.queries = rq;
}
}
else if (strcasecmp ("Timeout", option->key) == 0)
return (0);
} /* }}} int redis_init */
-int redis_handle_info (char *node, char const *info_line, char const *type, char const *type_instance, char const *field_name, int ds_type) /* {{{ */
+static int redis_handle_info (char *node, char const *info_line, char const *type, char const *type_instance, char const *field_name, int ds_type) /* {{{ */
{
char *str = strstr (info_line, field_name);
static char buf[MAX_REDIS_VAL_SIZE];
} /* }}} int redis_handle_info */
-int redis_handle_query (redisContext *rh, redis_node_t *rn, redis_query_t *rc) /* {{{ */
+static 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 (rc->type);
+ ds = plugin_get_ds (rq->type);
if (!ds) {
- ERROR ("redis plugin: DataSet `%s' not defined.", rc->type);
+ 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.", rc->type);
+ ERROR ("redis plugin: DS `%s' has too many types.", rq->type);
return (-1);
}
- if ((rr = redisCommand(rh, rc->query)) == NULL) {
- WARNING("redis plugin: unable to carry out query `%s'.", rc->query);
+ if ((rr = redisCommand(rh, rq->query)) == NULL) {
+ WARNING("redis plugin: unable to carry out query `%s'.", rq->query);
return (-1);
}
break;
case REDIS_REPLY_STRING:
if (parse_value (rr->str, &val, ds->ds[0].type) == -1) {
- WARNING("redis plugin: Unable to parse field `%s'.", rc->type);
+ WARNING("redis plugin: Unable to parse field `%s'.", rq->type);
freeReplyObject (rr);
return (-1);
}
return (-1);
}
- redis_submit(rn->name, rc->type, (strlen(rc->instance) >0)?rc->instance:NULL, val);
+ redis_submit(rn->name, rq->type, (strlen(rq->instance) >0)?rq->instance:NULL, val);
freeReplyObject (rr);
return 0;
-} /* }}} int redis_handle_info */
+} /* }}} int redis_handle_query */
static int redis_read (void) /* {{{ */
{
redis_node_t *rn;
- redis_query_t *rc;
+ redis_query_t *rq;
for (rn = nodes_head; rn != NULL; rn = rn->next)
{
if (strlen (rn->passwd) > 0)
{
- DEBUG ("redis plugin: authenticanting node `%s' passwd(%s).", rn->name, rn->passwd);
- rr = redisCommand (rh, "AUTH %s", rn->passwd);
+ DEBUG ("redis plugin: authenticating node `%s' passwd(%s).", rn->name, rn->passwd);
- if (rr == NULL || rr->type != REDIS_REPLY_STATUS)
+ if ((rr = redisCommand (rh, "AUTH %s", rn->passwd)) == NULL)
{
WARNING ("redis plugin: unable to authenticate on node `%s'.", rn->name);
- if (rr != NULL)
- freeReplyObject (rr);
+ goto redis_fail;
+ }
- redisFree (rh);
- continue;
+ if (rr->type != REDIS_REPLY_STATUS)
+ {
+ WARNING ("redis plugin: invalid authentication on node `%s'.", rn->name);
+ goto redis_fail;
}
+
+ freeReplyObject (rr);
}
if ((rr = redisCommand(rh, "INFO")) == NULL)
{
- WARNING ("redis plugin: unable to connect to node `%s'.", rn->name);
- redisFree (rh);
- continue;
+ WARNING ("redis plugin: unable to get info from node `%s'.", rn->name);
+ goto redis_fail;
}
redis_handle_info (rn->name, rr->str, "uptime", NULL, "uptime_in_seconds", DS_TYPE_GAUGE);
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_DERIVE);
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 (rc = rn->queries; rc != NULL; rc = rc->next)
- redis_handle_query(rh, rn, rc);
+ for (rq = rn->queries; rq != NULL; rq = rq->next)
+ redis_handle_query(rh, rn, rq);
+redis_fail:
+ if (rr != NULL)
+ freeReplyObject (rr);
redisFree (rh);
}
projects / collectd.git / blobdiff