Просмотр исходного кода

Graphite: Lexer fix, allow equal sign (=) in metric paths, Fixes #1114

Torkel Ödegaard 11 лет назад
Родитель
Сommit
3cde783d1d
3 измененных файлов с 8 добавлено и 0 удалено
  1. 1 0
      CHANGELOG.md
  2. 1 0
      src/app/services/graphite/lexer.js
  3. 6 0
      src/test/specs/lexer-specs.js

+ 1 - 0
CHANGELOG.md

@@ -4,6 +4,7 @@
 - [Issue #1087](https://github.com/grafana/grafana/issues/1087). Panel: Fixed IE9 crash due to angular drag drop
 - [Issue #1093](https://github.com/grafana/grafana/issues/1093). SingleStatPanel: Fixed position for drilldown link tooltip when dashboard requires scrolling
 - [Issue #1095](https://github.com/grafana/grafana/issues/1095). DrilldownLink: template variables in params property was not interpolated
+- [Issue #1114](https://github.com/grafana/grafana/issues/1114). Graphite: Lexer fix, allow equal sign (=) in metric paths
 
 # 1.9.0-rc1 (2014-11-17)
 

+ 1 - 0
src/app/services/graphite/lexer.js

@@ -129,6 +129,7 @@ define([
       i === 63 ||           // ?
       i === 37 ||           // %
       i === 35 ||           // #
+      i === 61 ||           // =
       i >= 97 && i <= 122;  // a-z
   }
 

+ 6 - 0
src/test/specs/lexer-specs.js

@@ -29,6 +29,12 @@ define([
       expect(tokens[2].value).to.be('192-168-1-1');
     });
 
+    it('should tokenize metric expression with equal sign', function() {
+      var lexer = new Lexer('apps=test');
+      var tokens = lexer.tokenize();
+      expect(tokens[0].value).to.be('apps=test');
+    });
+
     it('simple function2', function() {
       var lexer = new Lexer('offset(test.metric, -100)');
       var tokens = lexer.tokenize();