Skip to content

Commit

Permalink
Merge PR #526
Browse files Browse the repository at this point in the history
  • Loading branch information
@alexanderzobnin
alexanderzobnin committed Feb 20, 2018
2 parents 5d2bae7 + ca6a7d0 commit 5f80fd9
Show file tree
Hide file tree
Showing 10 changed files with 102 additions and 10 deletions.
9 changes: 8 additions & 1 deletion dist/datasource-zabbix/partials/query.editor.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -163,12 +163,19 @@
<!-- Query options -->
<div class="gf-form-group" ng-if="ctrl.showQueryOptions">
<div class="gf-form offset-width-7" ng-hide="ctrl.target.mode == editorMode.TRIGGERS">
<gf-form-switch class="gf-form"
<gf-form-switch class="gf-form" label-class="width-10"
label="Show disabled items"
checked="ctrl.target.options.showDisabledItems"
on-change="ctrl.onQueryOptionChange()">
</gf-form-switch>
</div>
<div class="gf-form offset-width-7" ng-show="ctrl.target.mode === editorMode.TEXT && ctrl.target.resultFormat === 'table'">
<gf-form-switch class="gf-form" label-class="width-10"
label="Skip empty values"
checked="ctrl.target.options.skipEmptyValues"
on-change="ctrl.onQueryOptionChange()">
</gf-form-switch>
</div>
</div>

<!-- Item IDs editor mode -->
Expand Down
9 changes: 7 additions & 2 deletions dist/datasource-zabbix/query.controller.js
View file

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion dist/datasource-zabbix/query.controller.js.map
View file

Large diffs are not rendered by default.

4 changes: 4 additions & 0 deletions dist/datasource-zabbix/responseHandler.js
View file

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion dist/datasource-zabbix/responseHandler.js.map
View file

Large diffs are not rendered by default.

32 changes: 31 additions & 1 deletion dist/datasource-zabbix/specs/datasource.spec.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -126,7 +126,10 @@ describe('ZabbixDatasource', () => {
textFilter: "",
useCaptureGroups: true,
mode: 2,
resultFormat: "table"
resultFormat: "table",
options: {
skipEmptyValues: false
}
}
],
};
Expand Down Expand Up @@ -155,6 +158,33 @@ describe('ZabbixDatasource', () => {
done();
});
});

it('should skip item when last value is empty', () => {
ctx.ds.zabbix.getItemsFromTarget = jest.fn().mockReturnValue(Promise.resolve([
{
hosts: [{hostid: "10001", name: "Zabbix server"}],
itemid: "10100", name: "System information", key_: "system.uname"
},
{
hosts: [{hostid: "10002", name: "Server02"}],
itemid: "90109", name: "System information", key_: "system.uname"
}
]));

ctx.options.targets[0].options.skipEmptyValues = true;
ctx.ds.zabbix.getHistory = jest.fn().mockReturnValue(Promise.resolve([
{clock: "1500010200", itemid:"10100", ns:"900111000", value:"Linux first"},
{clock: "1500010300", itemid:"10100", ns:"900111000", value:"Linux 2nd"},
{clock: "1500010400", itemid:"10100", ns:"900111000", value:"Linux last"},
{clock: "1500010200", itemid:"90109", ns:"900111000", value:"Non empty value"},
{clock: "1500010500", itemid:"90109", ns:"900111000", value:""}
]));
return ctx.ds.query(ctx.options).then(result => {
let tableData = result.data[0];
expect(tableData.rows.length).toBe(1);
expect(tableData.rows[0][3]).toEqual('Linux last');
});
});
});

