From 3834c74966b307411732cd3cbaf66305008b10eb Mon Sep 17 00:00:00 2001 From: Robert Jacob Date: Wed, 16 Oct 2024 20:21:07 +0200 Subject: [PATCH] fix(operator): Disable automatic discovery of service name (#14506) --- .../manifests/internal/config/build_test.go | 19 +++++++++++++++++++ .../internal/config/loki-config.yaml | 1 + 2 files changed, 20 insertions(+) diff --git a/operator/internal/manifests/internal/config/build_test.go b/operator/internal/manifests/internal/config/build_test.go index 016e42253f21..63799bffbd37 100644 --- a/operator/internal/manifests/internal/config/build_test.go +++ b/operator/internal/manifests/internal/config/build_test.go @@ -96,6 +96,7 @@ limits_config: max_streams_per_user: 0 max_line_size: 256000 max_entries_limit_per_query: 5000 + discover_service_name: [] max_global_streams_per_user: 0 max_chunks_per_query: 2000000 max_query_length: 721h @@ -353,6 +354,7 @@ limits_config: max_streams_per_user: 0 max_line_size: 256000 max_entries_limit_per_query: 5000 + discover_service_name: [] max_global_streams_per_user: 0 max_chunks_per_query: 2000000 max_query_length: 721h @@ -779,6 +781,7 @@ limits_config: max_streams_per_user: 0 max_line_size: 256000 max_entries_limit_per_query: 5000 + discover_service_name: [] max_global_streams_per_user: 0 max_chunks_per_query: 2000000 max_query_length: 721h @@ -1137,6 +1140,7 @@ limits_config: max_streams_per_user: 0 max_line_size: 256000 max_entries_limit_per_query: 5000 + discover_service_name: [] max_global_streams_per_user: 0 max_chunks_per_query: 2000000 max_query_length: 721h @@ -1496,6 +1500,7 @@ limits_config: max_streams_per_user: 0 max_line_size: 256000 max_entries_limit_per_query: 5000 + discover_service_name: [] max_global_streams_per_user: 0 max_chunks_per_query: 2000000 max_query_length: 721h @@ -1889,6 +1894,7 @@ limits_config: max_streams_per_user: 0 max_line_size: 256000 max_entries_limit_per_query: 5000 + discover_service_name: [] max_global_streams_per_user: 0 max_chunks_per_query: 2000000 max_query_length: 721h @@ -2224,6 +2230,7 @@ limits_config: max_streams_per_user: 0 max_line_size: 256000 max_entries_limit_per_query: 5000 + discover_service_name: [] max_global_streams_per_user: 0 max_chunks_per_query: 2000000 max_query_length: 721h @@ -2663,6 +2670,7 @@ limits_config: max_streams_per_user: 0 max_line_size: 256000 max_entries_limit_per_query: 5000 + discover_service_name: [] max_global_streams_per_user: 0 max_chunks_per_query: 2000000 max_query_length: 721h @@ -2987,6 +2995,7 @@ limits_config: max_streams_per_user: 0 max_line_size: 256000 max_entries_limit_per_query: 5000 + discover_service_name: [] max_global_streams_per_user: 0 max_chunks_per_query: 2000000 max_query_length: 721h @@ -3484,6 +3493,7 @@ limits_config: max_streams_per_user: 0 max_line_size: 256000 max_entries_limit_per_query: 5000 + discover_service_name: [] max_global_streams_per_user: 0 max_chunks_per_query: 2000000 max_query_length: 721h @@ -3745,6 +3755,7 @@ limits_config: max_streams_per_user: 0 max_line_size: 256000 max_entries_limit_per_query: 5000 + discover_service_name: [] max_global_streams_per_user: 0 max_chunks_per_query: 2000000 max_query_length: 721h @@ -4007,6 +4018,7 @@ limits_config: max_streams_per_user: 0 max_line_size: 256000 max_entries_limit_per_query: 5000 + discover_service_name: [] max_global_streams_per_user: 0 max_chunks_per_query: 2000000 max_query_length: 721h @@ -4270,6 +4282,7 @@ limits_config: max_streams_per_user: 0 max_line_size: 256000 max_entries_limit_per_query: 5000 + discover_service_name: [] max_global_streams_per_user: 0 max_chunks_per_query: 2000000 max_query_length: 721h @@ -4569,6 +4582,7 @@ limits_config: max_streams_per_user: 0 max_line_size: 256000 max_entries_limit_per_query: 5000 + discover_service_name: [] max_global_streams_per_user: 0 max_chunks_per_query: 2000000 max_query_length: 721h @@ -4866,6 +4880,7 @@ limits_config: max_streams_per_user: 0 max_line_size: 256000 max_entries_limit_per_query: 5000 + discover_service_name: [] max_global_streams_per_user: 0 max_chunks_per_query: 2000000 max_query_length: 721h @@ -5364,6 +5379,7 @@ limits_config: max_streams_per_user: 0 max_line_size: 256000 max_entries_limit_per_query: 5000 + discover_service_name: [] max_global_streams_per_user: 0 max_chunks_per_query: 2000000 max_query_length: 721h @@ -5540,6 +5556,7 @@ limits_config: max_streams_per_user: 0 max_line_size: 256000 max_entries_limit_per_query: 5000 + discover_service_name: [] max_global_streams_per_user: 0 max_chunks_per_query: 2000000 max_query_length: 721h @@ -5709,6 +5726,7 @@ limits_config: max_streams_per_user: 0 max_line_size: 256000 max_entries_limit_per_query: 5000 + discover_service_name: [] max_global_streams_per_user: 0 max_chunks_per_query: 2000000 max_query_length: 721h @@ -6101,6 +6119,7 @@ limits_config: max_streams_per_user: 0 max_line_size: 256000 max_entries_limit_per_query: 5000 + discover_service_name: [] max_global_streams_per_user: 0 max_chunks_per_query: 2000000 max_query_length: 721h diff --git a/operator/internal/manifests/internal/config/loki-config.yaml b/operator/internal/manifests/internal/config/loki-config.yaml index 01ee6fe9b707..e7204df71ce5 100644 --- a/operator/internal/manifests/internal/config/loki-config.yaml +++ b/operator/internal/manifests/internal/config/loki-config.yaml @@ -202,6 +202,7 @@ limits_config: max_streams_per_user: 0 max_line_size: {{ .Stack.Limits.Global.IngestionLimits.MaxLineSize }} max_entries_limit_per_query: {{ .Stack.Limits.Global.QueryLimits.MaxEntriesLimitPerQuery }} + discover_service_name: [] max_global_streams_per_user: {{ .Stack.Limits.Global.IngestionLimits.MaxGlobalStreamsPerTenant }} max_chunks_per_query: {{ .Stack.Limits.Global.QueryLimits.MaxChunksPerQuery }} max_query_length: 721h