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

Prometheus: Correctly format multi values variables in queries (#26896)

Browse Source
This commit is contained in:
Ivana Huckova
2020-08-10 15:36:15 +02:00
committed by GitHub
parent 0a40862af5
commit ad33734424
2 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
public/app/plugins/datasource/prometheus/datasource.test.ts
View File

@@ -500,7 +500,7 @@ describe('PrometheusDatasource', () => {
}); });
it('should return pipe separated values if the value is an array of strings', () => { it('should return pipe separated values if the value is an array of strings', () => {
expect(ds.interpolateQueryExpr(['a|bc', 'de|f'], customVariable)).toEqual('a\\\\|bc|de\\\\|f'); expect(ds.interpolateQueryExpr(['a|bc', 'de|f'], customVariable)).toEqual('(a\\\\|bc|de\\\\|f)');
}); });
}); });
@@ -514,7 +514,7 @@ describe('PrometheusDatasource', () => {
}); });
it('should return pipe separated values if the value is an array of strings', () => { it('should return pipe separated values if the value is an array of strings', () => {
expect(ds.interpolateQueryExpr(['a|bc', 'de|f'], customVariable)).toEqual('a\\\\|bc|de\\\\|f'); expect(ds.interpolateQueryExpr(['a|bc', 'de|f'], customVariable)).toEqual('(a\\\\|bc|de\\\\|f)');
}); });
}); });
}); });

2
public/app/plugins/datasource/prometheus/datasource.ts
View File

@@ -159,7 +159,7 @@ export class PrometheusDatasource extends DataSourceApi<PromQuery, PromOptions>
} }
const escapedValues = value.map(val => prometheusSpecialRegexEscape(val)); const escapedValues = value.map(val => prometheusSpecialRegexEscape(val));
return escapedValues.join('|'); return '(' + escapedValues.join('|') + ')';
} }
targetContainsTemplate(target: PromQuery) { targetContainsTemplate(target: PromQuery) {