From 56622c2ba1e75d12c2db8caf1e2c91f89d3f1745 Mon Sep 17 00:00:00 2001 From: Lukas Siatka Date: Wed, 6 May 2020 19:05:00 +0200 Subject: [PATCH] Chore: fixes Loki annotation tags deduplication (#24275) (cherry picked from commit fa260fec87b9295b27ee384a056c5733d8b9ca53) --- public/app/plugins/datasource/loki/datasource.test.ts | 1 + public/app/plugins/datasource/loki/datasource.ts | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/public/app/plugins/datasource/loki/datasource.test.ts b/public/app/plugins/datasource/loki/datasource.test.ts index 45fac7aff0d..a806a6296fc 100644 --- a/public/app/plugins/datasource/loki/datasource.test.ts +++ b/public/app/plugins/datasource/loki/datasource.test.ts @@ -355,6 +355,7 @@ describe('LokiDatasource', () => { { stream: { label: 'value', + label2: 'value ', }, values: [['1549016857498000000', 'hello']], }, diff --git a/public/app/plugins/datasource/loki/datasource.ts b/public/app/plugins/datasource/loki/datasource.ts index 828277d3ea2..cf9928f1adb 100644 --- a/public/app/plugins/datasource/loki/datasource.ts +++ b/public/app/plugins/datasource/loki/datasource.ts @@ -497,7 +497,7 @@ export class LokiDatasource extends DataSourceApi { const tags: string[] = []; for (const field of frame.fields) { if (field.labels) { - tags.push.apply(tags, Object.values(field.labels)); + tags.push.apply(tags, [...new Set(Object.values(field.labels).map((label: string) => label.trim()))]); } } const view = new DataFrameView<{ ts: string; line: string }>(frame);