describe('When replacing template variables', () => {
Expand Down
9 changes: 8 additions & 1 deletion src/datasource-zabbix/partials/query.editor.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -163,12 +163,19 @@
<!-- Query options -->
<div class="gf-form-group" ng-if="ctrl.showQueryOptions">
<div class="gf-form offset-width-7" ng-hide="ctrl.target.mode == editorMode.TRIGGERS">
<gf-form-switch class="gf-form"
<gf-form-switch class="gf-form" label-class="width-10"
label="Show disabled items"
checked="ctrl.target.options.showDisabledItems"
on-change="ctrl.onQueryOptionChange()">
</gf-form-switch>
</div>
<div class="gf-form offset-width-7" ng-show="ctrl.target.mode === editorMode.TEXT && ctrl.target.resultFormat === 'table'">
<gf-form-switch class="gf-form" label-class="width-10"
label="Skip empty values"
checked="ctrl.target.options.skipEmptyValues"
on-change="ctrl.onQueryOptionChange()">
</gf-form-switch>
</div>
</div>

<!-- Item IDs editor mode -->
Expand Down
9 changes: 7 additions & 2 deletions src/datasource-zabbix/query.controller.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -96,7 +96,11 @@ export class ZabbixQueryController extends QueryCtrl {
'acknowledged': 2
},
'options': {
'showDisabledItems': false
'showDisabledItems': false,
'skipEmptyValues': false
},
'table': {
'skipEmptyValues': false
}
};
_.defaults(target, targetDefaults);
Expand Down Expand Up @@ -298,7 +302,8 @@ export class ZabbixQueryController extends QueryCtrl {

renderQueryOptionsText() {
var optionsMap = {
showDisabledItems: "Show disabled items"
showDisabledItems: "Show disabled items",
skipEmptyValues: "Skip empty values"
};
var options = [];
_.forOwn(this.target.options, (value, key) => {
Expand Down
4 changes: 4 additions & 0 deletions src/datasource-zabbix/responseHandler.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -67,6 +67,10 @@ function handleHistoryAsTable(history, items, target) {
let lastPoint = _.last(itemHistory);
let lastValue = lastPoint ? lastPoint.value : null;

if(target.options.skipEmptyValues && (!lastValue || lastValue === '')) {
return;
}

// Regex-based extractor
if (target.textFilter) {
lastValue = extractText(lastValue, target.textFilter, target.useCaptureGroups);
Expand Down
32 changes: 31 additions & 1 deletion src/datasource-zabbix/specs/datasource.spec.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -126,7 +126,10 @@ describe('ZabbixDatasource', () => {
textFilter: "",
useCaptureGroups: true,
mode: 2,
resultFormat: "table"
resultFormat: "table",
options: {
skipEmptyValues: false
}
}
],
};
Expand Down Expand Up @@ -155,6 +158,33 @@ describe('ZabbixDatasource', () => {
done();
});
});

it('should skip item when last value is empty', () => {
ctx.ds.zabbix.getItemsFromTarget = jest.fn().mockReturnValue(Promise.resolve([
{
hosts: [{hostid: "10001", name: "Zabbix server"}],
itemid: "10100", name: "System information", key_: "system.uname"
},
{
hosts: [{hostid: "10002", name: "Server02"}],
itemid: "90109", name: "System information", key_: "system.uname"
}
]));

ctx.options.targets[0].options.skipEmptyValues = true;
ctx.ds.zabbix.getHistory = jest.fn().mockReturnValue(Promise.resolve([
{clock: "1500010200", itemid:"10100", ns:"900111000", value:"Linux first"},
{clock: "1500010300", itemid:"10100", ns:"900111000", value:"Linux 2nd"},
{clock: "1500010400", itemid:"10100", ns:"900111000", value:"Linux last"},
{clock: "1500010200", itemid:"90109", ns:"900111000", value:"Non empty value"},
{clock: "1500010500", itemid:"90109", ns:"900111000", value:""}
]));
return ctx.ds.query(ctx.options).then(result => {
let tableData = result.data[0];
expect(tableData.rows.length).toBe(1);
expect(tableData.rows[0][3]).toEqual('Linux last');
});
});
});

describe('When replacing template variables', () => {
Expand Down

0 comments on commit 5f80fd9

Please sign in to comment.