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

remove options to hide columns

Browse Source
This commit is contained in:
akotynski
2018-02-16 09:08:06 +01:00
parent 456fbd6a5e
commit a9d0b4195e
10 changed files with 12 additions and 100 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
dist/datasource-zabbix/partials/query.editor.html vendored
View File

@@ -19,11 +19,6 @@
</div>
<div class="gf-form" ng-show="ctrl.target.mode === editorMode.TEXT && ctrl.target.resultFormat === 'table'">
<label class="gf-form-label query-keyword width-8">Options</label>
<gf-form-switch class="gf-form" label="Host" checked="ctrl.target.table.host" on-change="ctrl.onTargetBlur()">
</gf-form-switch>
<gf-form-switch class="gf-form" label="Item" checked="ctrl.target.table.item" on-change="ctrl.onTargetBlur()">
</gf-form-switch>
<gf-form-switch class="gf-form" label="Key" checked="ctrl.target.table.key" on-change="ctrl.onTargetBlur()">
</gf-form-switch>
<gf-form-switch class="gf-form" label="Skip empty values" checked="ctrl.target.table.skipEmptyValues" on-change="ctrl.onTargetBlur()">
</gf-form-switch>

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

@@ -149,9 +149,6 @@ System.register(['app/plugins/sdk', 'lodash', './constants', './utils', './metri
'showDisabledItems': false
},
'table': {
'host': true,
'item': true,
'key': true,
'skipEmptyValues': false
}
};

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

File diff suppressed because one or more lines are too long

26
dist/datasource-zabbix/responseHandler.js vendored
View File

@@ -74,15 +74,9 @@ System.register(['lodash', 'app/core/table_model', './constants'], function (_ex
return convertHistory(history, items, addHostName, convertTextCallback);
}function handleHistoryAsTable(history, items, target) {
var table = new TableModel();
if (target.table.host) {
table.addColumn({ text: 'Host' });
}
if (target.table.item) {
table.addColumn({ text: 'Item' });
}
if (target.table.key) {
table.addColumn({ text: 'Key' });
}
table.addColumn({ text: 'Host' });
table.addColumn({ text: 'Item' });
table.addColumn({ text: 'Key' });
table.addColumn({ text: 'Last value' });
var grouped_history = _.groupBy(history, 'itemid');
@@ -103,19 +97,7 @@ System.register(['lodash', 'app/core/table_model', './constants'], function (_ex
var host = _.first(item.hosts);
host = host ? host.name : "";
var row = [];
if (target.table.host) {
row.push(host);
}
if (target.table.item) {
row.push(item.name);
}
if (target.table.key) {
row.push(item.key_);
}
row.push(lastValue);
table.rows.push(row);
table.rows.push([host, item.name, item.key_, lastValue]);
});
return table;

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

File diff suppressed because one or more lines are too long

19
dist/datasource-zabbix/specs/datasource.spec.js vendored
View File

@@ -128,9 +128,6 @@ describe('ZabbixDatasource', () => {
mode: 2,
resultFormat: "table",
table: {
host: true,
item: true,
key: true,
skipEmptyValues: false
}
}
@@ -162,22 +159,6 @@ describe('ZabbixDatasource', () => {
});
});
it('should return table only with `Last value` column when other columns are not selected', () => {
ctx.options.targets[0].table = {
host: false,
item: false,
key: false,
skipEmptyValues: false
};
return ctx.ds.query(ctx.options).then(result => {
let tableData = result.data[0];
expect(tableData.columns.length).toBe(1);
expect(tableData.columns[0].text).toEqual('Last value');
expect(tableData.rows[0].length).toBe(1);
expect(tableData.rows[0][0]).toEqual('Linux last');
});
});
it('should skip item when last value is empty', () => {
ctx.options.targets[0].skipEmptyValues = true;
ctx.ds.zabbix.getHistory = jest.fn().mockReturnValue(Promise.resolve([