collectd::unixsock: Store metrics instead of services.

[sysdb.git] / src / backend / collectd / unixsock.c

diff --git a/src/backend/collectd/unixsock.c b/src/backend/collectd/unixsock.c
index 1faa9c80394aca5db5f5cc390ba6ed49b5521ddd..c0d023ed6b85dc2d2c87320123b0e0a44f968b5b 100644 (file)
--- a/src/backend/collectd/unixsock.c
+++ b/src/backend/collectd/unixsock.c
@@ -54,8 +54,8 @@ SDB_PLUGIN_MAGIC;
 typedef struct {
        char *current_host;
        sdb_time_t current_timestamp;
-       int svc_updated;
-       int svc_failed;
+       int metrics_updated;
+       int metrics_failed;
 } sdb_collectd_state_t;
 #define SDB_COLLECTD_STATE_INIT { NULL, 0, 0, 0 }
 
@@ -79,10 +79,10 @@ sdb_collectd_store_host(sdb_collectd_state_t *state,
 
        if (state->current_host) {
                sdb_log(SDB_LOG_DEBUG, "collectd::unixsock backend: Added/updated "
-                               "%i service%s (%i failed) for host '%s'.",
-                               state->svc_updated, state->svc_updated == 1 ? "" : "s",
-                               state->svc_failed, state->current_host);
-               state->svc_updated = state->svc_failed = 0;
+                               "%i metric%s (%i failed) for host '%s'.",
+                               state->metrics_updated, state->metrics_updated == 1 ? "" : "s",
+                               state->metrics_failed, state->current_host);
+               state->metrics_updated = state->metrics_failed = 0;
                free(state->current_host);
        }
 
@@ -106,39 +106,68 @@ sdb_collectd_store_host(sdb_collectd_state_t *state,
                return 0;
 
        sdb_log(SDB_LOG_DEBUG, "collectd::unixsock backend: Added/updated "
-                       "host '%s' (last update timestamp = %"PRIscTIME").",
+                       "host '%s' (last update timestamp = %"PRIsdbTIME").",
                        hostname, last_update);
        return 0;
 } /* sdb_collectd_store_host */
 
 static int
-sdb_collectd_add_svc(const char *hostname, const char *plugin,
-               const char *type, sdb_time_t last_update)
+sdb_collectd_add_metrics(const char *hostname, char *plugin, char *type,
+               sdb_time_t last_update)
 {
-       char name[strlen(plugin) + strlen(type) + 2];
+       char  name[strlen(plugin) + strlen(type) + 2];
+       char *plugin_instance, *type_instance;
+
+       sdb_data_t data = { SDB_TYPE_STRING, { .string = NULL } };
+
        int  status;
 
        snprintf(name, sizeof(name), "%s/%s", plugin, type);
 
-       status = sdb_store_service(hostname, name, last_update);
+       status = sdb_store_metric(hostname, name, NULL, last_update);
        if (status < 0) {
                sdb_log(SDB_LOG_ERR, "collectd::unixsock backend: Failed to "
-                               "store/update service '%s/%s'.", hostname, name);
+                               "store/update metric '%s/%s'.", hostname, name);
                return -1;
        }
+
+       plugin_instance = strchr(plugin, '-');
+       if (plugin_instance) {
+               *plugin_instance = '\0';
+               ++plugin_instance;
+
+               data.data.string = plugin_instance;
+               sdb_store_metric_attr(hostname, name,
+                               "plugin_instance", &data, last_update);
+       }
+
+       type_instance = strchr(type, '-');
+       if (type_instance) {
+               *type_instance = '\0';
+               ++type_instance;
+
+               data.data.string = type_instance;
+               sdb_store_metric_attr(hostname, name,
+                               "type_instance", &data, last_update);
+       }
+
+       data.data.string = plugin;
+       sdb_store_metric_attr(hostname, name, "plugin", &data, last_update);
+       data.data.string = type;
+       sdb_store_metric_attr(hostname, name, "type", &data, last_update);
        return 0;
-} /* sdb_collectd_add_svc */
+} /* sdb_collectd_add_metrics */
 
 static int
 sdb_collectd_get_data(sdb_unixsock_client_t __attribute__((unused)) *client,
                size_t n, sdb_data_t *data, sdb_object_t *user_data)
 {
        sdb_collectd_state_t *state;
+       sdb_data_t last_update;
 
        char *hostname;
-       const char *plugin;
-       const char *type;
-       sdb_data_t last_update;
+       char *plugin;
+       char *type;
 
        assert(user_data);
 
@@ -175,11 +204,11 @@ sdb_collectd_get_data(sdb_unixsock_client_t __attribute__((unused)) *client,
        if (sdb_collectd_store_host(state, hostname, last_update.data.datetime))
                return -1;
 
-       if (sdb_collectd_add_svc(hostname, plugin, type,
+       if (sdb_collectd_add_metrics(hostname, plugin, type,
                                last_update.data.datetime))
-               ++state->svc_failed;
+               ++state->metrics_failed;
        else
-               ++state->svc_updated;
+               ++state->metrics_updated;
        return 0;
 } /* sdb_collectd_get_data */
 
@@ -232,8 +261,7 @@ sdb_collectd_collect(sdb_object_t *user_data)
        long int count;
 
        sdb_collectd_state_t state = SDB_COLLECTD_STATE_INIT;
-       sdb_object_wrapper_t state_obj = SDB_OBJECT_WRAPPER_STATIC(&state,
-                       /* destructor = */ NULL);
+       sdb_object_wrapper_t state_obj = SDB_OBJECT_WRAPPER_STATIC(&state);
 
        if (! user_data)
                return -1;
@@ -290,9 +318,9 @@ sdb_collectd_collect(sdb_object_t *user_data)
 
        if (state.current_host) {
                sdb_log(SDB_LOG_DEBUG, "collectd::unixsock backend: Added/updated "
-                               "%i service%s (%i failed) for host '%s'.",
-                               state.svc_updated, state.svc_updated == 1 ? "" : "s",
-                               state.svc_failed, state.current_host);
+                               "%i metric%s (%i failed) for host '%s'.",
+                               state.metrics_updated, state.metrics_updated == 1 ? "" : "s",
+                               state.metrics_failed, state.current_host);
                free(state.current_host);
        }
        return 0;