parser: Let the TIMESERIES command accept optional data-source names.

[sysdb.git] / src / frontend / query.c

diff --git a/src/frontend/query.c b/src/frontend/query.c
index 302c586a6c227de98b7e3ae035f58224a135a7de..2a1954abc9a87ebc966dff97e1af47244f76645a 100644 (file)
--- a/src/frontend/query.c
+++ b/src/frontend/query.c
@@ -136,7 +136,8 @@ exec_query(sdb_ast_node_t *ast, sdb_strbuf_t *buf, sdb_strbuf_t *errbuf)
 
        f = sdb_store_json_formatter(buf, type, flags);
        sdb_strbuf_memcpy(buf, &res_type, sizeof(res_type));
-       status = sdb_plugin_query(ast, &sdb_store_json_writer, SDB_OBJ(f), errbuf);
+       status = sdb_plugin_query(ast, &sdb_store_json_writer, SDB_OBJ(f),
+                       &(sdb_query_opts_t){ true }, errbuf);
        if (status < 0)
                sdb_strbuf_clear(buf);
        sdb_store_json_finish(f);
@@ -236,7 +237,7 @@ exec_timeseries(sdb_ast_timeseries_t *ts, sdb_strbuf_t *buf, sdb_strbuf_t *errbu
        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 };
+       sdb_timeseries_opts_t opts = { 0, 0, NULL, 0 };
        sdb_timeseries_t *series = NULL;
        int status;
 
@@ -246,11 +247,14 @@ exec_timeseries(sdb_ast_timeseries_t *ts, sdb_strbuf_t *buf, sdb_strbuf_t *errbu
        fetch.obj_type = SDB_METRIC;
        fetch.hostname = strdup(ts->hostname);
        fetch.name = strdup(ts->metric);
+       opts.data_names = (const char * const *)ts->data_names;
+       opts.data_names_len = ts->data_names_len;
        opts.start = ts->start;
        opts.end = ts->end;
 
        status = sdb_plugin_query(SDB_AST_NODE(&fetch),
-                       &metric_fetcher, SDB_OBJ(&obj), errbuf);
+                       &metric_fetcher, SDB_OBJ(&obj),
+                       &(sdb_query_opts_t){ true }, errbuf);
        if ((status < 0) || (! st.type) || (! st.id)) {
                sdb_log(SDB_LOG_ERR, "frontend: Failed to fetch time-series '%s/%s' "
                                "- no data-store configured for the stored metric",