![[tokkee]](http://tokkee.org/images/avatar.png){kind=avatar}
diff --git a/src/backend/collectd.c b/src/backend/collectd.c
index ad5cad1b439906b31248963b33b4b99b23fd4870..f745fc9316d66e9849c219c4ebe2e1d3769a78a9 100644 (file)
--- a/src/backend/collectd.c
+++ b/src/backend/collectd.c
/*
- * syscollector - src/backend/collectd.c
+ * SysDB - src/backend/collectd.c
* Copyright (C) 2012 Sebastian 'tokkee' Harl <sh@tokkee.org>
* All rights reserved.
*
* ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
-#include "syscollector.h"
+#include "sysdb.h"
#include "core/plugin.h"
#include "core/store.h"
#include "utils/string.h"
#include <stdlib.h>
#include <string.h>
-SC_PLUGIN_MAGIC;
+SDB_PLUGIN_MAGIC;
+
+/*
+ * private data types
+ */
+
+typedef struct {
+ char *current_host;
+ sdb_time_t current_timestamp;
+ int svc_updated;
+ int svc_failed;
+} sdb_collectd_state_t;
+#define SDB_COLLECTD_STATE_INIT { NULL, 0, 0, 0 }
/*
* private helper functions
*/
static int
-sc_collectd_parse_value(char *line,
- sc_time_t *timestamp, char **host, char **svc)
+sdb_collectd_add_host(const char *hostname, sdb_time_t last_update)
{
- char *timestamp_str;
- double timestamp_dbl;
+ sdb_host_t host = SDB_HOST_INIT;
+ char name[strlen(hostname) + 1];
- char *hostname, *service;
+ int status;
- char *endptr = NULL;
-
- timestamp_str = line;
- hostname = strchr(timestamp_str, ' ');
+ strncpy(name, hostname, sizeof(name));
- if (! hostname) {
- fprintf(stderr, "collectd backend: Failed to find hostname "
- "in LISTVAL output, line: %s\n", line);
- return -1;
- }
-
- *hostname = '\0';
- ++hostname;
-
- service = strchr(hostname, '/');
+ host.host_name = name;
+ host.host_last_update = last_update;
- if (! service)
- fprintf(stderr, "collectd backend: Failed to find service name "
- "in LISTVAL output, line: %s\n", line);
- else {
- *service = '\0';
- ++service;
- }
+ status = sdb_store_host(&host);
- errno = 0;
- timestamp_dbl = strtod(timestamp_str, &endptr);
- if (errno || (timestamp_str == endptr)) {
- char errbuf[1024];
- fprintf(stderr, "collectd backend: Failed to "
- "parse timestamp (%s): %s\n", timestamp_str,
- sc_strerror(errno, errbuf, sizeof(errbuf)));
+ if (status < 0) {
+ fprintf(stderr, "collectd backend: Failed to store/update "
+ "host '%s'.\n", name);
return -1;
}
- if (endptr && (*endptr != '\0'))
- fprintf(stderr, "collectd backend: Ignoring garbage "
- "after number when parsing timestamp: %s.\n",
- endptr);
-
- *timestamp = DOUBLE_TO_SC_TIME(timestamp_dbl);
- *host = hostname;
- *svc = service;
+ else if (status > 0) /* value too old */
+ return 0;
+
+ fprintf(stderr, "collectd backend: Added/updated host '%s' "
+ "(last update timestamp = %"PRIscTIME").\n",
+ name, last_update);
return 0;
-} /* sc_collectd_parse_value */
+} /* sdb_collectd_add_host */
static int
-sc_collectd_add_host(char *hostname, sc_time_t last_update)
+sdb_collectd_add_svc(const char *hostname, const char *plugin,
+ const char *type, sdb_time_t last_update)
{
- sc_host_t host = SC_HOST_INIT;
+ sdb_service_t svc = SDB_SVC_INIT;
+ char host[strlen(hostname) + 1];
+ char name[strlen(plugin) + strlen(type) + 2];
- host.host_name = hostname;
- host.host_last_update = last_update;
+ int status;
+
+ strncpy(host, hostname, sizeof(host));
+ snprintf(name, sizeof(name), "%s/%s", plugin, type);
+
+ svc.hostname = host;
+ svc.svc_name = name;
+ svc.svc_last_update = last_update;
- if (sc_store_host(&host)) {
+ status = sdb_store_service(&svc);
+ if (status < 0) {
fprintf(stderr, "collectd backend: Failed to store/update "
- "host '%s'.\n", hostname);
+ "service '%s/%s'.\n", host, name);
return -1;
}
-
- fprintf(stderr, "collectd backend: Added/updated host '%s' "
- "(last update timestamp = %"PRIscTIME").\n",
- hostname, last_update);
return 0;
-} /* sc_collectd_add_host */
+} /* sdb_collectd_add_svc */
static int
-sc_collectd_add_svc(char *hostname, char *name, sc_time_t last_update)
+sdb_collectd_get_data(sdb_unixsock_client_t __attribute__((unused)) *client,
+ size_t n, sdb_data_t *data, sdb_object_t *user_data)
{
- sc_service_t svc = SC_SVC_INIT;
+ sdb_collectd_state_t *state;
- svc.hostname = hostname;
- svc.svc_name = name;
- svc.svc_last_update = last_update;
+ const char *hostname;
+ const char *plugin;
+ const char *type;
+ sdb_time_t last_update;
- if (sc_store_service(&svc)) {
- fprintf(stderr, "collectd backend: Failed to store/update "
- "service '%s/%s'.\n", hostname, name);
+ assert(user_data);
+
+ assert(n == 4);
+ assert((data[0].type == SDB_TYPE_DATETIME)
+ && (data[1].type == SDB_TYPE_STRING)
+ && (data[2].type == SDB_TYPE_STRING)
+ && (data[3].type == SDB_TYPE_STRING));
+
+ last_update = data[0].data.datetime;
+ hostname = data[1].data.string;
+ plugin = data[2].data.string;
+ type = data[3].data.string;
+
+ state = SDB_OBJ_WRAPPER(user_data)->data;
+
+ if (! state->current_host) {
+ state->current_host = strdup(hostname);
+ state->current_timestamp = last_update;
+ }
+
+ if (! state->current_host) {
+ char errbuf[1024];
+ fprintf(stderr, "collectd backend: Failed to allocate "
+ "string buffer: %s\n",
+ sdb_strerror(errno, errbuf, sizeof(errbuf)));
return -1;
}
+
+ if (! sdb_store_get_host(hostname))
+ sdb_collectd_add_host(hostname, last_update);
+
+ if (sdb_collectd_add_svc(hostname, plugin, type, last_update))
+ ++state->svc_failed;
+ else
+ ++state->svc_updated;
+
+ if (! strcasecmp(state->current_host, hostname)) {
+ if (last_update > state->current_timestamp)
+ state->current_timestamp = last_update;
+ return 0;
+ }
+
+ /* new host */
+ sdb_collectd_add_host(hostname, last_update);
+
+ fprintf(stderr, "collectd backend: Added/updated "
+ "%i service%s (%i failed) for host '%s'.\n",
+ state->svc_updated, state->svc_updated == 1 ? "" : "s",
+ state->svc_failed, state->current_host);
+ state->svc_updated = state->svc_failed = 0;
+
+ free(state->current_host);
+ state->current_host = strdup(hostname);
+ state->current_timestamp = last_update;
return 0;
-} /* sc_collectd_add_svc */
+} /* sdb_collectd_get_data */
/*
* plugin API
*/
static int
-sc_collectd_init(sc_object_t *user_data)
+sdb_collectd_init(sdb_object_t *user_data)
{
- sc_unixsock_client_t *client;
+ sdb_unixsock_client_t *client;
if (! user_data)
return -1;
- client = SC_OBJ_WRAPPER(user_data)->data;
- if (sc_unixsock_client_connect(client)) {
+ client = SDB_OBJ_WRAPPER(user_data)->data;
+ if (sdb_unixsock_client_connect(client)) {
fprintf(stderr, "collectd backend: "
"Failed to connect to collectd.\n");
return -1;
fprintf(stderr, "collectd backend: Successfully "
"connected to collectd @ %s.\n",
- sc_unixsock_client_path(client));
+ sdb_unixsock_client_path(client));
return 0;
-} /* sc_collectd_init */
+} /* sdb_collectd_init */
static int
-sc_collectd_shutdown(__attribute__((unused)) sc_object_t *user_data)
+sdb_collectd_shutdown(__attribute__((unused)) sdb_object_t *user_data)
{
return 0;
-} /* sc_collectd_shutdown */
+} /* sdb_collectd_shutdown */
static int
-sc_collectd_collect(sc_object_t *user_data)
+sdb_collectd_collect(sdb_object_t *user_data)
{
- sc_unixsock_client_t *client;
+ sdb_unixsock_client_t *client;
char buffer[1024];
char *line;
char *msg;
char *endptr = NULL;
- long int count, i;
+ long int count;
- char *current_host = NULL;
- sc_time_t current_timestamp = 0;
-
- int svc_updated = 0;
- int svc_failed = 0;
+ sdb_collectd_state_t state = SDB_COLLECTD_STATE_INIT;
+ sdb_object_wrapper_t state_obj = SDB_OBJECT_WRAPPER_STATIC(&state,
+ /* destructor = */ NULL);
if (! user_data)
return -1;
- client = SC_OBJ_WRAPPER(user_data)->data;
+ client = SDB_OBJ_WRAPPER(user_data)->data;
- if (sc_unixsock_client_send(client, "LISTVAL") <= 0) {
+ if (sdb_unixsock_client_send(client, "LISTVAL") <= 0) {
fprintf(stderr, "collectd backend: Failed to send LISTVAL command "
- "to collectd @ %s.\n", sc_unixsock_client_path(client));
+ "to collectd @ %s.\n", sdb_unixsock_client_path(client));
return -1;
}
- line = sc_unixsock_client_recv(client, buffer, sizeof(buffer));
+ line = sdb_unixsock_client_recv(client, buffer, sizeof(buffer));
if (! line) {
fprintf(stderr, "collectd backend: Failed to read status "
"of LISTVAL command from collectd @ %s.\n",
- sc_unixsock_client_path(client));
+ sdb_unixsock_client_path(client));
return -1;
}
if (errno || (line == endptr)) {
fprintf(stderr, "collectd backend: Failed to parse status "
"of LISTVAL command from collectd @ %s.\n",
- sc_unixsock_client_path(client));
+ sdb_unixsock_client_path(client));
return -1;
}
if (count < 0) {
fprintf(stderr, "collectd backend: Failed to get value list "
- "from collectd @ %s: %s\n", sc_unixsock_client_path(client),
+ "from collectd @ %s: %s\n", sdb_unixsock_client_path(client),
msg ? msg : line);
return -1;
}
- for (i = 0; i < count; ++i) {
- char *hostname = NULL, *service = NULL;
- sc_time_t last_update = 0;
-
- line = sc_unixsock_client_recv(client, buffer, sizeof(buffer));
-
- if (sc_collectd_parse_value(line, &last_update, &hostname, &service))
- continue;
-
- if (! current_host)
- current_host = strdup(hostname);
- if (! current_host) {
- char errbuf[1024];
- fprintf(stderr, "collectd backend: Failed to allocate "
- "string buffer: %s\n",
- sc_strerror(errno, errbuf, sizeof(errbuf)));
- return -1;
- }
-
- if (! sc_store_get_host(hostname))
- sc_collectd_add_host(hostname, last_update);
-
- if (sc_collectd_add_svc(hostname, service, last_update))
- ++svc_failed;
- else
- ++svc_updated;
-
- assert(hostname && service);
- if (! strcasecmp(current_host, hostname)) {
- if (last_update > current_timestamp)
- current_timestamp = last_update;
- continue;
- }
-
- /* new host */
- sc_collectd_add_host(current_host, current_timestamp);
-
- fprintf(stderr, "collectd backend: Added/updated "
- "%i service%s (%i failed) for host '%s'.\n",
- svc_updated, svc_updated == 1 ? "" : "s",
- svc_failed, current_host);
- svc_updated = svc_failed = 0;
-
- free(current_host);
- current_host = strdup(hostname);
- current_timestamp = last_update;
+ if (sdb_unixsock_client_process_lines(client, sdb_collectd_get_data,
+ SDB_OBJ(&state_obj), count, /* delim */ " /",
+ /* column count = */ 4,
+ SDB_TYPE_DATETIME, SDB_TYPE_STRING,
+ SDB_TYPE_STRING, SDB_TYPE_STRING)) {
+ fprintf(stderr, "collectd backend: Failed to read response "
+ "from collectd @ %s.\n", sdb_unixsock_client_path(client));
+ return -1;
}
- if (current_host) {
- sc_collectd_add_host(current_host, current_timestamp);
+ if (state.current_host) {
+ sdb_collectd_add_host(state.current_host, state.current_timestamp);
fprintf(stderr, "collectd backend: Added/updated "
"%i service%s (%i failed) for host '%s'.\n",
- svc_updated, svc_updated == 1 ? "" : "s",
- svc_failed, current_host);
+ state.svc_updated, state.svc_updated == 1 ? "" : "s",
+ state.svc_failed, state.current_host);
}
return 0;
-} /* sc_collectd_collect */
+} /* sdb_collectd_collect */
static int
-sc_collectd_config_instance(oconfig_item_t *ci)
+sdb_collectd_config_instance(oconfig_item_t *ci)
{
char *name = NULL;
char *socket = NULL;
char cb_name[1024];
- sc_object_t *user_data;
- sc_unixsock_client_t *client;
+ sdb_object_t *user_data;
+ sdb_unixsock_client_t *client;
int i;
snprintf(cb_name, sizeof(cb_name), "collectd-%s", name);
cb_name[sizeof(cb_name) - 1] = '\0';
- client = sc_unixsock_client_create(socket);
+ client = sdb_unixsock_client_create(socket);
if (! client) {
char errbuf[1024];
fprintf(stderr, "collectd backend: Failed to create unixsock client: "
- "%s\n", sc_strerror(errno, errbuf, sizeof(errbuf)));
+ "%s\n", sdb_strerror(errno, errbuf, sizeof(errbuf)));
return -1;
}
- user_data = sc_object_create_wrapper(client,
- (void (*)(void *))sc_unixsock_client_destroy);
+ user_data = sdb_object_create_wrapper(client,
+ (void (*)(void *))sdb_unixsock_client_destroy);
if (! user_data) {
- sc_unixsock_client_destroy(client);
- fprintf(stderr, "collectd backend: Failed to allocate sc_object_t\n");
+ sdb_unixsock_client_destroy(client);
+ fprintf(stderr, "collectd backend: Failed to allocate sdb_object_t\n");
return -1;
}
- sc_plugin_register_init(cb_name, sc_collectd_init, user_data);
- sc_plugin_register_shutdown(cb_name, sc_collectd_shutdown, user_data);
+ sdb_plugin_register_init(cb_name, sdb_collectd_init, user_data);
+ sdb_plugin_register_shutdown(cb_name, sdb_collectd_shutdown, user_data);
- sc_plugin_register_collector(cb_name, sc_collectd_collect,
+ sdb_plugin_register_collector(cb_name, sdb_collectd_collect,
/* interval */ NULL, user_data);
/* pass control to the list */
- sc_object_deref(user_data);
+ sdb_object_deref(user_data);
return 0;
-} /* sc_collectd_config_instance */
+} /* sdb_collectd_config_instance */
static int
-sc_collectd_config(oconfig_item_t *ci)
+sdb_collectd_config(oconfig_item_t *ci)
{
int i;
oconfig_item_t *child = ci->children + i;
if (! strcasecmp(child->key, "Instance"))
- sc_collectd_config_instance(child);
+ sdb_collectd_config_instance(child);
else
fprintf(stderr, "collectd backend: Ignoring unknown config "
"option '%s'.\n", child->key);
}
return 0;
-} /* sc_collectd_config */
+} /* sdb_collectd_config */
int
-sc_module_init(sc_plugin_info_t *info)
+sdb_module_init(sdb_plugin_info_t *info)
{
- sc_plugin_set_info(info, SC_PLUGIN_INFO_NAME, "collectd");
- sc_plugin_set_info(info, SC_PLUGIN_INFO_DESC,
+ sdb_plugin_set_info(info, SDB_PLUGIN_INFO_NAME, "collectd");
+ sdb_plugin_set_info(info, SDB_PLUGIN_INFO_DESC,
"backend accessing the system statistics collection daemon");
- sc_plugin_set_info(info, SC_PLUGIN_INFO_COPYRIGHT,
+ sdb_plugin_set_info(info, SDB_PLUGIN_INFO_COPYRIGHT,
"Copyright (C) 2012 Sebastian 'tokkee' Harl <sh@tokkee.org>");
- sc_plugin_set_info(info, SC_PLUGIN_INFO_LICENSE, "BSD");
- sc_plugin_set_info(info, SC_PLUGIN_INFO_VERSION, SC_VERSION);
- sc_plugin_set_info(info, SC_PLUGIN_INFO_PLUGIN_VERSION, SC_VERSION);
+ sdb_plugin_set_info(info, SDB_PLUGIN_INFO_LICENSE, "BSD");
+ sdb_plugin_set_info(info, SDB_PLUGIN_INFO_VERSION, SDB_VERSION);
+ sdb_plugin_set_info(info, SDB_PLUGIN_INFO_PLUGIN_VERSION, SDB_VERSION);
- sc_plugin_register_config("collectd", sc_collectd_config);
+ sdb_plugin_register_config("collectd", sdb_collectd_config);
return 0;
-} /* sc_version_extra */
+} /* sdb_version_extra */
/* vim: set tw=78 sw=4 ts=4 noexpandtab : */