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

3cde783d · Torkel Ödegaard · e933369f · 3cde783d · 3cde783d · 3cde783d
Commit 3cde783d authored Nov 21, 2014 by Torkel Ödegaard
Show whitespace changes
Inline Side-by-side

Showing with 8 additions and 0 deletions

CHANGELOG.md
+1 -0

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

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

No files found.
--- a/CHANGELOG.md
+++ b/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)

--- a/src/app/services/graphite/lexer.js
+++ b/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
  }

--- a/src/test/specs/lexer-specs.js
+++ b/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();