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

fix regex-based text filter

Browse Source
This commit is contained in:
Alexander Zobnin
2018-01-27 13:26:14 +03:00
parent 7a517be6e1
commit 48a003a930
8 changed files with 26 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -72,7 +72,7 @@ System.register(['lodash', 'app/core/table_model', './constants'], function (_ex
var convertTextCallback = _.partial(convertText, target);
return convertHistory(history, items, addHostName, convertTextCallback);
}function handleHistoryAsTable(history, items) {
}function handleHistoryAsTable(history, items, target) {
var table = new TableModel();
table.addColumn({ text: 'Host' });
table.addColumn({ text: 'Item' });
@@ -84,6 +84,12 @@ System.register(['lodash', 'app/core/table_model', './constants'], function (_ex
var itemHistory = grouped_history[item.itemid] || [];
var lastPoint = _.last(itemHistory);
var lastValue = lastPoint ? lastPoint.value : null;
// Regex-based extractor
if (target.textFilter) {
lastValue = extractText(lastValue, target.textFilter, target.useCaptureGroups);
}
var host = _.first(item.hosts);
host = host ? host.name : "";