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

mysql-connector: fix tests

Browse Source
This commit is contained in:
Alexander Zobnin
2017-07-23 11:38:30 +03:00
parent 9334b27eea
commit ba6a04a120
7 changed files with 16 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -196,13 +196,12 @@ System.register(['lodash', 'app/core/utils/datemath', './utils', './migrations',
_export('ZabbixAPIDatasource', ZabbixAPIDatasource = function () { _export('ZabbixAPIDatasource', ZabbixAPIDatasource = function () {
/** @ngInject */ /** @ngInject */
function ZabbixAPIDatasource(instanceSettings, templateSrv, alertSrv, dashboardSrv, datasourceSrv, zabbixAlertingSrv, Zabbix) { function ZabbixAPIDatasource(instanceSettings, templateSrv, alertSrv, dashboardSrv, zabbixAlertingSrv, Zabbix) {
_classCallCheck(this, ZabbixAPIDatasource); _classCallCheck(this, ZabbixAPIDatasource);
this.templateSrv = templateSrv; this.templateSrv = templateSrv;
this.alertSrv = alertSrv; this.alertSrv = alertSrv;
this.dashboardSrv = dashboardSrv; this.dashboardSrv = dashboardSrv;
this.datasourceSrv = datasourceSrv;
this.zabbixAlertingSrv = zabbixAlertingSrv; this.zabbixAlertingSrv = zabbixAlertingSrv;
// Use custom format for template variables // Use custom format for template variables

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

File diff suppressed because one or more lines are too long

5
dist/datasource-zabbix/specs/datasource_specs.js vendored
View File

@@ -15,7 +15,10 @@ describe('ZabbixDatasource', () => {
password: 'zabbix', password: 'zabbix',
trends: true, trends: true,
trendsFrom: '14d', trendsFrom: '14d',
trendsRange: '7d' trendsRange: '7d',
dbConnection: {
enabled: false
}
} }
}; };
ctx.templateSrv = {}; ctx.templateSrv = {};

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

@@ -56,13 +56,12 @@ function _classCallCheck(instance, Constructor) { if (!(instance instanceof Cons
var ZabbixAPIDatasource = function () { var ZabbixAPIDatasource = function () {
/** @ngInject */ /** @ngInject */
function ZabbixAPIDatasource(instanceSettings, templateSrv, alertSrv, dashboardSrv, datasourceSrv, zabbixAlertingSrv, Zabbix) { function ZabbixAPIDatasource(instanceSettings, templateSrv, alertSrv, dashboardSrv, zabbixAlertingSrv, Zabbix) {
_classCallCheck(this, ZabbixAPIDatasource); _classCallCheck(this, ZabbixAPIDatasource);
this.templateSrv = templateSrv; this.templateSrv = templateSrv;
this.alertSrv = alertSrv; this.alertSrv = alertSrv;
this.dashboardSrv = dashboardSrv; this.dashboardSrv = dashboardSrv;
this.datasourceSrv = datasourceSrv;
this.zabbixAlertingSrv = zabbixAlertingSrv; this.zabbixAlertingSrv = zabbixAlertingSrv;
// Use custom format for template variables // Use custom format for template variables

5
dist/test/datasource-zabbix/specs/datasource_specs.js vendored
View File

@@ -29,7 +29,10 @@ describe('ZabbixDatasource', function () {
password: 'zabbix', password: 'zabbix',
trends: true, trends: true,
trendsFrom: '14d', trendsFrom: '14d',
trendsRange: '7d' trendsRange: '7d',
dbConnection: {
enabled: false
}
} }
}; };
ctx.templateSrv = {}; ctx.templateSrv = {};

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

@@ -13,11 +13,10 @@ import {ZabbixAPIError} from './zabbixAPICore.service.js';
class ZabbixAPIDatasource { class ZabbixAPIDatasource {
/** @ngInject */ /** @ngInject */
constructor(instanceSettings, templateSrv, alertSrv, dashboardSrv, datasourceSrv, zabbixAlertingSrv, Zabbix) { constructor(instanceSettings, templateSrv, alertSrv, dashboardSrv, zabbixAlertingSrv, Zabbix) {
this.templateSrv = templateSrv; this.templateSrv = templateSrv;
this.alertSrv = alertSrv; this.alertSrv = alertSrv;
this.dashboardSrv = dashboardSrv; this.dashboardSrv = dashboardSrv;
this.datasourceSrv = datasourceSrv;
this.zabbixAlertingSrv = zabbixAlertingSrv; this.zabbixAlertingSrv = zabbixAlertingSrv;
// Use custom format for template variables // Use custom format for template variables

5
src/datasource-zabbix/specs/datasource_specs.js
View File

@@ -15,7 +15,10 @@ describe('ZabbixDatasource', () => {
password: 'zabbix', password: 'zabbix',
trends: true, trends: true,
trendsFrom: '14d', trendsFrom: '14d',
trendsRange: '7d' trendsRange: '7d',
dbConnection: {
enabled: false
}
} }
}; };
ctx.templateSrv = {}; ctx.templateSrv = {};