From: Florian Forster Date: Tue, 23 Oct 2007 14:10:11 +0000 (+0200) Subject: memcached plugin: Some of the data definitions have been torn appart. X-Git-Tag: collectd-4.2.0~20^2~5 X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=1b2f6c3bd4a34c36687dc09dbd71895132810e5f;p=collectd.git memcached plugin: Some of the data definitions have been torn appart. --- diff --git a/src/memcached.c b/src/memcached.c index d7fb19fa..39c599c2 100644 --- a/src/memcached.c +++ b/src/memcached.c @@ -106,7 +106,6 @@ static int memcached_query_daemon (char *buffer, int buffer_size) /* {{{ */ /* connect to the memcached daemon */ if (connect (fd, (struct sockaddr *) ai_ptr->ai_addr, ai_ptr->ai_addrlen)) { - char errbuf[1024]; shutdown(fd, SHUT_RDWR); close(fd); fd = -1; @@ -218,184 +217,260 @@ static int memcached_config (const char *key, const char *value) /* {{{ */ } /* }}} */ -#if 0 -static void memcached_submit_items(double curr_items, unsigned long long total_items) /* {{{ */ +static void submit_counter (const char *type, const char *type_inst, + counter_t value) /* {{{ */ { - value_t values[2]; - value_list_t vl = VALUE_LIST_INIT; - - values[0].gauge = curr_items; - values[1].counter = total_items; - - vl.values = values; - vl.values_len = 2; - vl.time = time (NULL); - strcpy (vl.host, hostname_g); - strcpy (vl.plugin, "memcached"); - - plugin_dispatch_values ("memcached_items", &vl); -} -/* }}} */ -#endif - -static void memcached_submit_connections(double curr_connections, unsigned long long total_connections) /* {{{ */ -{ - value_t values[2]; + value_t values[1]; value_list_t vl = VALUE_LIST_INIT; - values[0].gauge = curr_connections; - values[1].counter = total_connections; + values[0].counter = value; vl.values = values; - vl.values_len = 2; + vl.values_len = 1; vl.time = time (NULL); strcpy (vl.host, hostname_g); strcpy (vl.plugin, "memcached"); + if (type_inst != NULL) + { + strncpy (vl.type_instance, type_inst, sizeof (vl.type_instance)); + vl.type_instance[sizeof (vl.type_instance) - 1] = '\0'; + } - plugin_dispatch_values ("memcached_connections", &vl); -} + plugin_dispatch_values (type, &vl); +} /* void memcached_submit_cmd */ /* }}} */ -static void memcached_submit_bytes(unsigned long long bytes_read, unsigned long long bytes_written) /* {{{ */ +static void submit_counter2 (const char *type, const char *type_inst, + counter_t value0, counter_t value1) /* {{{ */ { value_t values[2]; value_list_t vl = VALUE_LIST_INIT; - values[0].counter = bytes_read; - values[1].counter = bytes_written; + values[0].counter = value0; + values[1].counter = value1; vl.values = values; vl.values_len = 2; vl.time = time (NULL); strcpy (vl.host, hostname_g); strcpy (vl.plugin, "memcached"); + if (type_inst != NULL) + { + strncpy (vl.type_instance, type_inst, sizeof (vl.type_instance)); + vl.type_instance[sizeof (vl.type_instance) - 1] = '\0'; + } - plugin_dispatch_values ("memcached_bytes", &vl); -} + plugin_dispatch_values (type, &vl); +} /* void memcached_submit_cmd */ /* }}} */ -static void memcached_submit_cmd(unsigned long long cmd_get, unsigned long long cmd_set, unsigned long long get_hits, unsigned long long get_misses) /* {{{ */ +static void submit_gauge (const char *type, const char *type_inst, + gauge_t value) /* {{{ */ { - value_t values[4]; + value_t values[1]; value_list_t vl = VALUE_LIST_INIT; - values[0].counter = cmd_get; - values[1].counter = cmd_set; - values[2].counter = get_hits; - values[3].counter = get_misses; + values[0].gauge = value; vl.values = values; - vl.values_len = 4; + vl.values_len = 1; vl.time = time (NULL); strcpy (vl.host, hostname_g); strcpy (vl.plugin, "memcached"); + if (type_inst != NULL) + { + strncpy (vl.type_instance, type_inst, sizeof (vl.type_instance)); + vl.type_instance[sizeof (vl.type_instance) - 1] = '\0'; + } - plugin_dispatch_values ("memcached_cmd", &vl); + plugin_dispatch_values (type, &vl); } /* }}} */ -static void memcached_submit_rusage(unsigned long long rusage_user, unsigned long long rusage_system) /* {{{ */ +static void submit_gauge2 (const char *type, const char *type_inst, + gauge_t value0, gauge_t value1) /* {{{ */ { value_t values[2]; value_list_t vl = VALUE_LIST_INIT; - values[0].counter = rusage_user; - values[1].counter = rusage_system; + values[0].gauge = value0; + values[1].gauge = value1; vl.values = values; vl.values_len = 2; vl.time = time (NULL); strcpy (vl.host, hostname_g); strcpy (vl.plugin, "memcached"); + if (type_inst != NULL) + { + strncpy (vl.type_instance, type_inst, sizeof (vl.type_instance)); + vl.type_instance[sizeof (vl.type_instance) - 1] = '\0'; + } - plugin_dispatch_values ("memcached_rusage", &vl); + plugin_dispatch_values (type, &vl); } /* }}} */ static int memcached_read (void) /* {{{ */ { char buf[1024]; - char *lines[128]; char *fields[3]; char *ptr; + char *line; char *saveptr; int fields_num; - int lines_num = 0; - int i; - unsigned long long total_connections = 0, bytes_read = 0, bytes_written = 0, cmd_get = 0, cmd_set = 0, get_hits = 0, get_misses = 0, rusage_user = 0, rusage_system = 0; - double curr_connections = 0; + + gauge_t bytes_used = NAN; + gauge_t bytes_total = NAN; + counter_t rusage_user = 0; + counter_t rusage_syst = 0; + counter_t octets_rx = 0; + counter_t octets_tx = 0; /* get data from daemon */ if (memcached_query_daemon (buf, sizeof (buf)) < 0) { return -1; } +#define FIELD_IS(cnst) \ + (((sizeof(cnst) - 1) == name_len) && (strcmp (cnst, fields[1]) == 0)) + ptr = buf; saveptr = NULL; - while ((lines[lines_num] = strtok_r (ptr, "\n\r", &saveptr)) != NULL) { - ptr = NULL; - lines_num++; + while ((line = strtok_r (ptr, "\n\r", &saveptr)) != NULL) + { + int name_len; - if (lines_num >= 127) break; - } + ptr = NULL; -#define FIELD_IS(cnst) \ - (sizeof(cnst) - 1) == name_len && memcmp(cnst, fields[1], sizeof(cnst)) == 0 + fields_num = strsplit(line, fields, 3); + if (fields_num != 3) + continue; - for (i = 0; i < lines_num; i++) { - int name_len; + name_len = strlen(fields[1]); + if (name_len == 0) + continue; - fields_num = strsplit(lines[i], fields, 3); - if (fields_num != 3) continue; + /* + * For an explanation on these fields please refer to + * + */ + + /* + * CPU time consumed by the memcached process + */ + if (FIELD_IS ("rusage_user")) + { + rusage_user = atoll (fields[2]); + } + else if (FIELD_IS ("rusage_system")) + { + rusage_syst = atoll(fields[2]); + } + + /* + * Number of threads of this instance + */ + else if (FIELD_IS ("threads")) + { + submit_gauge2 ("ps_count", NULL, NAN, atof (fields[2])); + } - name_len = strlen(fields[1]); - if (name_len == 0) continue; - - if (FIELD_IS("rusage_user")) { - rusage_user = atoll(fields[2]); - } else if (FIELD_IS("rusage_system")) { - rusage_system = atoll(fields[2]); -/* } else if (FIELD_IS("curr_items")) { - curr_items = atof(fields[2]); - } else if (FIELD_IS("total_items")) { + /* + * Number of items stored + */ + else if (FIELD_IS ("curr_items")) + { + submit_gauge ("memcached_items", "current", atof (fields[2])); + } +/* + else if (FIELD_IS ("total_items")) + { total_items = atoll(fields[2]); - } else if (FIELD_IS("bytes")) { - bytes = atof(fields[2]); */ - } else if (FIELD_IS("curr_connections")) { - curr_connections = atof(fields[2]); - } else if (FIELD_IS("total_connections")) { + } + */ + + /* + * Number of bytes used and available (total - used) + */ + else if (FIELD_IS ("bytes")) + { + bytes_used = atof (fields[2]); + } + else if (FIELD_IS ("limit_maxbytes")) + { + bytes_total = atof(fields[2]); + } + + /* + * Connections + */ + else if (FIELD_IS ("curr_connections")) + { + submit_gauge ("memcached_connections", "current", atof (fields[2])); + } +/* + else if (FIELD_IS("total_connections")) + { total_connections = atoll(fields[2]); -/* } else if (FIELD_IS("connection_structures")) { - connection_structures = atof(fields[2]); */ - } else if (FIELD_IS("cmd_get")) { - cmd_get = atoll(fields[2]); - } else if (FIELD_IS("cmd_set")) { - cmd_set = atoll(fields[2]); - } else if (FIELD_IS("get_hits")) { - get_hits = atoll(fields[2]); - } else if (FIELD_IS("get_misses")) { - get_misses = atoll(fields[2]); -/* } else if (FIELD_IS("evictions")) { - evictions = atoll(fields[2]); */ - } else if (FIELD_IS("bytes_read")) { - bytes_read = atoll(fields[2]); - } else if (FIELD_IS("bytes_written")) { - bytes_written = atoll(fields[2]); -/* } else if (FIELD_IS("limit_maxbytes")) { - limit_maxbytes = atof(fields[2]); - } else if (FIELD_IS("threads")) { - threads = atof(fields[2]); */ } - } +*/ -#if 0 - memcached_submit_items(curr_items, total_items); -#endif - memcached_submit_connections(curr_connections, total_connections); - memcached_submit_bytes(bytes_read, bytes_written); - memcached_submit_cmd(cmd_get, cmd_set, get_hits, get_misses); - memcached_submit_rusage(rusage_user, rusage_system); +/* + * ``Number of connection structures allocated by the server'' + else if (FIELD_IS ("connection_structures")) + { + connection_structures = atof(fields[2]); + } + */ + + /* + * Commands + */ + else if ((name_len > 4) && (strncmp (fields[1], "cmd_", 4) == 0)) + { + const char *name = fields[1] + 4; + submit_counter ("memcached_command", name, atoll (fields[2])); + } + + /* + * Operations on the cache, i. e. cache hits, cache misses and evictions of items + */ + else if (FIELD_IS ("get_hits")) + { + submit_counter ("memcached_ops", "hits", atoll (fields[2])); + } + else if (FIELD_IS ("get_misses")) + { + submit_counter ("memcached_ops", "misses", atoll (fields[2])); + } + else if (FIELD_IS ("evictions")) + { + submit_counter ("memcached_ops", "evictions", atoll (fields[2])); + } + + /* + * Network traffic + */ + else if (FIELD_IS ("bytes_read")) + { + octets_rx = atoll (fields[2]); + } + else if (FIELD_IS ("bytes_written")) + { + octets_tx = atoll (fields[2]); + } + } /* while ((line = strtok_r (ptr, "\n\r", &saveptr)) != NULL) */ + + if (!isnan (bytes_used) && !isnan (bytes_total) && (bytes_used <= bytes_total)) + submit_gauge2 ("df", "cache", bytes_used, bytes_total - bytes_used); + + if ((rusage_user != 0) || (rusage_syst != 0)) + submit_counter2 ("ps_cputime", NULL, rusage_user, rusage_syst); + if ((octets_rx != 0) || (octets_tx != 0)) + submit_counter2 ("memcached_octets", NULL, octets_rx, octets_tx); + return 0; } /* }}} */ diff --git a/src/types.db b/src/types.db index 122edac8..bcfbeafd 100644 --- a/src/types.db +++ b/src/types.db @@ -48,10 +48,11 @@ mysql_octets rx:COUNTER:0:4294967295, tx:COUNTER:0:4294967295 mysql_qcache hits:COUNTER:0:U, inserts:COUNTER:0:U, not_cached:COUNTER:0:U, lowmem_prunes:COUNTER:0:U, queries_in_cache:GAUGE:0:U mysql_threads running:GAUGE:0:U, connected:GAUGE:0:U, cached:GAUGE:0:U, created:COUNTER:0:U nfs_procedure value:COUNTER:0:4294967295 -memcached_connections current:GAUGE:0:U, total:COUNTER:0:U -memcached_bytes read:COUNTER:0:U, written:COUNTER:0:U -memcached_cmd get:COUNTER:0:U, set:COUNTER:0:U, get_hits:COUNTER:0:U, get_misses:COUNTER:0:U -memcached_rusage user:COUNTER:0:U, system:COUNTER:0:U +memcached_command value:COUNTER:0:U +memcached_connections value:GAUGE:0:U +memcached_items value:GAUGE:0:U +memcached_octets rx:COUNTER:0:4294967295, tx:COUNTER:0:4294967295 +memcached_ops value:COUNTER:0:134217728 percent percent:GAUGE:0:100.1 ping ping:GAUGE:0:65535 power value:GAUGE:0:U