From d58d9d98163ebcdafb3aaf1eff6a30cfdbb3c391 Mon Sep 17 00:00:00 2001 From: gfierksap Date: Tue, 16 Jun 2026 15:13:21 +0200 Subject: [PATCH 1/4] changed the loki log query migration condition Signed-off-by: gfierksap --- .../loki-log-query/migrate/migrate.cue | 27 ++++++++++--------- 1 file changed, 14 insertions(+), 13 deletions(-) diff --git a/loki/schemas/queries/loki-log-query/migrate/migrate.cue b/loki/schemas/queries/loki-log-query/migrate/migrate.cue index be5bb4240..f0f148f53 100644 --- a/loki/schemas/queries/loki-log-query/migrate/migrate.cue +++ b/loki/schemas/queries/loki-log-query/migrate/migrate.cue @@ -15,20 +15,21 @@ package migrate #target: { datasource: { - type: "loki" - ... + type?: string } expr: string ... } - -kind: "LokiLogQuery" -spec: { - if #target.datasource.uid != _|_ { - datasource: { - kind: "LokiDatasource" - name: #target.datasource.uid - } - } - query: #target.expr -} + +if #target.datasource.type != _|_ if #target.datasource.type == "loki" { + kind: "LokiLogQuery" + spec: { + if #target.datasource.uid != _|_ { + datasource: { + kind: "LokiDatasource" + name: #target.datasource.uid + } + } + query: #target.expr + } +} \ No newline at end of file From 291e0e2ef4411da09115075869cd358e68b8ad2e Mon Sep 17 00:00:00 2001 From: gfierksap Date: Tue, 16 Jun 2026 15:51:15 +0200 Subject: [PATCH 2/4] fixed linting Signed-off-by: gfierksap --- .../loki-log-query/migrate/migrate.cue | 24 +++++++++---------- 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/loki/schemas/queries/loki-log-query/migrate/migrate.cue b/loki/schemas/queries/loki-log-query/migrate/migrate.cue index f0f148f53..75244aac9 100644 --- a/loki/schemas/queries/loki-log-query/migrate/migrate.cue +++ b/loki/schemas/queries/loki-log-query/migrate/migrate.cue @@ -20,16 +20,16 @@ package migrate expr: string ... } - + if #target.datasource.type != _|_ if #target.datasource.type == "loki" { - kind: "LokiLogQuery" - spec: { - if #target.datasource.uid != _|_ { - datasource: { - kind: "LokiDatasource" - name: #target.datasource.uid - } - } - query: #target.expr - } -} \ No newline at end of file + kind: "LokiLogQuery" + spec: { + if #target.datasource.uid != _|_ { + datasource: { + kind: "LokiDatasource" + name: #target.datasource.uid + } + } + query: #target.expr + } +} From 83933e00d1068a3e3a068edcc53ab253cf7a0e5c Mon Sep 17 00:00:00 2001 From: gfierksap Date: Wed, 17 Jun 2026 10:05:39 +0200 Subject: [PATCH 3/4] re-added ... in loki log query migrate Signed-off-by: gfierksap --- loki/schemas/queries/loki-log-query/migrate/migrate.cue | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/loki/schemas/queries/loki-log-query/migrate/migrate.cue b/loki/schemas/queries/loki-log-query/migrate/migrate.cue index 75244aac9..8fcf3af60 100644 --- a/loki/schemas/queries/loki-log-query/migrate/migrate.cue +++ b/loki/schemas/queries/loki-log-query/migrate/migrate.cue @@ -16,13 +16,14 @@ package migrate #target: { datasource: { type?: string + ... } expr: string ... } if #target.datasource.type != _|_ if #target.datasource.type == "loki" { - kind: "LokiLogQuery" + kind: "LokiLogQuery" spec: { if #target.datasource.uid != _|_ { datasource: { From c811fdecbe4c26f04c6038f302010ada89607d58 Mon Sep 17 00:00:00 2001 From: gfierksap Date: Wed, 17 Jun 2026 15:10:35 +0200 Subject: [PATCH 4/4] added stricter type and uid Signed-off-by: gfierksap --- loki/schemas/queries/loki-log-query/migrate/migrate.cue | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/loki/schemas/queries/loki-log-query/migrate/migrate.cue b/loki/schemas/queries/loki-log-query/migrate/migrate.cue index 8fcf3af60..df8087916 100644 --- a/loki/schemas/queries/loki-log-query/migrate/migrate.cue +++ b/loki/schemas/queries/loki-log-query/migrate/migrate.cue @@ -15,7 +15,8 @@ package migrate #target: { datasource: { - type?: string + type?: "loki" + uid: string ... } expr: string