IntenseWebs/grafana
3
0
Fork 0
mirror of https://github.com/grafana/grafana.git synced 2025-02-25 18:55:37 -06:00
Code Issues Packages Projects Releases Wiki Activity

Exemplars: change api to reflect latest changes (#30910)

Browse Source
This commit is contained in:
Zoltán Bedi
2021-02-04 20:00:30 +01:00
committed by GitHub
parent cbe040b8c6
commit 48334ab863
3 changed files with 15 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
public/app/plugins/datasource/prometheus/result_transformer.test.ts
View File

@@ -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,
},
],
},

6
public/app/plugins/datasource/prometheus/result_transformer.ts
View File

@@ -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,
};
});

8
public/app/plugins/datasource/prometheus/types.ts
View File

@@ -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 {