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

Matchers: Require explicit regexp syntax in byRefId matcher (#96358)

Browse Source
This commit is contained in:
Leon Sorokin 2024-11-13 14:57:17 -06:00 committed by GitHub
parent bfecce320a
commit 7038bbe318
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 15 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
packages/grafana-data/src/transformations/matchers/refIdMatcher.ts
View File

@ -1,4 +1,4 @@
import { stringToJsRegex } from '../../text/string';
import { stringStartsAsRegEx, stringToJsRegex } from '../../text/string';
import { DataFrame } from '../../types/dataFrame';
import { FrameMatcherInfo } from '../../types/transformations';
@ -12,9 +12,20 @@ const refIdMatcher: FrameMatcherInfo<string> = {
defaultOptions: 'A',
get: (pattern: string) => {
const regex = stringToJsRegex(pattern);
let regex: RegExp | null = null;
if (stringStartsAsRegEx(pattern)) {
try {
regex = stringToJsRegex(pattern);
} catch (error) {
if (error instanceof Error) {
console.warn(error.message);
}
}
}
return (frame: DataFrame) => {
return regex.test(frame.refId || '');
return regex?.test(frame.refId || '') ?? frame.refId === pattern;
};
},

2
packages/grafana-data/src/transformations/transformers/filterByRefId.test.ts
View File

@ -42,7 +42,7 @@ describe('filterByRefId transformer', () => {
const cfg = {
id: DataTransformerID.filterByRefId,
options: {
include: 'A|B',
include: '/A|B/',
},
};