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

tests for influxdb connector

Browse Source
This commit is contained in:
Alexander Zobnin
2018-10-31 10:17:23 +03:00
parent eeaef5c2ee
commit 054e5518c5
4 changed files with 106 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/datasource-zabbix/zabbix/connectors/influxdb/influxdbConnector.js
View File

@@ -1,4 +1,5 @@
import _ from 'lodash';
import { compactQuery } from '../../../utils';
import { DBConnector, HISTORY_TO_TABLE_MAP, consolidateByFunc } from '../dbConnector';
export class InfluxDBConnector extends DBConnector {
@@ -104,7 +105,3 @@ function handleInfluxHistoryResponse(results) {
return seriesList;
}
function compactQuery(query) {
return query.replace(/\s+/g, ' ');
}

9
src/datasource-zabbix/zabbix/connectors/sql/sqlConnector.js
View File

@@ -1,4 +1,5 @@
import _ from 'lodash';
import { compactQuery } from '../../../utils';
import mysql from './mysql';
import postgres from './postgres';
import dbConnector, { DBConnector, DEFAULT_QUERY_LIMIT, HISTORY_TO_TABLE_MAP, TREND_TO_TABLE_MAP } from '../dbConnector';
@@ -52,7 +53,7 @@ export class SQLConnector extends DBConnector {
let table = HISTORY_TO_TABLE_MAP[value_type];
let query = this.sqlDialect.historyQuery(itemids, table, timeFrom, timeTill, intervalSec, aggFunction);
query = compactSQLQuery(query);
query = compactQuery(query);
return this.invokeSQLQuery(query);
});
@@ -77,7 +78,7 @@ export class SQLConnector extends DBConnector {
valueColumn = dbConnector.consolidateByTrendColumns[valueColumn];
let query = this.sqlDialect.trendsQuery(itemids, table, timeFrom, timeTill, intervalSec, aggFunction, valueColumn);
query = compactSQLQuery(query);
query = compactQuery(query);
return this.invokeSQLQuery(query);
});
@@ -112,7 +113,3 @@ export class SQLConnector extends DBConnector {
});
}
}
function compactSQLQuery(query) {
return query.replace(/\s+/g, ' ');
}