From fdb7bab41a141f2ac58b325e172043da8b23b095 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?G=C3=A1bor=20Farkas?= Date: Mon, 4 Apr 2022 13:52:55 +0200 Subject: [PATCH] Loki: do not special-case __name__ label (#47251) * loki: do not mutate the caller's data * Update public/app/plugins/datasource/loki/result_transformer.ts better comment Co-authored-by: Ivana Huckova <30407135+ivanahuckova@users.noreply.github.com> * Update public/app/plugins/datasource/loki/result_transformer.ts no need to handle __name__ Co-authored-by: Ivana Huckova <30407135+ivanahuckova@users.noreply.github.com> * simplify code Co-authored-by: Ivana Huckova <30407135+ivanahuckova@users.noreply.github.com> --- public/app/plugins/datasource/loki/result_transformer.ts | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/public/app/plugins/datasource/loki/result_transformer.ts b/public/app/plugins/datasource/loki/result_transformer.ts index 1f763448553..34aa2e5900b 100644 --- a/public/app/plugins/datasource/loki/result_transformer.ts +++ b/public/app/plugins/datasource/loki/result_transformer.ts @@ -290,12 +290,10 @@ export function createMetricLabel(labelData: { [key: string]: string }, options? } function getOriginalMetricName(labelData: { [key: string]: string }) { - const metricName = labelData.__name__ || ''; - delete labelData.__name__; const labelPart = Object.entries(labelData) .map((label) => `${label[0]}="${label[1]}"`) .join(','); - return `${metricName}{${labelPart}}`; + return `{${labelPart}}`; } export function decamelize(s: string): string {