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

Show query in the inspector, fix #1097

Browse Source
This commit is contained in:
Alexander Zobnin
2020-12-23 12:19:21 +03:00
parent 9a67019259
commit 3f10be6a9d
2 changed files with 4 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/datasource-zabbix/zabbix/connectors/zabbix_api/types.ts
View File

@@ -19,14 +19,6 @@ export interface JSONRPCError {
data?: string; data?: string;
} }
export interface GFHTTPRequest {
method: HTTPMethod;
url: string;
data?: any;
headers?: {[key: string]: string};
withCredentials?: boolean;
}
export type JSONRPCRequestParams = {[key: string]: any}; export type JSONRPCRequestParams = {[key: string]: any};
export type HTTPMethod = 'GET' | 'POST' | 'PUT' | 'PATCH' | 'DELETE' | 'HEAD' | 'CONNECT' | 'OPTIONS' | 'TRACE'; export type HTTPMethod = 'GET' | 'POST' | 'PUT' | 'PATCH' | 'DELETE' | 'HEAD' | 'CONNECT' | 'OPTIONS' | 'TRACE';

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

@@ -4,8 +4,8 @@ import kbn from 'grafana/app/core/utils/kbn';
import * as utils from '../../../utils'; import * as utils from '../../../utils';
import { ZBX_ACK_ACTION_NONE, ZBX_ACK_ACTION_ADD_MESSAGE, MIN_SLA_INTERVAL } from '../../../constants'; import { ZBX_ACK_ACTION_NONE, ZBX_ACK_ACTION_ADD_MESSAGE, MIN_SLA_INTERVAL } from '../../../constants';
import { ShowProblemTypes, ZBXProblem } from '../../../types'; import { ShowProblemTypes, ZBXProblem } from '../../../types';
import { GFHTTPRequest, JSONRPCError, ZBXScript, APIExecuteScriptResponse } from './types'; import { JSONRPCError, ZBXScript, APIExecuteScriptResponse } from './types';
import { getBackendSrv } from '@grafana/runtime'; import { BackendSrvRequest, getBackendSrv } from '@grafana/runtime';
const DEFAULT_ZABBIX_VERSION = '3.0.0'; const DEFAULT_ZABBIX_VERSION = '3.0.0';
@@ -48,12 +48,13 @@ export class ZabbixAPIConnector {
} }
backendAPIRequest(method: string, params: any = {}) { backendAPIRequest(method: string, params: any = {}) {
const requestOptions: GFHTTPRequest = { const requestOptions: BackendSrvRequest = {
url: this.backendAPIUrl, url: this.backendAPIUrl,
method: 'POST', method: 'POST',
headers: { headers: {
'Content-Type': 'application/json' 'Content-Type': 'application/json'
}, },
hideFromInspector: false,
data: { data: {
datasourceId: this.datasourceId, datasourceId: this.datasourceId,
method, method,