diff --git a/public/app/plugins/datasource/prometheus/result_transformer.test.ts b/public/app/plugins/datasource/prometheus/result_transformer.test.ts index 0372b09d944..1447fbd533c 100644 --- a/public/app/plugins/datasource/prometheus/result_transformer.test.ts +++ b/public/app/plugins/datasource/prometheus/result_transformer.test.ts @@ -492,13 +492,9 @@ describe('Prometheus Result Transformer', () => { seriesLabels: { __name__: 'test' }, exemplars: [ { - scrapeTimestamp: 1610449069957, - exemplar: { - labels: { traceID: '5020b5bc45117f07' }, - value: 0.002074123, - timestamp: 1610449054960, - hasTimestamp: true, - }, + timestamp: 1610449069957, + labels: { traceID: '5020b5bc45117f07' }, + value: 0.002074123, }, ], }, @@ -521,28 +517,20 @@ describe('Prometheus Result Transformer', () => { { exemplars: [ { - scrapeTimestamp: 1610449070000, - exemplar: { - value: 5, - }, + timestamp: 1610449070000, + value: 5, }, { - scrapeTimestamp: 1610449070000, - exemplar: { - value: 1, - }, + timestamp: 1610449070000, + value: 1, }, { - scrapeTimestamp: 1610449070500, - exemplar: { - value: 13, - }, + timestamp: 1610449070500, + value: 13, }, { - scrapeTimestamp: 1610449070300, - exemplar: { - value: 20, - }, + timestamp: 1610449070300, + value: 20, }, ], }, diff --git a/public/app/plugins/datasource/prometheus/result_transformer.ts b/public/app/plugins/datasource/prometheus/result_transformer.ts index be9ade9dbd3..f530cc12f43 100644 --- a/public/app/plugins/datasource/prometheus/result_transformer.ts +++ b/public/app/plugins/datasource/prometheus/result_transformer.ts @@ -78,9 +78,9 @@ export function transform( prometheusResult.forEach((exemplarData) => { const data = exemplarData.exemplars.map((exemplar) => { return { - [TIME_SERIES_TIME_FIELD_NAME]: exemplar.scrapeTimestamp, - [TIME_SERIES_VALUE_FIELD_NAME]: exemplar.exemplar.value, - ...exemplar.exemplar.labels, + [TIME_SERIES_TIME_FIELD_NAME]: exemplar.timestamp, + [TIME_SERIES_VALUE_FIELD_NAME]: exemplar.value, + ...exemplar.labels, ...exemplarData.seriesLabels, }; }); diff --git a/public/app/plugins/datasource/prometheus/types.ts b/public/app/plugins/datasource/prometheus/types.ts index 331418d2d95..f5b1c95005c 100644 --- a/public/app/plugins/datasource/prometheus/types.ts +++ b/public/app/plugins/datasource/prometheus/types.ts @@ -69,21 +69,15 @@ export interface Labels { [index: string]: any; } -export interface ScrapeExemplar { - exemplar: Exemplar; - scrapeTimestamp: number; -} - export interface Exemplar { labels: Labels; value: number; timestamp: number; - hasTimestamp: boolean; } export interface PromExemplarData { seriesLabels: PromMetric; - exemplars: ScrapeExemplar[]; + exemplars: Exemplar[]; } export interface PromVectorData {