diff --git a/src/frontend/query.c b/src/frontend/query.c
index 5e443298b6bd8293a0d5d0eace091e5a4124cec9..5d00636dd99e77219303c645bdf019f8ac59bfeb 100644 (file)
--- a/src/frontend/query.c
+++ b/src/frontend/query.c
typedef struct {
char *type;
char *id;
+ sdb_time_t last_update;
} metric_store_t;
static int
st->type = strdup(metric->store.type);
st->id = strdup(metric->store.id);
+ st->last_update = metric->store.last_update;
if ((! st->type) || (! st->id))
return -1;
return 0;
snprintf(name, sizeof(name), "%s.%s", st->hostname, st->name);
metric_store.type = st->store_type;
metric_store.id = st->store_id;
+ metric_store.last_update = st->last_update;
status = sdb_plugin_store_metric(st->hostname, st->name,
&metric_store, st->last_update);
break;
static int
exec_timeseries(sdb_ast_timeseries_t *ts, sdb_strbuf_t *buf, sdb_strbuf_t *errbuf)
{
- metric_store_t st = { NULL, NULL };
+ metric_store_t st = { NULL, NULL, 0 };
sdb_object_wrapper_t obj = SDB_OBJECT_WRAPPER_STATIC(&st);
sdb_ast_fetch_t fetch = SDB_AST_FETCH_INIT;
sdb_timeseries_opts_t opts = { 0, 0 };
@@ -248,7 +251,13 @@ exec_timeseries(sdb_ast_timeseries_t *ts, sdb_strbuf_t *buf, sdb_strbuf_t *errbu
}
if (status >= 0) {
series = sdb_plugin_fetch_timeseries(st.type, st.id, &opts);
- if (! series) {
+ if (series) {
+ uint32_t res_type = htonl(SDB_CONNECTION_TIMESERIES);
+ sdb_strbuf_memcpy(buf, &res_type, sizeof(res_type));
+ sdb_timeseries_tojson(series, buf);
+ sdb_timeseries_destroy(series);
+ }
+ else {
sdb_log(SDB_LOG_ERR, "frontend: Failed to fetch time-series '%s/%s' "
"- %s fetcher callback returned no data for '%s'",
ts->hostname, ts->metric, st.type, st.id);
@@ -256,11 +265,6 @@ exec_timeseries(sdb_ast_timeseries_t *ts, sdb_strbuf_t *buf, sdb_strbuf_t *errbu
}
}
- if (status >= 0) {
- sdb_timeseries_tojson(series, buf);
- sdb_timeseries_destroy(series);
- }
-
free(fetch.hostname);
free(fetch.name);
if (st.type)