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

Use roundInterval from @grafana/data package, fix #1142

Browse Source
This commit is contained in:
Alexander Zobnin
2021-01-20 11:45:25 +03:00
parent 57543643ac
commit 4556f90592
1 changed files with 5 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/datasource-zabbix/zabbix/connectors/zabbix_api/zabbixAPIConnector.ts
View File

@@ -6,9 +6,13 @@ import { ZBX_ACK_ACTION_NONE, ZBX_ACK_ACTION_ADD_MESSAGE, MIN_SLA_INTERVAL } fro
import { ShowProblemTypes, ZBXProblem } from '../../../types'; import { ShowProblemTypes, ZBXProblem } from '../../../types';
import { JSONRPCError, ZBXScript, APIExecuteScriptResponse } from './types'; import { JSONRPCError, ZBXScript, APIExecuteScriptResponse } from './types';
import { BackendSrvRequest, getBackendSrv } from '@grafana/runtime'; import { BackendSrvRequest, getBackendSrv } from '@grafana/runtime';
import { rangeUtil } from '@grafana/data';
const DEFAULT_ZABBIX_VERSION = '3.0.0'; const DEFAULT_ZABBIX_VERSION = '3.0.0';
// Backward compatibility. Since Grafana 7.2 roundInterval() func was moved to @grafana/data package
const roundInterval: (interval: number) => number = rangeUtil?.roundInterval || kbn.roundInterval || kbn.round_interval;
/** /**
* Zabbix API Wrapper. * Zabbix API Wrapper.
* Creates Zabbix API instance with given parameters (url, credentials and other). * Creates Zabbix API instance with given parameters (url, credentials and other).
@@ -680,7 +684,7 @@ function filterTriggersByAcknowledge(triggers, acknowledged) {
function getSLAInterval(intervalMs) { function getSLAInterval(intervalMs) {
// Too many intervals may cause significant load on the database, so decrease number of resulting points // Too many intervals may cause significant load on the database, so decrease number of resulting points
const resolutionRatio = 100; const resolutionRatio = 100;
const interval = kbn.round_interval(intervalMs * resolutionRatio) / 1000; const interval = roundInterval(intervalMs * resolutionRatio) / 1000;
return Math.max(interval, MIN_SLA_INTERVAL); return Math.max(interval, MIN_SLA_INTERVAL);
} }