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

mysql-connector: minor refactor

Browse Source
This commit is contained in:
Alexander Zobnin
2017-07-22 21:09:17 +03:00
parent 59bfacccbc
commit 0da9aefccc
8 changed files with 16 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
dist/datasource-zabbix/datasource.js vendored
View File

@@ -372,7 +372,7 @@ System.register(['lodash', 'app/core/utils/datemath', './utils', './migrations',
// Use history // Use history
if (_this2.enableDirectDBConnection) { if (_this2.enableDirectDBConnection) {
getHistoryPromise = _this2.zabbix.getHistory(items, timeFrom, timeTo, options).then(function (history) { getHistoryPromise = _this2.zabbix.getHistory(items, timeFrom, timeTo, options).then(function (history) {
return _this2.zabbix.dbConnector.handleHistory(history, items); return _this2.zabbix.dbConnector.handleGrafanaTSResponse(history, items);
}); });
} else { } else {
getHistoryPromise = _this2.zabbix.getHistory(items, timeFrom, timeTo).then(function (history) { getHistoryPromise = _this2.zabbix.getHistory(items, timeFrom, timeTo).then(function (history) {

2
dist/datasource-zabbix/datasource.js.map vendored
View File

File diff suppressed because one or more lines are too long

8
dist/datasource-zabbix/zabbixDBConnector.js vendored
View File

@@ -71,11 +71,11 @@ System.register(['angular', 'lodash'], function (_export, _context) {
}); });
} }
}, { }, {
key: 'handleHistory', key: 'handleGrafanaTSResponse',
value: function handleHistory(history, items) { value: function handleGrafanaTSResponse(history, items) {
var addHostName = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : true; var addHostName = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : true;
return convertHistory(history, items, addHostName); return convertGrafanaTSResponse(history, items, addHostName);
} }
}, { }, {
key: 'invokeSQLQuery', key: 'invokeSQLQuery',
@@ -113,7 +113,7 @@ System.register(['angular', 'lodash'], function (_export, _context) {
/////////////////////////////////////////////////////////////////////////////// ///////////////////////////////////////////////////////////////////////////////
function convertHistory(time_series, items, addHostName) { function convertGrafanaTSResponse(time_series, items, addHostName) {
var hosts = _.uniqBy(_.flatten(_.map(items, 'hosts')), 'hostid'); //uniqBy is needed to deduplicate var hosts = _.uniqBy(_.flatten(_.map(items, 'hosts')), 'hostid'); //uniqBy is needed to deduplicate
var grafanaSeries = _.map(time_series, function (series) { var grafanaSeries = _.map(time_series, function (series) {
var itemid = series.name; var itemid = series.name;

2
dist/datasource-zabbix/zabbixDBConnector.js.map vendored
View File

File diff suppressed because one or more lines are too long

2
dist/test/datasource-zabbix/datasource.js vendored
View File

@@ -232,7 +232,7 @@ var ZabbixAPIDatasource = function () {
// Use history // Use history
if (_this2.enableDirectDBConnection) { if (_this2.enableDirectDBConnection) {
getHistoryPromise = _this2.zabbix.getHistory(items, timeFrom, timeTo, options).then(function (history) { getHistoryPromise = _this2.zabbix.getHistory(items, timeFrom, timeTo, options).then(function (history) {
return _this2.zabbix.dbConnector.handleHistory(history, items); return _this2.zabbix.dbConnector.handleGrafanaTSResponse(history, items);
}); });
} else { } else {
getHistoryPromise = _this2.zabbix.getHistory(items, timeFrom, timeTo).then(function (history) { getHistoryPromise = _this2.zabbix.getHistory(items, timeFrom, timeTo).then(function (history) {

8
dist/test/datasource-zabbix/zabbixDBConnector.js vendored
View File

@@ -91,11 +91,11 @@ function ZabbixDBConnectorFactory(datasourceSrv, backendSrv) {
}); });
} }
}, { }, {
key: 'handleHistory', key: 'handleGrafanaTSResponse',
value: function handleHistory(history, items) { value: function handleGrafanaTSResponse(history, items) {
var addHostName = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : true; var addHostName = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : true;
return convertHistory(history, items, addHostName); return convertGrafanaTSResponse(history, items, addHostName);
} }
}, { }, {
key: 'invokeSQLQuery', key: 'invokeSQLQuery',
@@ -135,7 +135,7 @@ _angular2.default.module('grafana.services').factory('ZabbixDBConnector', Zabbix
/////////////////////////////////////////////////////////////////////////////// ///////////////////////////////////////////////////////////////////////////////
function convertHistory(time_series, items, addHostName) { function convertGrafanaTSResponse(time_series, items, addHostName) {
var hosts = _lodash2.default.uniqBy(_lodash2.default.flatten(_lodash2.default.map(items, 'hosts')), 'hostid'); //uniqBy is needed to deduplicate var hosts = _lodash2.default.uniqBy(_lodash2.default.flatten(_lodash2.default.map(items, 'hosts')), 'hostid'); //uniqBy is needed to deduplicate
var grafanaSeries = _lodash2.default.map(time_series, function (series) { var grafanaSeries = _lodash2.default.map(time_series, function (series) {
var itemid = series.name; var itemid = series.name;

2
src/datasource-zabbix/datasource.js
View File

@@ -175,7 +175,7 @@ class ZabbixAPIDatasource {
// Use history // Use history
if (this.enableDirectDBConnection) { if (this.enableDirectDBConnection) {
getHistoryPromise = this.zabbix.getHistory(items, timeFrom, timeTo, options) getHistoryPromise = this.zabbix.getHistory(items, timeFrom, timeTo, options)
.then(history => this.zabbix.dbConnector.handleHistory(history, items)); .then(history => this.zabbix.dbConnector.handleGrafanaTSResponse(history, items));
} else { } else {
getHistoryPromise = this.zabbix.getHistory(items, timeFrom, timeTo) getHistoryPromise = this.zabbix.getHistory(items, timeFrom, timeTo)
.then(history => responseHandler.handleHistory(history, items)); .then(history => responseHandler.handleHistory(history, items));

6
src/datasource-zabbix/zabbixDBConnector.js
View File

@@ -75,8 +75,8 @@ function ZabbixDBConnectorFactory(datasourceSrv, backendSrv) {
}); });
} }
handleHistory(history, items, addHostName = true) { handleGrafanaTSResponse(history, items, addHostName = true) {
return convertHistory(history, items, addHostName); return convertGrafanaTSResponse(history, items, addHostName);
} }
invokeSQLQuery(query) { invokeSQLQuery(query) {
@@ -115,7 +115,7 @@ angular
/////////////////////////////////////////////////////////////////////////////// ///////////////////////////////////////////////////////////////////////////////
function convertHistory(time_series, items, addHostName) { function convertGrafanaTSResponse(time_series, items, addHostName) {
var hosts = _.uniqBy(_.flatten(_.map(items, 'hosts')), 'hostid'); //uniqBy is needed to deduplicate var hosts = _.uniqBy(_.flatten(_.map(items, 'hosts')), 'hostid'); //uniqBy is needed to deduplicate
let grafanaSeries = _.map(time_series, series => { let grafanaSeries = _.map(time_series, series => {
let itemid = series.name; let itemid = series.name;