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

Graphite Plugin: fix annotation migration regression with ref-ids (#53361)

Browse Source 
* fix regression with ref-ids

* remove duplicate check for annotations in fix
This commit is contained in:
Brendan O'Handley 2022-08-08 12:32:35 -04:00 committed by GitHub
parent ba89471598
commit 85db523dd5
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 38 additions and 42 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

80
public/app/plugins/datasource/graphite/datasource.ts
View File

@ -189,11 +189,10 @@ export class GraphiteDatasource
} }
query(options: DataQueryRequest<GraphiteQuery>): Observable<DataQueryResponse> { query(options: DataQueryRequest<GraphiteQuery>): Observable<DataQueryResponse> {
const streams: Array<Observable<DataQueryResponse>> = []; if (options.targets.some((target: GraphiteQuery) => target.fromAnnotations)) {
const streams: Array<Observable<DataQueryResponse>> = [];
for (const target of options.targets) { for (const target of options.targets) {
// hiding target is handled in buildGraphiteParams
if (target.fromAnnotations) {
streams.push( streams.push(
new Observable((subscriber) => { new Observable((subscriber) => {
this.annotationEvents(options.range, target) this.annotationEvents(options.range, target)
@ -202,49 +201,46 @@ export class GraphiteDatasource
.finally(() => subscriber.complete()); .finally(() => subscriber.complete());
}) })
); );
} else {
// handle the queries here
const graphOptions = {
from: this.translateTime(options.range.from, false, options.timezone),
until: this.translateTime(options.range.to, true, options.timezone),
targets: options.targets,
format: (options as GraphiteQueryRequest).format,
cacheTimeout: options.cacheTimeout || this.cacheTimeout,
maxDataPoints: options.maxDataPoints,
};
const params = this.buildGraphiteParams(graphOptions, options.scopedVars);
if (params.length === 0) {
return of({ data: [] });
}
if (this.isMetricTank) {
params.push('meta=true');
}
const httpOptions: any = {
method: 'POST',
url: '/render',
data: params.join('&'),
headers: {
'Content-Type': 'application/x-www-form-urlencoded',
},
};
this.addTracingHeaders(httpOptions, options);
if (options.panelId) {
httpOptions.requestId = this.name + '.panelId.' + options.panelId;
}
streams.push(this.doGraphiteRequest(httpOptions).pipe(map(this.convertResponseToDataFrames)));
} }
return merge(...streams);
} }
if (streams.length === 0) { // handle the queries here
const graphOptions = {
from: this.translateTime(options.range.from, false, options.timezone),
until: this.translateTime(options.range.to, true, options.timezone),
targets: options.targets,
format: (options as GraphiteQueryRequest).format,
cacheTimeout: options.cacheTimeout || this.cacheTimeout,
maxDataPoints: options.maxDataPoints,
};
const params = this.buildGraphiteParams(graphOptions, options.scopedVars);
if (params.length === 0) {
return of({ data: [] }); return of({ data: [] });
} }
return merge(...streams);
if (this.isMetricTank) {
params.push('meta=true');
}
const httpOptions: any = {
method: 'POST',
url: '/render',
data: params.join('&'),
headers: {
'Content-Type': 'application/x-www-form-urlencoded',
},
};
this.addTracingHeaders(httpOptions, options);
if (options.panelId) {
httpOptions.requestId = this.name + '.panelId.' + options.panelId;
}
return this.doGraphiteRequest(httpOptions).pipe(map(this.convertResponseToDataFrames));
} }
addTracingHeaders(httpOptions: { headers: any }, options: { dashboardId?: number; panelId?: number }) { addTracingHeaders(httpOptions: { headers: any }, options: { dashboardId?: number; panelId?: number }) {