fix(operator): Fix encoding of blocked query pattern in configuration

operator/CHANGELOG.md

@@ -1,5 +1,6 @@
 ## Main
 
+- [12097](https://github.com/grafana/loki/pull/12097) **btaani**: Fix blocking query yaml block
 - [12007](https://github.com/grafana/loki/pull/12007) **xperimental**: Extend Azure secret validation
 - [12008](https://github.com/grafana/loki/pull/12008) **xperimental**: Support using multiple buckets with AWS STS
 - [11964](https://github.com/grafana/loki/pull/11964) **xperimental**: Provide Azure region for managed credentials using environment variable

operator/internal/manifests/internal/config/build.go

@@ -4,8 +4,6 @@ import (
 	"bytes"
 	"embed"
 	"io"
-	"reflect"
-	"strings"
 	"text/template"
 
 	"github.com/ViaQ/logerr/v2/kverrors"
@@ -29,9 +27,7 @@ var (
 
 	lokiConfigYAMLTmpl = template.Must(template.ParseFS(lokiConfigYAMLTmplFile, "loki-config.yaml"))
 
-	lokiRuntimeConfigYAMLTmpl = template.Must(template.New("loki-runtime-config.yaml").Funcs(template.FuncMap{
-		"yamlBlock": yamlBlock,
-	}).ParseFS(lokiRuntimeConfigYAMLTmplFile, "loki-runtime-config.yaml"))
+	lokiRuntimeConfigYAMLTmpl = template.Must(template.New("loki-runtime-config.yaml").ParseFS(lokiRuntimeConfigYAMLTmplFile, "loki-runtime-config.yaml"))
 )
 
 // Build builds a loki stack configuration files
@@ -58,9 +54,3 @@ func Build(opts Options) ([]byte, []byte, error) {
 	}
 	return cfg, rcfg, nil
 }
-
-func yamlBlock(indent string, in reflect.Value) string {
-	inStr := in.String()
-	lines := strings.Split(strings.TrimRight(inStr, "\n"), "\n")
-	return strings.Join(lines, "\n"+indent)
-}

operator/internal/manifests/internal/config/build_test.go

@@ -445,12 +445,11 @@ overrides:
     blocked_queries:
     - hash: 12345
       types: metric,limited
-    - pattern: |
-        .*prod.*
+    - pattern: .*prod.*
       regex: true
     - types: metric
-    - pattern: |
-        sum(rate({env="prod"}[1m]))
+    - pattern: sum(rate({env="prod"}[1m]))
+    - pattern: '{kubernetes_namespace_name="my-app"}'
 `
 	opts := Options{
 		Stack: lokiv1.LokiStackSpec{
@@ -505,6 +504,9 @@ overrides:
 								{
 									Pattern: `sum(rate({env="prod"}[1m]))`,
 								},
+								{
+									Pattern: `{kubernetes_namespace_name="my-app"}`,
+								},
 							},
 						},
 					},
@@ -538,6 +540,9 @@ overrides:
 							{
 								Pattern: `sum(rate({env="prod"}[1m]))`,
 							},
+							{
+								Pattern: `{kubernetes_namespace_name="my-app"}`,
+							},
 						},
 					},
 				},

operator/internal/manifests/internal/config/loki-runtime-config.yaml

@@ -58,8 +58,7 @@ overrides:
     blocked_queries:
     {{- range $blockedQuery := . }}
     - {{ with $blockedQuery.Pattern -}}
-      pattern: |
-        {{ . | yamlBlock "        "  }}
+      pattern: {{ . | printf "%q" }}
       {{ end -}}
       {{- with $blockedQuery.Regex }}
       regex: {{ . }}