![[tokkee]](http://tokkee.org/images/avatar.png){kind=avatar}
diff --git a/src/core/store_json.c b/src/core/store_json.c
index 26a0854eeb4ef09957d7cd400bc5e699496cd7bc..256fdeac0496f9a55f97fa53bf3ee10f7c375ada 100644 (file)
--- a/src/core/store_json.c
+++ b/src/core/store_json.c
#endif /* HAVE_CONFIG_H */
#include "sysdb.h"
-#include "core/store-private.h"
+#include "core/store.h"
#include "utils/error.h"
+#include "utils/strings.h"
#include <assert.h>
* 0: false
* 1: true */
int timeseries;
+ char **data_names;
+ size_t data_names_len;
/* generic meta-data */
sdb_time_t last_update;
sdb_strbuf_append(f->buf, "\"timeseries\": true, ");
else
sdb_strbuf_append(f->buf, "\"timeseries\": false, ");
+
+ if (obj->data_names_len > 0) {
+ sdb_strbuf_append(f->buf, "\"data_names\": [");
+ for (i = 0; i < obj->data_names_len; i++) {
+ char dn[2 * strlen(obj->data_names[i]) + 3];
+ escape_string(obj->data_names[i], dn);
+ sdb_strbuf_append(f->buf, "%s", dn);
+ if (i < obj->data_names_len - 1)
+ sdb_strbuf_append(f->buf, ", ");
+ }
+ sdb_strbuf_append(f->buf, "], ");
+ }
}
/* TODO: make time and interval formats configurable */
return 0;
} /* json_emit */
-/*
- * public API
- */
-
-sdb_store_json_formatter_t *
-sdb_store_json_formatter(sdb_strbuf_t *buf, int type, int flags)
+static int
+emit_host(sdb_store_host_t *host, sdb_object_t *user_data)
{
- return F(sdb_object_create("json-formatter", formatter_type,
- buf, type, flags));
-} /* sdb_store_json_formatter */
+ sdb_store_json_formatter_t *f = F(user_data);
-int
-sdb_store_json_emit(sdb_store_json_formatter_t *f, sdb_store_obj_t *obj)
-{
- if ((! f) || (! obj))
+ if ((! host) || (! user_data))
return -1;
{
obj_t o = {
- obj->type,
- obj->_name,
+ SDB_HOST,
+ host->name,
/* value */ NULL,
- /* timeseries */ -1,
+ /* timeseries */ -1, NULL, 0,
- obj->last_update,
- obj->interval,
- obj->backends_num,
- (const char * const *)obj->backends,
+ host->last_update,
+ host->interval,
+ host->backends_num,
+ (const char * const *)host->backends,
};
- if (obj->type == SDB_ATTRIBUTE)
- o.value = &ATTR(obj)->value;
- if (obj->type == SDB_METRIC)
- o.timeseries = METRIC(obj)->store.type != NULL;
-
return json_emit(f, &o);
}
-} /* sdb_store_json_emit */
+} /* emit_host */
-int
-sdb_store_json_emit_full(sdb_store_json_formatter_t *f, sdb_store_obj_t *obj,
- sdb_store_matcher_t *filter)
+static int
+emit_service(sdb_store_service_t *service, sdb_object_t *user_data)
{
- sdb_avltree_t *trees[] = { NULL, NULL, NULL };
- size_t i;
+ sdb_store_json_formatter_t *f = F(user_data);
- if (sdb_store_json_emit(f, obj))
+ if ((! service) || (! user_data))
return -1;
- if (obj->type == SDB_HOST) {
- trees[0] = HOST(obj)->attributes;
- trees[1] = HOST(obj)->metrics;
- trees[2] = HOST(obj)->services;
+ {
+ obj_t o = {
+ SDB_SERVICE,
+ service->name,
+
+ /* value */ NULL,
+ /* timeseries */ -1, NULL, 0,
+
+ service->last_update,
+ service->interval,
+ service->backends_num,
+ (const char * const *)service->backends,
+ };
+
+ return json_emit(f, &o);
}
- else if (obj->type == SDB_SERVICE)
- trees[0] = SVC(obj)->attributes;
- else if (obj->type == SDB_METRIC)
- trees[0] = METRIC(obj)->attributes;
- else if (obj->type == SDB_ATTRIBUTE)
- return 0;
- else
+} /* emit_service */
+
+static int
+emit_metric(sdb_store_metric_t *metric, sdb_object_t *user_data)
+{
+ sdb_store_json_formatter_t *f = F(user_data);
+ int status;
+ size_t i;
+
+ if ((! metric) || (! user_data))
return -1;
- for (i = 0; i < SDB_STATIC_ARRAY_LEN(trees); ++i) {
- sdb_avltree_iter_t *iter;
+ {
+ obj_t o = {
+ SDB_METRIC,
+ metric->name,
- if (! trees[i])
- continue;
+ /* value */ NULL,
+ /* timeseries */ metric->stores_num > 0, NULL, 0,
+
+ metric->last_update,
+ metric->interval,
+ metric->backends_num,
+ (const char * const *)metric->backends,
+ };
- iter = sdb_avltree_get_iter(trees[i]);
- while (sdb_avltree_iter_has_next(iter)) {
- sdb_store_obj_t *child;
- child = STORE_OBJ(sdb_avltree_iter_get_next(iter));
+ for (i = 0; i < metric->stores_num; i++) {
+ const sdb_metric_store_t *s = metric->stores + i;
+ size_t j;
- if (filter && (! sdb_store_matcher_matches(filter, child, NULL)))
+ if (! s->info)
continue;
- if (sdb_store_json_emit_full(f, child, filter)) {
- sdb_avltree_iter_destroy(iter);
- return -1;
+ if (! o.data_names) {
+ stringv_copy(&o.data_names, &o.data_names_len,
+ (const char * const *)s->info->data_names,
+ s->info->data_names_len);
+ continue;
}
+
+ for (j = 0; j < s->info->data_names_len; j++)
+ stringv_append_if_missing(&o.data_names, &o.data_names_len,
+ s->info->data_names[j]);
}
- sdb_avltree_iter_destroy(iter);
+
+ status = json_emit(f, &o);
+ stringv_free(&o.data_names, &o.data_names_len);
+ return status;
}
- return 0;
-} /* sdb_store_json_emit_full */
+} /* emit_metric */
+
+static int
+emit_attribute(sdb_store_attribute_t *attr, sdb_object_t *user_data)
+{
+ sdb_store_json_formatter_t *f = F(user_data);
+
+ if ((! attr) || (! user_data))
+ return -1;
+
+ {
+ obj_t o = {
+ SDB_ATTRIBUTE,
+ attr->key,
+
+ /* value */ &attr->value,
+ /* timeseries */ -1, NULL, 0,
+
+ attr->last_update,
+ attr->interval,
+ attr->backends_num,
+ (const char * const *)attr->backends,
+ };
+
+ return json_emit(f, &o);
+ }
+} /* emit_attribute */
+
+/*
+ * public API
+ */
+
+sdb_store_writer_t sdb_store_json_writer = {
+ emit_host, emit_service, emit_metric, emit_attribute,
+};
+
+sdb_store_json_formatter_t *
+sdb_store_json_formatter(sdb_strbuf_t *buf, int type, int flags)
+{
+ return F(sdb_object_create("json-formatter", formatter_type,
+ buf, type, flags));
+} /* sdb_store_json_formatter */
int
sdb_store_json_finish(sdb_store_json_formatter_t *f)