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: Fix empty query string (expr) breaking dashboard panel (#69938)

Browse Source 
* empty string if query.expr is undefined or null
This commit is contained in:
Galen Kistler 2023-06-12 14:42:59 -05:00 committed by GitHub
parent 45b3012db4
commit fb290235fd
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 18 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
public/app/plugins/datasource/prometheus/querybuilder/QueryPatternsModal.tsx
View File

@ -32,7 +32,7 @@ export const QueryPatternsModal = (props: Props) => {
const styles = useStyles2(getStyles); const styles = useStyles2(getStyles);
const hasNewQueryOption = !!onAddQuery; const hasNewQueryOption = !!onAddQuery;
const hasPreviousQuery = useMemo(() => { const hasPreviousQuery = useMemo(() => {
const visualQuery = buildVisualQueryFromString(query.expr); const visualQuery = buildVisualQueryFromString(query.expr ?? '');
// has anything entered in the query, metric, labels, operations, or binary queries // has anything entered in the query, metric, labels, operations, or binary queries
const hasOperations = visualQuery.query.operations.length > 0, const hasOperations = visualQuery.query.operations.length > 0,
hasMetric = visualQuery.query.metric, hasMetric = visualQuery.query.metric,

2
public/app/plugins/datasource/prometheus/querybuilder/components/PromQueryBuilderContainer.tsx
View File

@ -93,7 +93,7 @@ const stateSlice = createSlice({
exprChanged: (state, action: PayloadAction<string>) => { exprChanged: (state, action: PayloadAction<string>) => {
if (!state.visQuery || state.expr !== action.payload) { if (!state.visQuery || state.expr !== action.payload) {
state.expr = action.payload; state.expr = action.payload;
const parseResult = buildVisualQueryFromString(action.payload); const parseResult = buildVisualQueryFromString(action.payload ?? '');
state.visQuery = parseResult.query; state.visQuery = parseResult.query;
} }

16
public/app/plugins/datasource/prometheus/querybuilder/parsing.test.ts
View File

@ -293,6 +293,22 @@ describe('buildVisualQueryFromString', () => {
); );
}); });
it('Throws error when undefined', () => {
expect(() => buildVisualQueryFromString(undefined as unknown as string)).toThrow(
"Cannot read properties of undefined (reading 'replace')"
);
});
it('Works with empty string', () => {
expect(buildVisualQueryFromString('')).toEqual(
noErrors({
metric: '',
labels: [],
operations: [],
})
);
});
it('fails to parse variable for function', () => { it('fails to parse variable for function', () => {
expect(buildVisualQueryFromString('${func_var}(metric{bar="foo"})')).toEqual({ expect(buildVisualQueryFromString('${func_var}(metric{bar="foo"})')).toEqual({
errors: [ errors: [