From 6a74cd207ad73d94175d5c236e7974c9acf67fd9 Mon Sep 17 00:00:00 2001 From: Matias Chomicki Date: Tue, 11 Oct 2022 17:52:57 +0200 Subject: [PATCH] feat(loki-monaco-editor): add support for in_aggregation situation (#56680) --- .../monaco-completion-provider/situation.test.ts | 4 +--- .../monaco-completion-provider/situation.ts | 4 +++- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/public/app/plugins/datasource/loki/components/monaco-query-field/monaco-completion-provider/situation.test.ts b/public/app/plugins/datasource/loki/components/monaco-query-field/monaco-completion-provider/situation.test.ts index 3a0d0306b71..5c10d615e22 100644 --- a/public/app/plugins/datasource/loki/components/monaco-query-field/monaco-completion-provider/situation.test.ts +++ b/public/app/plugins/datasource/loki/components/monaco-query-field/monaco-completion-provider/situation.test.ts @@ -75,11 +75,9 @@ describe('situation', () => { labels: [{ name: 'level', value: 'info', op: '=' }], }); - /* - Currently failing, reason unknown assertSituation('sum(^)', { type: 'IN_AGGREGATION', - });*/ + }); }); it('handles label names', () => { diff --git a/public/app/plugins/datasource/loki/components/monaco-query-field/monaco-completion-provider/situation.ts b/public/app/plugins/datasource/loki/components/monaco-query-field/monaco-completion-provider/situation.ts index 27cc94a3fb7..e43ae1c8a2c 100644 --- a/public/app/plugins/datasource/loki/components/monaco-query-field/monaco-completion-provider/situation.ts +++ b/public/app/plugins/datasource/loki/components/monaco-query-field/monaco-completion-provider/situation.ts @@ -17,6 +17,8 @@ import { Identifier, Grouping, Expr, + LiteralExpr, + MetricExpr, } from '@grafana/lezer-logql'; type Direction = 'parent' | 'firstChild' | 'lastChild' | 'nextSibling'; @@ -162,7 +164,7 @@ const RESOLVERS: Resolver[] = [ fun: resolveLogRangeFromError, }, { - path: [ERROR_NODE_ID, VectorAggregationExpr], + path: [ERROR_NODE_ID, LiteralExpr, MetricExpr, VectorAggregationExpr, MetricExpr, Expr, LogQL], fun: () => ({ type: 'IN_AGGREGATION' }), }, {