IntenseWebs/grafana
3
0
Fork 0
mirror of https://github.com/grafana/grafana.git synced 2025-02-20 11:48:34 -06:00
Code Issues Packages Projects Releases Wiki Activity

Prometheus: fix Heatmap y buckets when legendFormat: auto (#59053)

Browse Source
This commit is contained in:
Leon Sorokin 2022-11-21 11:29:37 -06:00 committed by GitHub
parent 99725bf9d4
commit 1f4834a144
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 25 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -264,8 +264,8 @@ describe('Prometheus Result Transformer', () => {
{
name: 'Value',
type: FieldType.number,
values: [20, 10, 30],
labels: { le: '2' },
values: [30, 10, 40],
labels: { le: '+Inf' },
},
],
}),
@ -276,8 +276,8 @@ describe('Prometheus Result Transformer', () => {
{
name: 'Value',
type: FieldType.number,
values: [30, 10, 40],
labels: { le: '3' },
values: [20, 10, 30],
labels: { le: '2' },
},
],
}),
@ -289,6 +289,9 @@ describe('Prometheus Result Transformer', () => {
expect(series.data[0].fields[1].values.toArray()).toEqual([10, 10, 0]);
expect(series.data[0].fields[2].values.toArray()).toEqual([10, 0, 30]);
expect(series.data[0].fields[3].values.toArray()).toEqual([10, 0, 10]);
expect(series.data[0].fields[1].name).toEqual('1');
expect(series.data[0].fields[2].name).toEqual('2');
expect(series.data[0].fields[3].name).toEqual('+Inf');
});
it('results with heatmap format from multiple queries should be correctly transformed', () => {

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

@ -102,6 +102,24 @@ export function transformV2(
(df) => isHeatmapResult(df, request)
);
// this works around the fact that we only get back frame.name with le buckets when legendFormat == {{le}}...which is not the default
heatmapResults.forEach((df) => {
if (df.name == null) {
let f = df.fields.find((f) => f.name === 'Value');
if (f) {
let le = f.labels?.le;
if (le) {
// this is used for sorting the frames by numeric ascending le labels for de-accum
df.name = le;
// this is used for renaming the Value fields to le label
f.config.displayNameFromDS = le;
}
}
}
});
// Group heatmaps by query
const heatmapResultsGroupedByQuery = groupBy<DataFrame>(heatmapResults, (h) => h.refId);