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

fix target backward compatibility

Browse Source
This commit is contained in:
Alexander Zobnin
2017-07-26 12:11:12 +03:00
parent 4020710d00
commit 39f4db5182
10 changed files with 32 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -113,7 +113,8 @@ class ZabbixAPIDatasource {
let useTrends = this.isUseTrends(timeRange);
// Metrics or Text query mode
if (target.mode === c.MODE_METRICS || target.mode === c.MODE_TEXT || target.mode === c.MODE_ITEMID) {
if (!target.mode || target.mode === c.MODE_METRICS ||
target.mode === c.MODE_TEXT || target.mode === c.MODE_ITEMID) {
// Migrate old targets
target = migrations.migrate(target);

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

@@ -69,7 +69,7 @@ describe('ZabbixDatasource', () => {
// Check that useTrends options is true
expect(ctx.ds.queryNumericData)
.to.have.been.calledWith(defined, defined, true);
.to.have.been.calledWith(defined, defined, true, sinon.match.any);
});
done();
@@ -85,7 +85,7 @@ describe('ZabbixDatasource', () => {
// Check that useTrends options is false
expect(ctx.ds.queryNumericData)
.to.have.been.calledWith(defined, defined, false);
.to.have.been.calledWith(defined, defined, false, sinon.match.any);
});
done();
});