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

Prometheus: Fix Query Inspector expression range value (#67919)

Browse Source 
* Use metadata from respective query

* Unit test to cover having proper metadata for each query we run
This commit is contained in:
ismail simsek
2023-05-06 23:48:25 +03:00
committed by GitHub
parent 9788646110
commit 69a38def63
2 changed files with 59 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1,9 +1,9 @@
import {
createDataFrame,
DataFrame,
DataQueryRequest,
DataQueryResponse,
FieldType,
createDataFrame,
PreferredVisualisationType,
} from '@grafana/data';
@@ -828,6 +828,60 @@ describe('Prometheus Result Transformer', () => {
expect(transformedTableDataFrames[1].fields[1].values).toEqual([]);
expect(transformedTableDataFrames[1].fields[0].values).toEqual([]);
});
it('transforms dataframes with metadata resolving from their refIds', () => {
const value1 = 'value1';
const value2 = 'value2';
const executedQueryForRefA = 'Expr: avg_over_time(access_evaluation_duration_bucket[15s])\nStep: 15s';
const executedQueryForRefB = 'Expr: avg_over_time(access_evaluation_duration_bucket[5m])\nStep: 15s';
const dataframes = [
createDataFrame({
refId: 'A',
meta: {
typeVersion: [0, 1],
custom: {
resultType: 'vector',
},
executedQueryString: executedQueryForRefA,
},
fields: [
{ name: 'time', type: FieldType.time, values: [6, 5, 4] },
{
name: 'value',
type: FieldType.number,
values: [6, 5, 4],
labels: { label1: value1, label2: value2 },
},
],
}),
createDataFrame({
refId: 'B',
meta: {
typeVersion: [0, 1],
custom: {
resultType: 'vector',
},
executedQueryString: executedQueryForRefB,
},
fields: [
{ name: 'time', type: FieldType.time, values: [6, 5, 4] },
{
name: 'value',
type: FieldType.number,
values: [6, 5, 4],
labels: { label1: value1, label2: value2 },
},
],
}),
];
const transformedTableDataFrames = transformDFToTable(dataframes);
expect(transformedTableDataFrames[0].meta).toBeTruthy();
expect(transformedTableDataFrames[1].meta).toBeTruthy();
expect(transformedTableDataFrames[0].meta?.executedQueryString).toEqual(executedQueryForRefA);
expect(transformedTableDataFrames[1].meta?.executedQueryString).toEqual(executedQueryForRefB);
});
});
describe('transform', () => {

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

@@ -247,7 +247,10 @@ export function transformDFToTable(dfs: DataFrame[]): DataFrame[] {
refId,
fields,
// Prometheus specific UI for instant queries
meta: { ...dfs[0].meta, preferredVisualisationType: 'rawPrometheus' as PreferredVisualisationType },
meta: {
...dataFramesByRefId[refId][0].meta,
preferredVisualisationType: 'rawPrometheus' as PreferredVisualisationType,
},
length: timeField.values.length,
};
});