Merge branch 'feature-text_metrics' into grafana-3.0

Conflicts: zabbix/partials/query.editor.html
2016-01-10 22:07:34 +03:00
parent 259b188814 530a833844
commit c7d30e03e4
3 changed files with 57 additions and 7 deletions
--- a/plugins/datasource-zabbix/datasource.js
+++ b/plugins/datasource-zabbix/datasource.js
@@ -225,7 +225,22 @@ function (angular, _, dateMath) {
                  return {
                    target: target.item.name,
                    datapoints: _.map(history, function (p) {
-                      return [p.value, p.clock * 1000];
+                      var value = p.value;
+                      if (target.textFilter) {
+                        var text_extract_pattern = new RegExp(templateSrv.replace(target.textFilter, options.scopedVars));
+                        //var text_extract_pattern = new RegExp(target.textFilter);
+                        var result = text_extract_pattern.exec(value);
+                        if (result) {
+                          if (target.useCaptureGroups) {
+                            value = result[1];
+                          } else {
+                            value = result[0];
+                          }
+                        } else {
+                          value = null;
+                        }
+                      }
+                      return [value, p.clock * 1000];
                    })
                  };
                });