@@ -380,6 +380,7 @@ fluent-bit:
           header AccountID 0
           header ProjectID 0
       {{- range .Values.tenantLogRouting }}
+      {{- if not .namespace }}{{ fail "tenantLogRouting: namespace is required" }}{{- end }}
       [OUTPUT]
           Name http
           Match tenant.{{ .namespace }}.*
@@ -445,7 +446,7 @@ fluent-bit:
       [FILTER]
           Name rewrite_tag
           Match kube.*
-          Rule $kubernetes_namespace_name ^({{ .namespace }})$ tenant.{{ .namespace }}.$TAG false
+          Rule $kubernetes_namespace_name ^({{ .namespace | regexQuoteMeta }})$ tenant.{{ .namespace }}.$TAG false
       {{- end }}
 scrapeRules:
   etcd: