diff --git a/public/app/plugins/datasource/loki/querybuilder/operations.ts b/public/app/plugins/datasource/loki/querybuilder/operations.ts index 062af2255ea..4d77b60fb78 100644 --- a/public/app/plugins/datasource/loki/querybuilder/operations.ts +++ b/public/app/plugins/datasource/loki/querybuilder/operations.ts @@ -91,7 +91,7 @@ export function getOperationDefinitions(): QueryBuilderOperationDef[] { defaultParams: [], alternativesKey: 'format', category: LokiVisualQueryOperationCategory.Formats, - orderRank: LokiOperationOrder.LineFormats, + orderRank: LokiOperationOrder.Parsers, renderer: (model, def, innerExpr) => `${innerExpr} | json ${model.params.join(', ')}`.trim(), addOperationHandler: addLokiOperation, explainHandler: () => @@ -104,7 +104,7 @@ export function getOperationDefinitions(): QueryBuilderOperationDef[] { defaultParams: [], alternativesKey: 'format', category: LokiVisualQueryOperationCategory.Formats, - orderRank: LokiOperationOrder.LineFormats, + orderRank: LokiOperationOrder.Parsers, renderer: pipelineRenderer, addOperationHandler: addLokiOperation, explainHandler: () => @@ -126,7 +126,7 @@ export function getOperationDefinitions(): QueryBuilderOperationDef[] { defaultParams: [''], alternativesKey: 'format', category: LokiVisualQueryOperationCategory.Formats, - orderRank: LokiOperationOrder.LineFormats, + orderRank: LokiOperationOrder.Parsers, renderer: (model, def, innerExpr) => `${innerExpr} | regexp \`${model.params[0]}\``, addOperationHandler: addLokiOperation, explainHandler: () => @@ -148,7 +148,7 @@ export function getOperationDefinitions(): QueryBuilderOperationDef[] { defaultParams: [''], alternativesKey: 'format', category: LokiVisualQueryOperationCategory.Formats, - orderRank: LokiOperationOrder.LineFormats, + orderRank: LokiOperationOrder.Parsers, renderer: (model, def, innerExpr) => `${innerExpr} | pattern \`${model.params[0]}\``, addOperationHandler: addLokiOperation, explainHandler: () => @@ -161,7 +161,7 @@ export function getOperationDefinitions(): QueryBuilderOperationDef[] { defaultParams: [], alternativesKey: 'format', category: LokiVisualQueryOperationCategory.Formats, - orderRank: LokiOperationOrder.LineFormats, + orderRank: LokiOperationOrder.Parsers, renderer: pipelineRenderer, addOperationHandler: addLokiOperation, explainHandler: () => @@ -183,7 +183,7 @@ export function getOperationDefinitions(): QueryBuilderOperationDef[] { defaultParams: [''], alternativesKey: 'format', category: LokiVisualQueryOperationCategory.Formats, - orderRank: LokiOperationOrder.LineFormats, + orderRank: LokiOperationOrder.PipeOperations, renderer: (model, def, innerExpr) => `${innerExpr} | line_format \`${model.params[0]}\``, addOperationHandler: addLokiOperation, explainHandler: () => @@ -204,7 +204,7 @@ Example: \`{{.status_code}} - {{.message}}\` defaultParams: ['', ''], alternativesKey: 'format', category: LokiVisualQueryOperationCategory.Formats, - orderRank: LokiOperationOrder.LineFormats, + orderRank: LokiOperationOrder.PipeOperations, renderer: (model, def, innerExpr) => `${innerExpr} | label_format ${model.params[1]}=${model.params[0]}`, addOperationHandler: addLokiOperation, explainHandler: () => @@ -399,7 +399,7 @@ Example: \`\`error_level=\`level\` \`\` defaultParams: ['', '=', ''], alternativesKey: 'label filter', category: LokiVisualQueryOperationCategory.LabelFilters, - orderRank: LokiOperationOrder.LabelFilters, + orderRank: LokiOperationOrder.PipeOperations, renderer: labelFilterRenderer, addOperationHandler: addLokiOperation, explainHandler: () => `Label expression filter allows filtering using original and extracted labels.`, @@ -420,7 +420,7 @@ Example: \`\`error_level=\`level\` \`\` defaultParams: ['', '=', ''], alternativesKey: 'label filter', category: LokiVisualQueryOperationCategory.LabelFilters, - orderRank: LokiOperationOrder.LabelFilters, + orderRank: LokiOperationOrder.PipeOperations, renderer: (model, def, innerExpr) => `${innerExpr} | ${model.params[0]} ${model.params[1]} ip(\`${model.params[2]}\`)`, addOperationHandler: addLokiOperation, diff --git a/public/app/plugins/datasource/loki/querybuilder/types.ts b/public/app/plugins/datasource/loki/querybuilder/types.ts index cc526f91a83..735d2e2cca5 100644 --- a/public/app/plugins/datasource/loki/querybuilder/types.ts +++ b/public/app/plugins/datasource/loki/querybuilder/types.ts @@ -95,8 +95,9 @@ export enum LokiOperationId { export enum LokiOperationOrder { LineFilters = 1, - LineFormats = 2, - LabelFilters = 3, + Parsers = 2, + PipeOperations = 3, + // Unwrap is a special case, as it is usually the last operation, so the order is after pipeOperations Unwrap = 4, NoErrors = 5, RangeVectorFunction = 5,