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

…ata-5.8 [release-5.8] fix(operator): Disable structured metadata
periklis · Jul 8, 2024 · 4821a27 · 4821a27
2 parents 034f289 + d9d7317
commit 4821a27
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 0 deletions.
diff --git a/operator/CHANGELOG.md b/operator/CHANGELOG.md
@@ -2,6 +2,7 @@
 
 ## Release 5.8.9
 
+- [318](https://github.com/openshift/loki/pull/318) **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
@@ -106,6 +106,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
@@ -356,6 +357,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
@@ -714,6 +716,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
@@ -1065,6 +1068,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
@@ -1417,6 +1421,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
@@ -1807,6 +1812,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
@@ -2126,6 +2132,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
@@ -2559,6 +2566,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
@@ -2877,6 +2885,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
@@ -3367,6 +3376,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
@@ -3621,6 +3631,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
@@ -3876,6 +3887,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
@@ -4132,6 +4144,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
@@ -4420,6 +4433,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
@@ -204,6 +204,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