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

Loki: Fix missing parameters on Query Builder operations (#60677)

Browse Source 
* add missing mandatory params

* improve naming

* change let to const
This commit is contained in:
Sven Grossmann
2022-12-22 15:31:41 +01:00
committed by GitHub
parent f990be58cb
commit 9f9bf4650d
3 changed files with 101 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
public/app/plugins/datasource/loki/querybuilder/parsing.ts
View File

@@ -51,9 +51,14 @@ import {
makeError,
replaceVariables,
} from '../../prometheus/querybuilder/shared/parsingUtils';
import { QueryBuilderLabelFilter, QueryBuilderOperation } from '../../prometheus/querybuilder/shared/types';
import {
QueryBuilderLabelFilter,
QueryBuilderOperation,
QueryBuilderOperationParamValue,
} from '../../prometheus/querybuilder/shared/types';
import { binaryScalarDefs } from './binaryScalarOperations';
import { checkParamsAreValid, getDefinitionById } from './operations';
import { LokiOperationId, LokiVisualQuery, LokiVisualQueryBinary } from './types';
interface Context {
@@ -256,7 +261,12 @@ function getLabelParser(expr: string, node: SyntaxNode): QueryBuilderOperation {
const parser = getString(expr, parserNode);
const string = handleQuotes(getString(expr, node.getChild(String)));
const params = !!string ? [string] : [];
let params: QueryBuilderOperationParamValue[] = !!string ? [string] : [];
const opDef = getDefinitionById(parser);
if (opDef && !checkParamsAreValid(opDef, params)) {
params = opDef?.defaultParams || [];
}
return {
id: parser,
params,