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

Transformations: Allow more complex regex expressions in Rename by regex (#48179)

Browse Source 
* Support proper regex in renameByRegex transformation

* remove unused import
This commit is contained in:
Ashley Harrison 2022-04-26 11:28:04 +01:00 committed by GitHub
parent e420252d45
commit 53fcb7e171
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 55 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

54
packages/grafana-data/src/transformations/transformers/renameByRegex.test.ts
View File

@ -80,6 +80,59 @@ describe('Rename By Regex Transformer', () => {
});
});
it('should be able to replace globally', async () => {
const cfg: DataTransformerConfig<RenameByRegexTransformerOptions> = {
id: DataTransformerID.renameByRegex,
options: {
regex: '/e/g',
renamePattern: 'E',
},
};
await expect(transformDataFrame([cfg], [data])).toEmitValuesWith((received) => {
const data = received[0];
const frame = data[0];
expect(frame.fields).toMatchInlineSnapshot(`
Array [
Object {
"config": Object {
"displayName": "TimE",
"name": "Time",
},
"name": "Time",
"state": Object {
"displayName": "TimE",
"multipleFrames": false,
},
"type": "time",
"values": Array [
3000,
4000,
5000,
6000,
],
},
Object {
"config": Object {
"displayName": "wEb-01.ExamplE.com",
},
"name": "Value",
"state": Object {
"displayName": "wEb-01.ExamplE.com",
"multipleFrames": false,
},
"type": "number",
"values": Array [
10000.3,
10000.4,
10000.5,
10000.6,
],
},
]
`);
});
});
it('should not rename misses', async () => {
const cfg: DataTransformerConfig<RenameByRegexTransformerOptions> = {
id: DataTransformerID.renameByRegex,
@ -147,7 +200,6 @@ describe('Rename By Regex Transformer', () => {
Array [
Object {
"config": Object {
"displayName": "Time",
"name": "Time",
},
"name": "Time",

3
packages/grafana-data/src/transformations/transformers/renameByRegex.ts
View File

@ -1,6 +1,7 @@
import { map } from 'rxjs/operators';
import { getFieldDisplayName } from '../../field/fieldState';
import { stringToJsRegex } from '../../text/string';
import { DataFrame } from '../../types/dataFrame';
import { DataTransformerInfo } from '../../types/transformations';
@ -47,7 +48,7 @@ export const renameByRegexTransformer: DataTransformerInfo<RenameByRegexTransfor
};
const renameFieldsByRegex = (options: RenameByRegexTransformerOptions) => (frame: DataFrame) => {
const regex = new RegExp(options.regex);
const regex = stringToJsRegex(options.regex);
const fields = frame.fields.map((field) => {
const displayName = getFieldDisplayName(field, frame);
if (!regex.test(displayName)) {