From d0d5b3857245e9ed64a755bf892a9e90cbf7103c Mon Sep 17 00:00:00 2001 From: Ryan McKinley Date: Fri, 29 Mar 2019 01:24:16 -0700 Subject: [PATCH] Refactor: Rename Tags to Labels in SeriesData (simple) (#16284) * rename Tags to Labels in SeriesData * copy timeseries tags to labels --- packages/grafana-ui/src/types/data.ts | 5 +++-- packages/grafana-ui/src/utils/processSeriesData.ts | 1 + 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/packages/grafana-ui/src/types/data.ts b/packages/grafana-ui/src/types/data.ts index 03043c4bec8..ed1f3ab37a0 100644 --- a/packages/grafana-ui/src/types/data.ts +++ b/packages/grafana-ui/src/types/data.ts @@ -21,7 +21,7 @@ export interface Field { dateFormat?: string; // Source data format } -export interface Tags { +export interface Labels { [key: string]: string; } @@ -29,7 +29,7 @@ export interface SeriesData { name?: string; fields: Field[]; rows: any[][]; - tags?: Tags; + labels?: Labels; } export interface Column { @@ -51,6 +51,7 @@ export interface TimeSeries { target: string; datapoints: TimeSeriesPoints; unit?: string; + tags?: Labels; } export enum NullValueMode { diff --git a/packages/grafana-ui/src/utils/processSeriesData.ts b/packages/grafana-ui/src/utils/processSeriesData.ts index 437b9b36579..de33e010725 100644 --- a/packages/grafana-ui/src/utils/processSeriesData.ts +++ b/packages/grafana-ui/src/utils/processSeriesData.ts @@ -35,6 +35,7 @@ function convertTimeSeriesToSeriesData(timeSeries: TimeSeries): SeriesData { }, ], rows: timeSeries.datapoints, + labels: timeSeries.tags, }; }