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

Prometheus: Track request.requestId rather than custom query.requestId (#63913)

Browse Source
This commit is contained in:
Ryan McKinley 2023-03-30 11:29:04 -07:00 committed by GitHub
parent 765073a776
commit 8a4135f63f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 1 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1975,7 +1975,6 @@ describe('prepareTargets', () => {
const target: PromQuery = {
refId: 'A',
expr: 'up',
requestId: '2A',
};
const { queries, activeTargets, panelId, end, start } = getPrepareTargetsContext({ targets: [target] });
@ -1993,7 +1992,6 @@ describe('prepareTargets', () => {
hinting: undefined,
instant: undefined,
refId: target.refId,
requestId: panelId + target.refId,
start,
step: 1,
});
@ -2134,7 +2132,6 @@ describe('prepareTargets', () => {
expr: 'up',
range: true,
instant: true,
requestId: '2A',
};
const { queries, activeTargets, panelId, end, start } = getPrepareTargetsContext({
@ -2155,7 +2152,6 @@ describe('prepareTargets', () => {
hinting: undefined,
instant: true,
refId: target.refId,
requestId: panelId + target.refId + '_instant',
start,
step: 1,
});
@ -2163,7 +2159,6 @@ describe('prepareTargets', () => {
...target,
format: 'table',
instant: true,
requestId: panelId + target.refId + '_instant',
valueWithRefId: true,
});
expect(queries[1]).toEqual({
@ -2177,7 +2172,6 @@ describe('prepareTargets', () => {
hinting: undefined,
instant: false,
refId: target.refId,
requestId: panelId + target.refId,
start,
step: 1,
});
@ -2185,7 +2179,6 @@ describe('prepareTargets', () => {
...target,
format: 'time_series',
instant: false,
requestId: panelId + target.refId,
});
});
});
@ -2197,7 +2190,6 @@ describe('prepareTargets', () => {
expr: 'up',
instant: true,
range: false,
requestId: '2A',
};
const { queries, activeTargets, panelId, end, start } = getPrepareTargetsContext({
@ -2218,7 +2210,6 @@ describe('prepareTargets', () => {
hinting: undefined,
instant: true,
refId: target.refId,
requestId: panelId + target.refId,
start,
step: 1,
});
@ -2234,7 +2225,6 @@ describe('prepareTargets', () => {
expr: 'up',
range: true,
instant: false,
requestId: '2A',
};
const { queries, activeTargets, panelId, end, start } = getPrepareTargetsContext({
@ -2255,7 +2245,6 @@ describe('prepareTargets', () => {
hinting: undefined,
instant: false,
refId: target.refId,
requestId: panelId + target.refId,
start,
step: 1,
});

5
public/app/plugins/datasource/prometheus/datasource.tsx
View File

@ -322,7 +322,6 @@ export class PrometheusDatasource
continue;
}
target.requestId = options.panelId + target.refId;
const metricName = this.languageProvider.histogramMetrics.find((m) => target.expr.includes(m));
// In Explore, we run both (instant and range) queries if both are true (selected) or both are undefined (legacy Explore queries)
@ -334,7 +333,6 @@ export class PrometheusDatasource
instantTarget.range = false;
instantTarget.valueWithRefId = true;
delete instantTarget.maxDataPoints;
instantTarget.requestId += '_instant';
// Create range target
const rangeTarget: any = cloneDeep(target);
@ -351,7 +349,6 @@ export class PrometheusDatasource
) {
const exemplarTarget = cloneDeep(target);
exemplarTarget.instant = false;
exemplarTarget.requestId += '_exemplar';
queries.push(this.createQuery(exemplarTarget, options, start, end));
activeTargets.push(exemplarTarget);
}
@ -379,7 +376,6 @@ export class PrometheusDatasource
(metricName && !activeTargets.some((activeTarget) => activeTarget.expr.includes(metricName)))
) {
const exemplarTarget = cloneDeep(target);
exemplarTarget.requestId += '_exemplar';
queries.push(this.createQuery(exemplarTarget, options, start, end));
activeTargets.push(exemplarTarget);
}
@ -577,7 +573,6 @@ export class PrometheusDatasource
exemplar: target.exemplar,
step: 0,
expr: '',
requestId: target.requestId,
refId: target.refId,
start: 0,
end: 0,

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

@ -33,7 +33,7 @@ export function trackQuery(
utcOffsetSec: query.utcOffsetSec,
legend: query.legendFormat,
valueWithRefId: query.valueWithRefId,
requestId: query.requestId,
requestId: request.requestId,
showingGraph: query.showingGraph,
showingTable: query.showingTable,
editor_mode: query.editorMode,

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

@ -13,7 +13,6 @@ export interface PromQuery extends GenPromQuery, DataQuery {
utcOffsetSec?: number;
legendFormat?: string;
valueWithRefId?: boolean;
requestId?: string;
showingGraph?: boolean;
showingTable?: boolean;
hinting?: boolean;