fix: correct parsing of labels with special characters #131 (#158)

VictoriaMetrics · May 17, 2024 · 6b13e53 · 6b13e53
1 parent 5b8a0ba
commit 6b13e53
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 3 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -2,6 +2,8 @@
 
 ## tip
 
+* BUGFIX: fix parsing of label names with special characters for the query builder. See [this issue](https://github.com/VictoriaMetrics/grafana-datasource/issues/131#issuecomment-2105662179).
+
 ## [v0.8.1](https://github.com/VictoriaMetrics/grafana-datasource/releases/tag/v0.8.1)
 
 * BUGFIX: fix an issue in the template variable service where accessing the `datasource` property of `undefined` caused a failure. See [this issue](https://github.com/VictoriaMetrics/grafana-datasource/issues/150).

diff --git a/packages/lezer-metricsql/package.json b/packages/lezer-metricsql/package.json
@@ -1,6 +1,6 @@
 {
   "name": "lezer-metricsql",
-  "version": "0.1.2",
+  "version": "0.1.3",
   "main": "index.cjs",
   "type": "module",
   "exports": {

diff --git a/packages/lezer-metricsql/src/metricsql.grammar b/packages/lezer-metricsql/src/metricsql.grammar
@@ -398,7 +398,7 @@ NumberLiteral  {
   EscapedChar {("\\" AnyEscapesChar) ("\\" AnyEscapesChar)*}
   AnyEscapesChar { "-" | "+" | "*" | "/" | "%" | "^" | "=" }
   Identifier {(std.asciiLetter | "_" | ":" | "." | EscapedChar) (std.asciiLetter | std.digit | "_" | ":" | "." | "-" | EscapedChar)*}
-  LabelName { (std.asciiLetter | "_") (std.asciiLetter | std.digit | "_")* }
+  LabelName {(std.asciiLetter | "_" | ":" | "." | EscapedChar) (std.asciiLetter | std.digit | "_" | ":" | "." | "-" | EscapedChar)*}
 
   // Operator
   Sub { "-" }

diff --git a/yarn.lock b/yarn.lock
@@ -6841,7 +6841,7 @@ levn@^0.4.1:
     type-check "~0.4.0"
 
 "lezer-metricsql@file:packages/lezer-metricsql":
-  version "0.1.2"
+  version "0.1.3"
 
 lines-and-columns@^1.1.6:
   version "1.2.4"