IntenseWebs/grafana
3
0
Fork 0
mirror of https://github.com/grafana/grafana.git synced 2025-02-25 18:55:37 -06:00
Code Issues Packages Projects Releases Wiki Activity

InfluxDB: Interpolate tag keys in influxql queries (#79288)

Browse Source 
* interpolate tag keys

* fix unit tests
This commit is contained in:
ismail simsek
2023-12-11 16:09:21 +01:00
committed by GitHub
parent 488d4870f0
commit 12793bfbed
3 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
public/app/plugins/datasource/influxdb/datasource.test.ts
View File

@@ -285,7 +285,7 @@ describe('InfluxDataSource Frontend Mode', () => {
const ds = new InfluxDatasource(getMockDSInstanceSettings(), templateSrv); const ds = new InfluxDatasource(getMockDSInstanceSettings(), templateSrv);
function influxChecks(query: InfluxQuery) { function influxChecks(query: InfluxQuery) {
expect(templateSrv.replace).toBeCalledTimes(11); expect(templateSrv.replace).toBeCalledTimes(12);
expect(query.alias).toBe(text); expect(query.alias).toBe(text);
expect(query.measurement).toBe(textWithFormatRegex); expect(query.measurement).toBe(textWithFormatRegex);
expect(query.policy).toBe(textWithFormatRegex); expect(query.policy).toBe(textWithFormatRegex);

1
public/app/plugins/datasource/influxdb/datasource.ts
View File

@@ -256,6 +256,7 @@ export default class InfluxDatasource extends DataSourceWithBackend<InfluxQuery,
expandedQuery.tags = query.tags.map((tag) => { expandedQuery.tags = query.tags.map((tag) => {
return { return {
...tag, ...tag,
key: this.templateSrv.replace(tag.key, scopedVars, this.interpolateQueryExpr),
value: this.templateSrv.replace(tag.value, scopedVars, this.interpolateQueryExpr), value: this.templateSrv.replace(tag.value, scopedVars, this.interpolateQueryExpr),
}; };
}); });

2
public/app/plugins/datasource/influxdb/datasource_backend_mode.test.ts
View File

@@ -176,7 +176,7 @@ describe('InfluxDataSource Backend Mode', () => {
const ds = new InfluxDatasource(getMockDSInstanceSettings(), templateSrv); const ds = new InfluxDatasource(getMockDSInstanceSettings(), templateSrv);
function influxChecks(query: InfluxQuery) { function influxChecks(query: InfluxQuery) {
expect(templateSrv.replace).toBeCalledTimes(11); expect(templateSrv.replace).toBeCalledTimes(12);
expect(query.alias).toBe(text); expect(query.alias).toBe(text);
expect(query.measurement).toBe(textWithFormatRegex); expect(query.measurement).toBe(textWithFormatRegex);
expect(query.policy).toBe(textWithFormatRegex); expect(query.policy).toBe(textWithFormatRegex);