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

Problems: fix empty problems list when null value used as a filter

Browse Source
This commit is contained in:
Alexander Zobnin
2020-11-03 12:17:30 +03:00
parent d2e9c2bfd0
commit 6c20b07c69
2 changed files with 2 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/datasource-zabbix/datasource.ts
View File

@@ -768,7 +768,7 @@ function zabbixItemIdsTemplateFormat(value) {
*/ */
function replaceTemplateVars(templateSrv, target, scopedVars) { function replaceTemplateVars(templateSrv, target, scopedVars) {
let replacedTarget = templateSrv.replace(target, scopedVars, zabbixTemplateFormat); let replacedTarget = templateSrv.replace(target, scopedVars, zabbixTemplateFormat);
if (target !== replacedTarget && !utils.isRegex(replacedTarget)) { if (target && target !== replacedTarget && !utils.isRegex(replacedTarget)) {
replacedTarget = '/^' + replacedTarget + '$/'; replacedTarget = '/^' + replacedTarget + '$/';
} }
return replacedTarget; return replacedTarget;

3
src/datasource-zabbix/partials/query.editor.html
View File

@@ -160,8 +160,7 @@
ng-class="{ ng-class="{
'zbx-variable': ctrl.isVariable(ctrl.target.trigger.filter), 'zbx-variable': ctrl.isVariable(ctrl.target.trigger.filter),
'zbx-regex': ctrl.isRegex(ctrl.target.trigger.filter) 'zbx-regex': ctrl.isRegex(ctrl.target.trigger.filter)
}" }">
empty-to-null>
</div> </div>
<div class="gf-form max-width-20" ng-show="ctrl.target.queryType == editorMode.PROBLEMS"> <div class="gf-form max-width-20" ng-show="ctrl.target.queryType == editorMode.PROBLEMS">