From 20f88021b9ec0d15a1344a71e1f71a864aff23a7 Mon Sep 17 00:00:00 2001 From: Jeff Dunham Date: Thu, 20 May 2021 12:45:14 -0700 Subject: [PATCH 1/2] Adding support for grafana template variables --- src/DataSource.ts | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/src/DataSource.ts b/src/DataSource.ts index 9754468..992da77 100644 --- a/src/DataSource.ts +++ b/src/DataSource.ts @@ -1,9 +1,17 @@ import { DataSourceInstanceSettings } from '@grafana/data'; import { DataSourceWithBackend } from '@grafana/runtime'; import { RocksetDataSourceOptions, RocksetQuery } from './types'; +import { getTemplateSrv } from '@grafana/runtime'; export class DataSource extends DataSourceWithBackend { constructor(instanceSettings: DataSourceInstanceSettings) { super(instanceSettings); } + applyTemplateVariables(query: RocksetQuery) { + const templateSrv = getTemplateSrv(); + return { + ...query, + queryText: query.queryText ? templateSrv.replace(query.queryText) : '', + }; + } } From 299d6e83f0900dce57a3f630f4e7c964ff17b94d Mon Sep 17 00:00:00 2001 From: Jeff Dunham Date: Thu, 20 May 2021 12:49:17 -0700 Subject: [PATCH 2/2] Upping version --- README.md | 4 ++-- src/plugin.json | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/README.md b/README.md index cf41f22..9748420 100644 --- a/README.md +++ b/README.md @@ -53,7 +53,7 @@ Install the plugin using the `grafana-cli`. Note that the plugin require Grafana ``` grafana-cli \ - --pluginUrl https://rockset-public.s3-us-west-2.amazonaws.com/rockset-backend-datasource-0.1.1.zip \ + --pluginUrl https://rockset-public.s3-us-west-2.amazonaws.com/rockset-backend-datasource-0.1.2.zip \ plugins install rockset-backend-datasource ``` @@ -86,7 +86,7 @@ docker run -d \ --name=grafana \ grafana/grafana:7.0.5 docker exec grafana-cli \ - --pluginUrl https://rockset-public.s3-us-west-2.amazonaws.com/rockset-backend-datasource-0.1.1.zip \ + --pluginUrl https://rockset-public.s3-us-west-2.amazonaws.com/rockset-backend-datasource-0.1.2.zip \ plugins install rockset-backend-datasource docker restart grafana ``` diff --git a/src/plugin.json b/src/plugin.json index 159dcaa..24f6936 100644 --- a/src/plugin.json +++ b/src/plugin.json @@ -32,8 +32,8 @@ } ], "screenshots": [], - "version": "0.1.1", - "updated": "2020-07-09" + "version": "0.1.2", + "updated": "2021-05-20" }, "dependencies": { "grafanaVersion": "7.x.x",