feat: support simple selection of labels in json expr parser (#6151)

grafana · May 16, 2022 · c6af640 · c6af640
1 parent c6b7752
commit c6af640
Show file tree

Hide file tree

Showing 4 changed files with 396 additions and 168 deletions.
diff --git a/docs/sources/logql/log_queries.md b/docs/sources/logql/log_queries.md
@@ -364,6 +364,18 @@ The **json** parser operates in two modes:
    "server_list" => `["129.0.1.1","10.2.1.3"]`
    "headers" => `{"Accept": "*/*", "User-Agent": "curl/7.68.0"}`
    ```
+
+   If the label to be extracted is same as the original JSON field, expression can be written as just `| json <label>`
+
+   For example, to extract `servers` fields as label, expression can be written as following
+
+   `| json servers` will extract:
+
+    ```kv
+   "servers" => `["129.0.1.1","10.2.1.3"]`
+   ```
+
+   Note that `| json servers` is same as `| json servers="servers"`
 
 #### logfmt
 

diff --git a/pkg/logql/syntax/expr.y b/pkg/logql/syntax/expr.y
@@ -301,6 +301,7 @@ labelFilter:
 
 jsonExpression:
     IDENTIFIER EQ STRING { $$ = log.NewJSONExpr($1, $3) }
+  | IDENTIFIER { $$ = log.NewJSONExpr($1, $1) }
 
 jsonExpressionList:
     jsonExpression                          { $$ = []log.JSONExpression{$1} }