one possible solution

grafana · Feb 24, 2021 · 51de82a · 51de82a
1 parent ebfbf27
commit 51de82a
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 2 deletions.
diff --git a/pkg/logql/log/parser_hints.go b/pkg/logql/log/parser_hints.go
@@ -63,6 +63,10 @@ func (p *parserHint) NoLabels() bool {
 
 // newParserHint creates a new parser hint using the list of labels that are seen and required in a query.
 func newParserHint(requiredLabelNames, groups []string, without, noLabels bool, metricLabelName string) *parserHint {
+	//Strip the _extracted suffix from any labels which had collisions with stream labels
+	for i := range requiredLabelNames {
+		requiredLabelNames[i] = strings.TrimSuffix(requiredLabelNames[i], "_extracted")
+	}
 	if len(groups) > 0 {
 		requiredLabelNames = append(requiredLabelNames, groups...)
 	}

diff --git a/pkg/logql/log/parser_hints_test.go b/pkg/logql/log/parser_hints_test.go
@@ -177,11 +177,11 @@ func Test_ParserHints(t *testing.T) {
 			`{}`,
 		},
 		{
-			`sum(count_over_time({app="nginx"} | json | cluster_extracted="us-east-west" [1m]))`,
+			`sum by (cluster_extracted)(count_over_time({app="nginx"} | json | cluster_extracted="us-east-west" [1m]))`,
 			jsonLine,
 			true,
 			1.0,
-			`{}`,
+			`{cluster_extracted="us-east-west"}`,
 		},
 	} {
 		tt := tt