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

Enable direct db connection

Browse Source
This commit is contained in:
Alexander Zobnin
2021-08-03 19:12:26 +03:00
parent c44a7ace5d
commit 848ea8a9a0
1 changed files with 11 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -108,11 +108,9 @@ export class ZabbixDatasource extends DataSourceApi<ZabbixMetricsQuery, ZabbixDS
}); });
const backendResponsePromise = this.backendQuery({...request, targets: requestTargets}); const backendResponsePromise = this.backendQuery({...request, targets: requestTargets});
// if (isBackendQuery(request)) {
// }
// Create request for each target // Create request for each target
const frontendTargets = requestTargets.filter(t => !isBackendTarget(t)); const frontendTargets = requestTargets.filter(t => !this.isBackendTarget(t));
const promises = _.map(frontendTargets, target => { const promises = _.map(frontendTargets, target => {
// Don't request for hidden targets // Don't request for hidden targets
if (target.hide) { if (target.hide) {
@@ -204,7 +202,7 @@ export class ZabbixDatasource extends DataSourceApi<ZabbixMetricsQuery, ZabbixDS
async backendQuery(request: DataQueryRequest<any>): Promise<DataQueryResponse> { async backendQuery(request: DataQueryRequest<any>): Promise<DataQueryResponse> {
const { intervalMs, maxDataPoints, range, requestId } = request; const { intervalMs, maxDataPoints, range, requestId } = request;
const targets = request.targets.filter(isBackendTarget); const targets = request.targets.filter(this.isBackendTarget);
// Add range variables // Add range variables
request.scopedVars = Object.assign({}, request.scopedVars, utils.getRangeScopedVars(request.range)); request.scopedVars = Object.assign({}, request.scopedVars, utils.getRangeScopedVars(request.range));
@@ -834,6 +832,15 @@ export class ZabbixDatasource extends DataSourceApi<ZabbixMetricsQuery, ZabbixDS
); );
return useTrends; return useTrends;
} }
isBackendTarget = (target: any): boolean => {
if (this.enableDirectDBConnection) {
return false;
}
return target.queryType === c.MODE_METRICS ||
target.queryType === c.MODE_ITEMID;
}
} }
function bindFunctionDefs(functionDefs, category) { function bindFunctionDefs(functionDefs, category) {
@@ -943,12 +950,3 @@ function getRequestTarget(request: DataQueryRequest<any>, refId: string): any {
} }
return null; return null;
} }
function isBackendQuery(request: DataQueryRequest<any>): boolean {
return request.targets.every(isBackendTarget);
}
function isBackendTarget(target: any): boolean {
return target.queryType === c.MODE_METRICS ||
target.queryType === c.MODE_ITEMID;
}