From 986ac9ab820b40b8ca943e33ed91fc0695688f43 Mon Sep 17 00:00:00 2001 From: Levente Balogh Date: Tue, 14 Dec 2021 14:48:50 +0100 Subject: [PATCH] TEMPORARY: introduce a breaking change in `@grafana/data` --- packages/grafana-data/src/utils/labels.test.ts | 6 +++--- packages/grafana-data/src/utils/labels.ts | 4 +++- public/app/plugins/datasource/loki/live_streams.ts | 2 +- 3 files changed, 7 insertions(+), 5 deletions(-) diff --git a/packages/grafana-data/src/utils/labels.test.ts b/packages/grafana-data/src/utils/labels.test.ts index 1fb84f5f23c..c239ca84095 100644 --- a/packages/grafana-data/src/utils/labels.test.ts +++ b/packages/grafana-data/src/utils/labels.test.ts @@ -3,12 +3,12 @@ import { Labels } from '../types/data'; describe('parseLabels()', () => { it('returns no labels on empty labels string', () => { - expect(parseLabels('')).toEqual({}); - expect(parseLabels('{}')).toEqual({}); + expect(parseLabels('', 'Foo')).toEqual({}); + expect(parseLabels('{}', 'Foo')).toEqual({}); }); it('returns labels on labels string', () => { - expect(parseLabels('{foo="bar", baz="42"}')).toEqual({ foo: 'bar', baz: '42' }); + expect(parseLabels('{foo="bar", baz="42"}', 'Foo')).toEqual({ foo: 'bar', baz: '42' }); }); }); diff --git a/packages/grafana-data/src/utils/labels.ts b/packages/grafana-data/src/utils/labels.ts index 10e1419367a..e085af739e3 100644 --- a/packages/grafana-data/src/utils/labels.ts +++ b/packages/grafana-data/src/utils/labels.ts @@ -10,7 +10,9 @@ const labelRegexp = /\b(\w+)(!?=~?)"([^"\n]*?)"/g; * * Example: `parseLabels('{job="foo", instance="bar"}) // {job: "foo", instance: "bar"}` */ -export function parseLabels(labels: string): Labels { +export function parseLabels(labels: string, foo: string): Labels { + console.log(foo); + const labelsByKey: Labels = {}; labels.replace(labelRegexp, (_, key, operator, value) => { labelsByKey[key] = value; diff --git a/public/app/plugins/datasource/loki/live_streams.ts b/public/app/plugins/datasource/loki/live_streams.ts index be252116786..bd0b4d186ed 100644 --- a/public/app/plugins/datasource/loki/live_streams.ts +++ b/public/app/plugins/datasource/loki/live_streams.ts @@ -32,7 +32,7 @@ export class LiveStreams { const data = new CircularDataFrame({ capacity: target.size }); data.addField({ name: 'ts', type: FieldType.time, config: { displayName: 'Time' } }); data.addField({ name: 'tsNs', type: FieldType.time, config: { displayName: 'Time ns' } }); - data.addField({ name: 'line', type: FieldType.string }).labels = parseLabels(target.query); + data.addField({ name: 'line', type: FieldType.string }).labels = parseLabels(target.query, 'Foo'); data.addField({ name: 'labels', type: FieldType.other }); // The labels for each line data.addField({ name: 'id', type: FieldType.string }); data.meta = { ...data.meta, preferredVisualisationType: 'logs' };