X-Git-Url: https://git.octo.it/?p=collectd.git;a=blobdiff_plain;f=src%2Fredis.c;h=2d33e2dc9493479e6d30c41e85b0349e10ac5baf;hp=26948355f617d7603030326940f0dcf67795edf0;hb=d486225f89ea52d8ed2b4242eba2ad94c409f837;hpb=4477cc9c2e95711ce868bc8e849990cd1b539c6b diff --git a/src/redis.c b/src/redis.c index 26948355..2d33e2dc 100644 --- a/src/redis.c +++ b/src/redis.c @@ -36,6 +36,7 @@ #define REDIS_DEF_PASSWD "" #define REDIS_DEF_PORT 6379 #define REDIS_DEF_TIMEOUT 2000 +#define REDIS_DEF_DB_COUNT 16 #define MAX_REDIS_NODE_NAME 64 #define MAX_REDIS_PASSWD_LENGTH 512 #define MAX_REDIS_VAL_SIZE 256 @@ -75,7 +76,7 @@ struct redis_node_s { redis_node_t *next; }; -static redis_node_t *nodes_head = NULL; +static redis_node_t *nodes_head; static int redis_node_add(const redis_node_t *rn) /* {{{ */ { @@ -89,13 +90,13 @@ static int redis_node_add(const redis_node_t *rn) /* {{{ */ if (rn_ptr != NULL) { ERROR("redis plugin: A node with the name `%s' already exists.", rn->name); - return (-1); + return -1; } rn_copy = malloc(sizeof(*rn_copy)); if (rn_copy == NULL) { ERROR("redis plugin: malloc failed adding redis_node to the tree."); - return (-1); + return -1; } memcpy(rn_copy, rn, sizeof(*rn_copy)); @@ -112,7 +113,7 @@ static int redis_node_add(const redis_node_t *rn) /* {{{ */ rn_ptr->next = rn_copy; } - return (0); + return 0; } /* }}} */ static redis_query_t *redis_config_query(oconfig_item_t *ci) /* {{{ */ @@ -170,7 +171,7 @@ static int redis_config_node(oconfig_item_t *ci) /* {{{ */ status = cf_util_get_string_buffer(ci, rn.name, sizeof(rn.name)); if (status != 0) - return (status); + return status; for (int i = 0; i < ci->children_num; i++) { oconfig_item_t *option = ci->children + i; @@ -207,9 +208,9 @@ static int redis_config_node(oconfig_item_t *ci) /* {{{ */ } if (status != 0) - return (status); + return status; - return (redis_node_add(&rn)); + return redis_node_add(&rn); } /* }}} int redis_config_node */ static int redis_config(oconfig_item_t *ci) /* {{{ */ @@ -227,10 +228,10 @@ static int redis_config(oconfig_item_t *ci) /* {{{ */ if (nodes_head == NULL) { ERROR("redis plugin: No valid node configuration could be found."); - return (ENOENT); + return ENOENT; } - return (0); + return 0; } /* }}} */ __attribute__((nonnull(2))) static void @@ -263,7 +264,7 @@ static int redis_init(void) /* {{{ */ if (nodes_head == NULL) redis_node_add(&rn); - return (0); + return 0; } /* }}} int redis_init */ static int redis_handle_info(char *node, char const *info_line, @@ -284,13 +285,13 @@ static int redis_handle_info(char *node, char const *info_line, if (parse_value(buf, &val, ds_type) == -1) { WARNING("redis plugin: Unable to parse field `%s'.", field_name); - return (-1); + return -1; } redis_submit(node, type, type_instance, val); - return (0); + return 0; } - return (-1); + return -1; } /* }}} int redis_handle_info */ @@ -304,17 +305,17 @@ static int redis_handle_query(redisContext *rh, redis_node_t *rn, ds = plugin_get_ds(rq->type); if (!ds) { ERROR("redis plugin: DataSet `%s' not defined.", rq->type); - return (-1); + return -1; } if (ds->ds_num != 1) { ERROR("redis plugin: DS `%s' has too many types.", rq->type); - return (-1); + return -1; } if ((rr = redisCommand(rh, rq->query)) == NULL) { WARNING("redis plugin: unable to carry out query `%s'.", rq->query); - return (-1); + return -1; } switch (rr->type) { @@ -338,13 +339,13 @@ static int redis_handle_query(redisContext *rh, redis_node_t *rn, 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); + return -1; } break; default: WARNING("redis plugin: Cannot coerce redis type."); freeReplyObject(rr); - return (-1); + return -1; } redis_submit(rn->name, rq->type, @@ -355,39 +356,43 @@ static int redis_handle_query(redisContext *rh, redis_node_t *rn, static int redis_db_stats(char *node, char const *info_line) /* {{{ */ { - unsigned char db; - unsigned char max_db = 16; - static char field_name[10]; - static char db_id[3]; - char *str; - static char buf[MAX_REDIS_VAL_SIZE]; - value_t val; - int i; - - for (db = 0; db < max_db; db++) { - ssnprintf(field_name, sizeof(field_name), "db%d:keys", db); - - str = strstr(info_line, field_name); - if (str) { - str += strlen(field_name) + 1; /* also skip the '=' */ - for (i = 0; (*str && (isdigit((unsigned char)*str) || *str == '.')); i++, str++) - buf[i] = *str; - buf[i] = '\0'; - - if (parse_value(buf, &val, DS_TYPE_GAUGE) == -1) { - WARNING("redis plugin: Unable to parse field `%s'.", field_name); - return (-1); - } - - ssnprintf(db_id, sizeof(db_id), "%d", db); - redis_submit (node, "records", db_id, val); - } + /* redis_db_stats parses and dispatches Redis database statistics, + * currently the number of keys for each database. + * info_line needs to have the following format: + * db0:keys=4,expires=0,avg_ttl=0 + */ + + for (int db = 0; db < REDIS_DEF_DB_COUNT; db++) { + static char buf[MAX_REDIS_VAL_SIZE]; + static char field_name[11]; + static char db_id[3]; + value_t val; + char *str; + int i; + + snprintf(field_name, sizeof(field_name), "db%d:keys=", db); + + str = strstr(info_line, field_name); + if (!str) + continue; + + str += strlen(field_name); + for (i = 0; (*str && isdigit((int)*str)); i++, str++) + buf[i] = *str; + buf[i] = '\0'; + + if (parse_value(buf, &val, DS_TYPE_GAUGE) != 0) { + WARNING("redis plugin: Unable to parse field `%s'.", field_name); + return -1; + } + + snprintf(db_id, sizeof(db_id), "%d", db); + redis_submit(node, "records", db_id, val); } - return (0); + return 0; } /* }}} int redis_db_stats */ - static int redis_read(void) /* {{{ */ { for (redis_node_t *rn = nodes_head; rn != NULL; rn = rn->next) { @@ -464,7 +469,7 @@ static int redis_read(void) /* {{{ */ redis_handle_info(rn->name, rr->str, "total_bytes", "output", "total_net_output_bytes", DS_TYPE_DERIVE); - redis_db_stats (rn->name, rr->str); + redis_db_stats(rn->name, rr->str); for (redis_query_t *rq = rn->queries; rq != NULL; rq = rq->next) redis_handle_query(rh, rn, rq);