Misthios/grafana-zabbix
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Return results in a stable order

Browse Source
This commit is contained in:
Alexander Zobnin
2021-05-28 12:34:04 +03:00
parent 98b6a34fb1
commit 393932068d
3 changed files with 45 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/datasource-zabbix/datasource.ts
View File

@@ -250,6 +250,7 @@ export class ZabbixDatasource extends DataSourceApi<ZabbixMetricsQuery, ZabbixDS
.pipe(
map((rsp: any) => {
const resp = toDataQueryResponse(rsp);
this.sortByRefId(resp);
this.applyFrontendFunctions(resp, request);
return resp;
}),
@@ -369,6 +370,17 @@ export class ZabbixDatasource extends DataSourceApi<ZabbixMetricsQuery, ZabbixDS
return timeseries;
}
sortByRefId(response: DataQueryResponse) {
response.data.sort((a, b) => {
if (a.refId < b.refId) {
return -1;
} else if (a.refId > b.refId) {
return 1;
}
return 0;
});
}
applyFrontendFunctions(response: DataQueryResponse, request: DataQueryRequest<any>) {
for (let i = 0; i < response.data.length; i++) {
const frame: DataFrame = response.data[i];