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

CloudWatch: Correctly quote metric names with special characters (#78958)

Browse Source
This commit is contained in:
Isabella Siu
2023-12-01 14:37:09 -05:00
committed by GitHub
parent af05fdc806
commit d894f4cc79
2 changed files with 10 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
public/app/plugins/datasource/cloudwatch/language/cloudwatch-sql/SQLGenerator.test.ts
View File

@@ -62,6 +62,13 @@ describe('SQLGenerator', () => {
`SELECT COUNT("Bytes-Per-Second") FROM SCHEMA("AWS/EC2")` `SELECT COUNT("Bytes-Per-Second") FROM SCHEMA("AWS/EC2")`
); );
}); });
it('should wrap in double quotes if metric name starts with a number ', () => {
const select = createFunctionWithParameter('COUNT', ['4xxErrorRate']);
expect(new SQLGenerator().expressionToSqlQuery({ ...baseQuery, select })).toEqual(
`SELECT COUNT("4xxErrorRate") FROM SCHEMA("AWS/EC2")`
);
});
}); });
describe('from', () => { describe('from', () => {

5
public/app/plugins/datasource/cloudwatch/language/cloudwatch-sql/SQLGenerator.ts
View File

@@ -146,10 +146,11 @@ export default class SQLGenerator {
} }
private formatValue(label: string): string { private formatValue(label: string): string {
const specialCharacters = /[/\s\.-]/; // slash, space, dot or dash const specialCharacters = /[/\s\.%-]/; // slash, space, dot, percent, or dash
const startsWithNumber = /^\d/;
const interpolated = this.templateSrv.replace(label, {}, 'raw'); const interpolated = this.templateSrv.replace(label, {}, 'raw');
if (specialCharacters.test(interpolated)) { if (specialCharacters.test(interpolated) || startsWithNumber.test(interpolated)) {
return `"${label}"`; return `"${label}"`;
} }