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

SLA: support multiple SLA in one query, fixes #1603

Browse Source
This commit is contained in:
Alexander Zobnin
2023-08-01 15:04:35 +02:00
parent cef0a2e157
commit 873947ca2e
2 changed files with 78 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/datasource/zabbix/zabbix.ts
View File

@@ -3,7 +3,7 @@ import _ from 'lodash';
import moment from 'moment';
import semver from 'semver';
import * as utils from '../utils';
import responseHandler, { handleServiceResponse, handleSLIResponse } from '../responseHandler';
import responseHandler, { handleMultiSLIResponse, handleServiceResponse, handleSLIResponse } from '../responseHandler';
import { CachingProxy } from './proxy/cachingProxy';
import { DBConnector } from './connectors/dbConnector';
import { ZabbixAPIConnector } from './connectors/zabbix_api/zabbixAPIConnector';
@@ -667,9 +667,15 @@ export class Zabbix implements ZabbixConnector {
}
const slaIds = slas.map((s) => s.slaid);
const slaId = slaIds?.length > 0 ? slaIds[0] : undefined;
const result = await this.zabbixAPI.getSLI(slaId, itServiceIds, timeRange, options);
return handleSLIResponse(result, itservices, target);
if (slaIds.length > 1) {
const sliQueries = slaIds?.map((slaId) => this.zabbixAPI.getSLI(slaId, itServiceIds, timeRange, options));
const results = await Promise.all(sliQueries);
return handleMultiSLIResponse(results, itservices, slas, target);
} else {
const slaId = slaIds?.length > 0 ? slaIds[0] : undefined;
const result = await this.zabbixAPI.getSLI(slaId, itServiceIds, timeRange, options);
return handleSLIResponse(result, itservices, target);
}
}
async getSLA(itservices, timeRange, target, options) {