fix dist folder after merging conflicts

2017-10-23 14:29:05 +02:00
parent 0ab31e59f8
commit d5c8dba61f
5 changed files with 12 additions and 12 deletions
--- a/dist/test/datasource-zabbix/datasource.js
+++ b/dist/test/datasource-zabbix/datasource.js
@@ -840,7 +840,7 @@ function filterEnabledTargets(targets) {
 }

 function getTriggerThreshold(expression) {
-  var thresholdPattern = /.*[<>]([\d\.]+)/;
+  var thresholdPattern = /.*[<>=]{1,2}([\d\.]+)/;
  var finded_thresholds = expression.match(thresholdPattern);
  if (finded_thresholds && finded_thresholds.length >= 2) {
    var threshold = finded_thresholds[1];