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

TimeSeries: datasources with labels should export tags (not labels) (#18977)

Browse Source 
* merge master

* export prometheus tags
This commit is contained in:
Ryan McKinley 2019-09-09 21:58:34 -07:00 committed by Torkel Ödegaard
parent 14a740572d
commit eccc6adfde
3 changed files with 13 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -76,7 +76,7 @@ export class ResultTransformer {
datapoints: dps,
query: options.query,
target: metricLabel,
labels: metricData.metric,
tags: metricData.metric,
};
}

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

@ -151,19 +151,19 @@ describe('Prometheus Result Transformer', () => {
target: '1',
query: undefined,
datapoints: [[10, 1445000010000], [10, 1445000020000], [0, 1445000030000]],
labels: { __name__: 'test', job: 'testjob', le: '1' },
tags: { __name__: 'test', job: 'testjob', le: '1' },
},
{
target: '2',
query: undefined,
datapoints: [[10, 1445000010000], [0, 1445000020000], [30, 1445000030000]],
labels: { __name__: 'test', job: 'testjob', le: '2' },
tags: { __name__: 'test', job: 'testjob', le: '2' },
},
{
target: '3',
query: undefined,
datapoints: [[10, 1445000010000], [0, 1445000020000], [10, 1445000030000]],
labels: { __name__: 'test', job: 'testjob', le: '3' },
tags: { __name__: 'test', job: 'testjob', le: '3' },
},
]);
});
@ -225,7 +225,7 @@ describe('Prometheus Result Transformer', () => {
target: 'test{job="testjob"}',
query: undefined,
datapoints: [[10, 0], [10, 1000], [0, 2000]],
labels: { job: 'testjob' },
tags: { job: 'testjob' },
},
]);
});
@ -256,7 +256,7 @@ describe('Prometheus Result Transformer', () => {
target: 'test{job="testjob"}',
query: undefined,
datapoints: [[null, 0], [10, 1000], [0, 2000]],
labels: { job: 'testjob' },
tags: { job: 'testjob' },
},
]);
});
@ -287,7 +287,7 @@ describe('Prometheus Result Transformer', () => {
target: 'test{job="testjob"}',
query: undefined,
datapoints: [[null, 0], [null, 2000], [10, 4000], [null, 6000], [10, 8000]],
labels: { job: 'testjob' },
tags: { job: 'testjob' },
},
]);
});

7
public/app/plugins/datasource/testdata/datasource.ts vendored
View File

@ -81,7 +81,12 @@ export class TestDataDataSource extends DataSourceApi<TestDataQuery> {
}
for (const series of results.series || []) {
data.push({ target: series.name, datapoints: series.points, refId: query.refId });
data.push({
target: series.name,
datapoints: series.points,
refId: query.refId,
tags: series.tags,
});
}
}