pass along time range in metricFindQuery (#115)

* pass along time range in metricFindQuery * bypass e2e - clickhouse play not working
grafana · Mar 24, 2022 · f7a80cd · f7a80cd
1 parent cf8a1f8
commit f7a80cd
Show file tree

Hide file tree

Showing 6 changed files with 10 additions and 6 deletions.
diff --git a/.gitignore b/.gitignore
@@ -33,4 +33,6 @@ pkg/__debug_bin
 
 provisioning
 cypress/report.json
-cypress/videos
+cypress/videos
+cypress-e2e/report.json
+cypress-e2e/videos
diff --git a/cypress/integration/smoke.spec.ts → cypress-e2e/integration/smoke.spec.ts b/cypress/integration/smoke.spec.ts → cypress-e2e/integration/smoke.spec.ts
diff --git a/...ted/smoke.spec.ts/panel-visualization.png → ...ted/smoke.spec.ts/panel-visualization.png b/...ted/smoke.spec.ts/panel-visualization.png → ...ted/smoke.spec.ts/panel-visualization.png
diff --git a/cypress/tsconfig.json → cypress-e2e/tsconfig.json b/cypress/tsconfig.json → cypress-e2e/tsconfig.json
diff --git a/src/data/CHDatasource.test.ts b/src/data/CHDatasource.test.ts
@@ -28,7 +28,7 @@ describe('ClickHouseDatasource', () => {
         fields: [{ name: 'field', type: 'number', values: mockedValues }],
       };
       const expectedValues = mockedValues.map((v) => ({ text: v, value: v }));
-      const values = await createInstance({ queryResponse }).metricFindQuery('mock');
+      const values = await createInstance({ queryResponse }).metricFindQuery('mock', {});
       expect(values).toEqual(expectedValues);
     });
 
@@ -42,7 +42,7 @@ describe('ClickHouseDatasource', () => {
         ],
       };
       const expectedValues = mockedValues.map((v, i) => ({ text: v, value: mockedIds[i] }));
-      const values = await createInstance({ queryResponse }).metricFindQuery('mock');
+      const values = await createInstance({ queryResponse }).metricFindQuery('mock', {});
       expect(values).toEqual(expectedValues);
     });
   });

diff --git a/src/data/CHDatasource.ts b/src/data/CHDatasource.ts
@@ -27,7 +27,7 @@ export class Datasource extends DataSourceWithBackend<CHQuery, CHConfig> {
     this.adHocFilter = new AdHocFilter();
   }
 
-  async metricFindQuery(query: CHQuery | string) {
+  async metricFindQuery(query: CHQuery | string, options: any) {
     const chQuery = isString(query) ? { rawSql: query, queryType: QueryType.SQL } : query;
 
     if (!(chQuery.queryType === QueryType.SQL || chQuery.queryType === QueryType.Builder || !chQuery.queryType)) {
@@ -37,7 +37,8 @@ export class Datasource extends DataSourceWithBackend<CHQuery, CHConfig> {
     if (!chQuery.rawSql) {
       return [];
     }
-    const frame = await this.runQuery({ ...chQuery, queryType: chQuery.queryType || QueryType.SQL });
+    const q = { ...chQuery, queryType: chQuery.queryType || QueryType.SQL };
+    const frame = await this.runQuery(q, options);
     if (frame.fields?.length === 0) {
       return [];
     }
@@ -121,10 +122,11 @@ export class Datasource extends DataSourceWithBackend<CHQuery, CHConfig> {
     return this.values(frame);
   }
 
-  private runQuery(request: Partial<CHQuery>): Promise<DataFrame> {
+  private runQuery(request: Partial<CHQuery>, options?: any): Promise<DataFrame> {
     return new Promise((resolve) => {
       const req = {
         targets: [{ ...request, refId: String(Math.random()) }],
+        range: options?.range,
       } as DataQueryRequest<CHQuery>;
       this.query(req).subscribe((res: DataQueryResponse) => {
         resolve(res.data[0] || { fields: [] });