Merge pull request grafana#319 from periklis/disable-structured-metad…

…ata-5.6 [release-5.6] fix(operator): Disable structured metadata
periklis · Jul 8, 2024 · 61768fc · 61768fc
2 parents 482be2e + 8a7c211
commit 61768fc
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 0 deletions.
diff --git a/operator/CHANGELOG.md b/operator/CHANGELOG.md
@@ -2,6 +2,7 @@
 
 ## Release 5.6.21
 
+- [319](https://github.com/openshift/loki/pull/319) **periklis**: fix(operator): Disable structured metadata
 - [13422](https://github.com/grafana/loki/pull/13422) **periklis** feat(operator): Update Loki operand to v3.1.0
 - [13369](https://github.com/grafana/loki/pull/13369) **jatinsu**: feat(operator): Add support for the volume API
 

diff --git a/operator/internal/manifests/internal/config/build_test.go b/operator/internal/manifests/internal/config/build_test.go
@@ -105,6 +105,7 @@ limits_config:
   per_stream_rate_limit: 3MB
   per_stream_rate_limit_burst: 15MB
   split_queries_by_interval: 30m
+  allow_structured_metadata: false
   query_timeout: 1m
   volume_enabled: true
   volume_max_series: 1000
@@ -354,6 +355,7 @@ limits_config:
   per_stream_rate_limit: 3MB
   per_stream_rate_limit_burst: 15MB
   split_queries_by_interval: 30m
+  allow_structured_metadata: false
   query_timeout: 1m
   volume_enabled: true
   volume_max_series: 1000
@@ -695,6 +697,7 @@ limits_config:
   per_stream_rate_limit: 3MB
   per_stream_rate_limit_burst: 15MB
   split_queries_by_interval: 30m
+  allow_structured_metadata: false
   query_timeout: 1m
   volume_enabled: true
   volume_max_series: 1000
@@ -1045,6 +1048,7 @@ limits_config:
   per_stream_rate_limit: 3MB
   per_stream_rate_limit_burst: 15MB
   split_queries_by_interval: 30m
+  allow_structured_metadata: false
   query_timeout: 1m
   volume_enabled: true
   volume_max_series: 1000
@@ -1396,6 +1400,7 @@ limits_config:
   per_stream_rate_limit: 3MB
   per_stream_rate_limit_burst: 15MB
   split_queries_by_interval: 30m
+  allow_structured_metadata: false
   query_timeout: 1m
   volume_enabled: true
   volume_max_series: 1000
@@ -1785,6 +1790,7 @@ limits_config:
   per_stream_rate_limit: 3MB
   per_stream_rate_limit_burst: 15MB
   split_queries_by_interval: 30m
+  allow_structured_metadata: false
   query_timeout: 1m
   volume_enabled: true
   volume_max_series: 1000
@@ -2079,6 +2085,7 @@ limits_config:
   per_stream_rate_limit: 3MB
   per_stream_rate_limit_burst: 15MB
   split_queries_by_interval: 30m
+  allow_structured_metadata: false
   query_timeout: 2m
   volume_enabled: true
   volume_max_series: 1000
@@ -2511,6 +2518,7 @@ limits_config:
   per_stream_rate_limit: 3MB
   per_stream_rate_limit_burst: 15MB
   split_queries_by_interval: 30m
+  allow_structured_metadata: false
   query_timeout: 1m
   volume_enabled: true
   volume_max_series: 1000
@@ -2829,6 +2837,7 @@ limits_config:
   per_stream_rate_limit: 3MB
   per_stream_rate_limit_burst: 15MB
   split_queries_by_interval: 30m
+  allow_structured_metadata: false
   query_timeout: 1m
   volume_enabled: true
   volume_max_series: 1000
@@ -3082,6 +3091,7 @@ limits_config:
   per_stream_rate_limit: 3MB
   per_stream_rate_limit_burst: 15MB
   split_queries_by_interval: 30m
+  allow_structured_metadata: false
   query_timeout: 1m
   volume_enabled: true
   volume_max_series: 1000

diff --git a/operator/internal/manifests/internal/config/loki-config.yaml b/operator/internal/manifests/internal/config/loki-config.yaml
@@ -177,6 +177,7 @@ limits_config:
   per_stream_rate_limit: {{ .Stack.Limits.Global.IngestionLimits.PerStreamRateLimit }}MB
   per_stream_rate_limit_burst: {{ .Stack.Limits.Global.IngestionLimits.PerStreamRateLimitBurst }}MB
   split_queries_by_interval: 30m
+  allow_structured_metadata: false
 {{- with .GossipRing }}
 memberlist:
   abort_if_cluster_join_fails: true