X-Git-Url: https://git.tokkee.org/?p=sysdb.git;a=blobdiff_plain;f=src%2Fcore%2Fstore.c;h=171e31935bb898eefb5e6e95b46000a20f3cb1a6;hp=d6ad01fedd354da89efaa9bac27c6b44921cd180;hb=299d8ae505f7c7262a8faa7564839322c26a1ffb;hpb=eb1b9560958c3458eab599e4e1577771ab4aa05c diff --git a/src/core/store.c b/src/core/store.c index d6ad01f..171e319 100644 --- a/src/core/store.c +++ b/src/core/store.c @@ -43,6 +43,7 @@ #include #include +#include #include /* @@ -255,7 +256,7 @@ static sdb_type_t sdb_attribute_type = { */ static sdb_host_t * -lookup_host(const char *name, _Bool canonicalize) +lookup_host(const char *name, bool canonicalize) { sdb_host_t *host; char *cname; @@ -422,6 +423,37 @@ store_attr(sdb_store_obj_t *parent, sdb_avltree_t *attributes, return status; } /* store_attr */ +static int +store_metric_store(sdb_metric_t *metric, sdb_metric_store_t *store) +{ + char *type = metric->store.type; + char *id = metric->store.id; + + if ((! metric->store.type) || strcasecmp(metric->store.type, store->type)) { + if (! (type = strdup(store->type))) + return -1; + } + if ((! metric->store.id) || strcasecmp(metric->store.id, store->id)) { + if (! (id = strdup(store->id))) { + if (type != metric->store.type) + free(type); + return -1; + } + } + + if (type != metric->store.type) { + if (metric->store.type) + free(metric->store.type); + metric->store.type = type; + } + if (id != metric->store.id) { + if (metric->store.id) + free(metric->store.id); + metric->store.id = id; + } + return 0; +} /* store_metric_store */ + /* The host_lock has to be acquired before calling this function. */ static sdb_avltree_t * get_host_children(sdb_host_t *host, int type) @@ -456,12 +488,10 @@ ts_tojson(sdb_timeseries_t *ts, sdb_strbuf_t *buf) size_t i; /* TODO: make time format configurable */ - if (! sdb_strftime(start_str, sizeof(start_str), - "%F %T %z", ts->start)) + if (! sdb_strftime(start_str, sizeof(start_str), ts->start)) snprintf(start_str, sizeof(start_str), ""); start_str[sizeof(start_str) - 1] = '\0'; - if (! sdb_strftime(end_str, sizeof(end_str), - "%F %T %z", ts->end)) + if (! sdb_strftime(end_str, sizeof(end_str), ts->end)) snprintf(end_str, sizeof(end_str), ""); end_str[sizeof(end_str) - 1] = '\0'; @@ -475,13 +505,17 @@ ts_tojson(sdb_timeseries_t *ts, sdb_strbuf_t *buf) for (j = 0; j < ts->data_len; ++j) { char time_str[64]; - if (! sdb_strftime(time_str, sizeof(time_str), - "%F %T %z", ts->data[i][j].timestamp)) + if (! sdb_strftime(time_str, sizeof(time_str), ts->data[i][j].timestamp)) snprintf(time_str, sizeof(time_str), ""); time_str[sizeof(time_str) - 1] = '\0'; - sdb_strbuf_append(buf, "{\"timestamp\": \"%s\", " - "\"value\": \"%f\"}", time_str, ts->data[i][j].value); + /* Some GNU libc versions may print '-nan' which we dont' want */ + if (isnan(ts->data[i][j].value)) + sdb_strbuf_append(buf, "{\"timestamp\": \"%s\", " + "\"value\": \"nan\"}", time_str); + else + sdb_strbuf_append(buf, "{\"timestamp\": \"%s\", " + "\"value\": \"%f\"}", time_str, ts->data[i][j].value); if (j < ts->data_len - 1) sdb_strbuf_append(buf, ","); @@ -530,11 +564,14 @@ sdb_store_host(const char *name, sdb_time_t last_update) status = store_obj(NULL, hosts, SDB_HOST, cname, last_update, NULL); pthread_rwlock_unlock(&host_lock); + if (sdb_plugin_store_host(name, last_update)) + status = -1; + free(cname); return status; } /* sdb_store_host */ -_Bool +bool sdb_store_has_host(const char *name) { sdb_host_t *host; @@ -588,6 +625,9 @@ sdb_store_attribute(const char *hostname, sdb_object_deref(SDB_OBJ(host)); pthread_rwlock_unlock(&host_lock); + + if (sdb_plugin_store_attribute(hostname, key, value, last_update)) + status = -1; return status; } /* sdb_store_attribute */ @@ -597,6 +637,7 @@ sdb_store_service(const char *hostname, const char *name, { sdb_host_t *host; sdb_avltree_t *services; + sdb_data_t d; int status = 0; @@ -618,6 +659,18 @@ sdb_store_service(const char *hostname, const char *name, sdb_object_deref(SDB_OBJ(host)); pthread_rwlock_unlock(&host_lock); + + if (status) + return status; + + if (sdb_plugin_store_service(hostname, name, last_update)) + status = -1; + + /* record the hostname as an attribute */ + d.type = SDB_TYPE_STRING; + d.data.string = SDB_OBJ(host)->name; + if (sdb_store_service_attr(hostname, name, "hostname", &d, last_update)) + status = -1; return status; } /* sdb_store_service */ @@ -658,6 +711,10 @@ sdb_store_service_attr(const char *hostname, const char *service, sdb_object_deref(SDB_OBJ(svc)); pthread_rwlock_unlock(&host_lock); + + if (sdb_plugin_store_service_attribute(hostname, service, + key, value, last_update)) + status = -1; return status; } /* sdb_store_service_attr */ @@ -668,6 +725,7 @@ sdb_store_metric(const char *hostname, const char *name, sdb_store_obj_t *obj = NULL; sdb_host_t *host; sdb_metric_t *metric; + sdb_data_t d; sdb_avltree_t *metrics; @@ -675,8 +733,13 @@ sdb_store_metric(const char *hostname, const char *name, if ((! hostname) || (! name)) return -1; - if (store && ((! store->type) || (! store->id))) - return -1; + + if (store) { + if ((store->type != NULL) != (store->id != NULL)) + return -1; + else if (! store->type) + store = NULL; + } pthread_rwlock_wrlock(&host_lock); host = lookup_host(hostname, /* canonicalize = */ 1); @@ -692,7 +755,7 @@ sdb_store_metric(const char *hostname, const char *name, name, last_update, &obj); sdb_object_deref(SDB_OBJ(host)); - if (status || (! store)) { + if (status) { pthread_rwlock_unlock(&host_lock); return status; } @@ -700,26 +763,19 @@ sdb_store_metric(const char *hostname, const char *name, assert(obj); metric = METRIC(obj); - if ((! metric->store.type) || strcasecmp(metric->store.type, store->type)) { - if (metric->store.type) - free(metric->store.type); - metric->store.type = strdup(store->type); - } - if ((! metric->store.id) || strcasecmp(metric->store.id, store->id)) { - if (metric->store.id) - free(metric->store.id); - metric->store.id = strdup(store->id); - } + if (store) + if (store_metric_store(metric, store)) + status = -1; + pthread_rwlock_unlock(&host_lock); - if ((! metric->store.type) || (! metric->store.id)) { - if (metric->store.type) - free(metric->store.type); - if (metric->store.id) - free(metric->store.id); - metric->store.type = metric->store.id = NULL; + if (sdb_plugin_store_metric(hostname, name, store, last_update)) + status = -1; + + /* record the hostname as an attribute */ + d.type = SDB_TYPE_STRING; + d.data.string = SDB_OBJ(host)->name; + if (sdb_store_metric_attr(hostname, name, "hostname", &d, last_update)) status = -1; - } - pthread_rwlock_unlock(&host_lock); return status; } /* sdb_store_metric */ @@ -760,6 +816,10 @@ sdb_store_metric_attr(const char *hostname, const char *metric, sdb_object_deref(SDB_OBJ(m)); pthread_rwlock_unlock(&host_lock); + + if (sdb_plugin_store_metric_attribute(hostname, metric, + key, value, last_update)) + status = -1; return status; } /* sdb_store_metric_attr */ @@ -787,6 +847,8 @@ sdb_store_fetch_timeseries(const char *hostname, const char *metric, sdb_timeseries_t *ts; + int status = 0; + if ((! hostname) || (! metric) || (! opts) || (! buf)) return -1; @@ -813,6 +875,7 @@ sdb_store_fetch_timeseries(const char *hostname, const char *metric, sdb_log(SDB_LOG_ERR, "store: Failed to fetch time-series '%s/%s' " "- no data-store configured for the stored metric", hostname, metric); + sdb_object_deref(SDB_OBJ(m)); pthread_rwlock_unlock(&host_lock); return -1; } @@ -830,13 +893,14 @@ sdb_store_fetch_timeseries(const char *hostname, const char *metric, sdb_log(SDB_LOG_ERR, "store: Failed to fetch time-series '%s/%s' " "- %s fetcher callback returned no data for '%s'", hostname, metric, type, id); - return -1; + status = -1; } } ts_tojson(ts, buf); + sdb_object_deref(SDB_OBJ(m)); sdb_timeseries_destroy(ts); - return 0; + return status; } /* sdb_store_fetch_timeseries */ int @@ -867,13 +931,23 @@ sdb_store_get_field(sdb_store_obj_t *obj, int field, sdb_data_t *res) tmp.data.datetime = obj->interval; break; case SDB_FIELD_BACKEND: - { + if (! res) + return 0; tmp.type = SDB_TYPE_ARRAY | SDB_TYPE_STRING; tmp.data.array.length = obj->backends_num; tmp.data.array.values = obj->backends; return sdb_data_copy(res, &tmp); - break; - } + case SDB_FIELD_VALUE: + if (obj->type != SDB_ATTRIBUTE) + return -1; + if (! res) + return 0; + return sdb_data_copy(res, &ATTR(obj)->value); + case SDB_FIELD_TIMESERIES: + if (obj->type != SDB_METRIC) + return -1; + tmp.type = SDB_TYPE_BOOLEAN; + tmp.data.boolean = METRIC(obj)->store.type != NULL; default: return -1; } @@ -923,7 +997,7 @@ int sdb_store_scan(int type, sdb_store_matcher_t *m, sdb_store_matcher_t *filter, sdb_store_lookup_cb cb, void *user_data) { - sdb_avltree_iter_t *host_iter; + sdb_avltree_iter_t *host_iter = NULL; int status = 0; if (! cb) @@ -936,9 +1010,11 @@ sdb_store_scan(int type, sdb_store_matcher_t *m, sdb_store_matcher_t *filter, pthread_rwlock_rdlock(&host_lock); - host_iter = sdb_avltree_get_iter(hosts); - if (! host_iter) - status = -1; + if (hosts) { + host_iter = sdb_avltree_get_iter(hosts); + if (! host_iter) + status = -1; + } /* has_next returns false if the iterator is NULL */ while (sdb_avltree_iter_has_next(host_iter)) {