redis_query_t *next;
};
+struct prev_s {
+ derive_t keyspace_hits;
+ derive_t keyspace_misses;
+};
+typedef struct prev_s prev_t;
+
struct redis_node_s;
typedef struct redis_node_s redis_node_t;
struct redis_node_s {
int port;
struct timeval timeout;
bool report_command_stats;
+ bool report_cpu_usage;
redisContext *redisContext;
redis_query_t *queries;
+ prev_t prev;
redis_node_t *next;
};
rn->port = REDIS_DEF_PORT;
rn->timeout.tv_sec = REDIS_DEF_TIMEOUT_SEC;
+ rn->report_cpu_usage = true;
rn->host = strdup(REDIS_DEF_HOST);
if (rn->host == NULL) {
status = cf_util_get_string(option, &rn->passwd);
else if (strcasecmp("ReportCommandStats", option->key) == 0)
status = cf_util_get_boolean(option, &rn->report_command_stats);
+ else if (strcasecmp("ReportCpuUsage", option->key) == 0)
+ status = cf_util_get_boolean(option, &rn->report_cpu_usage);
else
WARNING("redis plugin: Option `%s' not allowed inside a `Node' "
"block. I'll ignore this option.",
} /* }}} */
__attribute__((nonnull(2))) static void
-redis_submit(char *plugin_instance, const char *type, const char *type_instance,
- value_t value) /* {{{ */
+redis_submit(const char *plugin_instance, const char *type,
+ const char *type_instance, value_t value) /* {{{ */
{
value_list_t vl = VALUE_LIST_INIT;
} /* }}} */
__attribute__((nonnull(2))) static void
-redis_submit2(char *plugin_instance, const char *type,
+redis_submit2(const char *plugin_instance, const char *type,
const char *type_instance, value_t value0,
value_t value1) /* {{{ */
{
rn->name = strdup("default");
rn->host = strdup(REDIS_DEF_HOST);
- if (rn->name == NULL || rn->host == NULL)
+ if (rn->name == NULL || rn->host == NULL) {
+ sfree(rn->name);
+ sfree(rn->host);
+ sfree(rn);
return ENOMEM;
+ }
return redis_node_add(rn);
} /* }}} int redis_init */
return 0;
} /* }}} int redis_handle_query */
-static int redis_db_stats(char *node, char const *info_line) /* {{{ */
+static int redis_db_stats(const char *node, char const *info_line) /* {{{ */
{
/* redis_db_stats parses and dispatches Redis database statistics,
* currently the number of keys for each database.
} /* }}} int redis_db_stats */
+static void redis_cpu_usage(const char *node, char const *info_line) {
+ while (42) {
+ value_t rusage_user;
+ value_t rusage_syst;
+
+ if (redis_get_info_value(info_line, "used_cpu_user", DS_TYPE_GAUGE,
+ &rusage_user) != 0)
+ break;
+
+ if (redis_get_info_value(info_line, "used_cpu_sys", DS_TYPE_GAUGE,
+ &rusage_syst) != 0)
+ break;
+
+ redis_submit2(node, "ps_cputime", "daemon",
+ (value_t){.derive = rusage_user.gauge * 1000000},
+ (value_t){.derive = rusage_syst.gauge * 1000000});
+ break;
+ }
+
+ while (42) {
+ value_t rusage_user;
+ value_t rusage_syst;
+
+ if (redis_get_info_value(info_line, "used_cpu_user_children", DS_TYPE_GAUGE,
+ &rusage_user) != 0)
+ break;
+
+ if (redis_get_info_value(info_line, "used_cpu_sys_children", DS_TYPE_GAUGE,
+ &rusage_syst) != 0)
+ break;
+
+ redis_submit2(node, "ps_cputime", "children",
+ (value_t){.derive = rusage_user.gauge * 1000000},
+ (value_t){.derive = rusage_syst.gauge * 1000000});
+ break;
+ }
+} /* void redis_cpu_usage */
+
+static gauge_t calculate_ratio_percent(derive_t part1, derive_t part2,
+ derive_t *prev1, derive_t *prev2) {
+ if ((*prev1 == 0) || (*prev2 == 0) || (part1 < *prev1) || (part2 < *prev2)) {
+ *prev1 = part1;
+ *prev2 = part2;
+ return NAN;
+ }
+
+ derive_t num = part1 - *prev1;
+ derive_t denom = part2 - *prev2 + num;
+
+ *prev1 = part1;
+ *prev2 = part2;
+
+ if (denom == 0)
+ return NAN;
+
+ if (num == 0)
+ return 0;
+
+ return 100.0 * (gauge_t)num / (gauge_t)denom;
+} /* gauge_t calculate_ratio_percent */
+
+static void redis_keyspace_usage(redis_node_t *rn, char const *info_line) {
+ value_t hits, misses;
+
+ if (redis_get_info_value(info_line, "keyspace_hits", DS_TYPE_DERIVE, &hits) !=
+ 0)
+ return;
+
+ if (redis_get_info_value(info_line, "keyspace_misses", DS_TYPE_DERIVE,
+ &misses) != 0)
+ return;
+
+ redis_submit(rn->name, "cache_result", "hits", hits);
+ redis_submit(rn->name, "cache_result", "misses", misses);
+
+ prev_t *prev = &rn->prev;
+ gauge_t ratio = calculate_ratio_percent(
+ hits.derive, misses.derive, &prev->keyspace_hits, &prev->keyspace_misses);
+ redis_submit(rn->name, "percent", "hitratio", (value_t){.gauge = ratio});
+
+} /* void redis_keyspace_usage */
+
static void redis_check_connection(redis_node_t *rn) {
if (rn->redisContext)
return;
"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, "operations_per_second", NULL,
- "instantaneous_ops_per_sec", 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, "evicted_keys", NULL, "evicted_keys",
DS_TYPE_GAUGE);
redis_handle_info(rn->name, rr->str, "current_connections", "slaves",
"connected_slaves", DS_TYPE_GAUGE);
- redis_handle_info(rn->name, rr->str, "cache_result", "hits", "keyspace_hits",
- DS_TYPE_DERIVE);
- redis_handle_info(rn->name, rr->str, "cache_result", "misses",
- "keyspace_misses", DS_TYPE_DERIVE);
redis_handle_info(rn->name, rr->str, "total_bytes", "input",
"total_net_input_bytes", DS_TYPE_DERIVE);
redis_handle_info(rn->name, rr->str, "total_bytes", "output",
"total_net_output_bytes", DS_TYPE_DERIVE);
- while (42) {
- value_t rusage_user;
- value_t rusage_syst;
-
- if (redis_get_info_value(rr->str, "used_cpu_user", DS_TYPE_GAUGE,
- &rusage_user) != 0)
- break;
-
- if (redis_get_info_value(rr->str, "used_cpu_sys", DS_TYPE_GAUGE,
- &rusage_syst) != 0)
- break;
-
- redis_submit2(rn->name, "ps_cputime", "daemon",
- (value_t){.derive = rusage_user.gauge * 1000000},
- (value_t){.derive = rusage_syst.gauge * 1000000});
- break;
- }
-
- while (42) {
- value_t rusage_user;
- value_t rusage_syst;
-
- if (redis_get_info_value(rr->str, "used_cpu_user_children", DS_TYPE_GAUGE,
- &rusage_user) != 0)
- break;
-
- if (redis_get_info_value(rr->str, "used_cpu_sys_children", DS_TYPE_GAUGE,
- &rusage_syst) != 0)
- break;
-
- redis_submit2(rn->name, "ps_cputime", "children",
- (value_t){.derive = rusage_user.gauge * 1000000},
- (value_t){.derive = rusage_syst.gauge * 1000000});
- break;
- }
+ redis_keyspace_usage(rn, rr->str);
redis_db_stats(rn->name, rr->str);
+ if (rn->report_cpu_usage)
+ redis_cpu_usage(rn->name, rr->str);
+
freeReplyObject(rr);
} /* void redis_read_server_info */