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

Catch bad regex exception at controller level

Browse Source
This commit is contained in:
SamuelToh
2019-03-02 20:50:25 +10:00
parent 6bfbdbe20b
commit d2c161c2e6
2 changed files with 7 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
public/app/core/time_series2.ts
View File

@@ -1,5 +1,4 @@
import kbn from 'app/core/utils/kbn';
import { appEvents } from 'app/core/core';
import { getFlotTickDecimals } from 'app/core/utils/ticks';
import _ from 'lodash';
import { getValueFormat } from '@grafana/ui';
@@ -10,12 +9,8 @@ function matchSeriesOverride(aliasOrRegex, seriesAlias) {
}
if (aliasOrRegex[0] === '/') {
try {
const regex = kbn.stringToJsRegex(aliasOrRegex);
return seriesAlias.match(regex) != null;
} catch (e) {
return appEvents.emit('alert-error', ['Invalid aliasOrRegex value.', e.message]);
}
const regex = kbn.stringToJsRegex(aliasOrRegex);
return seriesAlias.match(regex) != null;
}
return aliasOrRegex === seriesAlias;