diff --git a/operator/CHANGELOG.md b/operator/CHANGELOG.md index 6b96a87da10a6..8cdf098879364 100644 --- a/operator/CHANGELOG.md +++ b/operator/CHANGELOG.md @@ -2,6 +2,8 @@ ## Release 6.0.2 +- [14613](https://github.com/grafana/loki/pull/14613) **xperimental**: fix(operator): Disable log level discovery for OpenShift tenancy modes +- [14506](https://github.com/grafana/loki/pull/14506) **xperimental**: fix(operator): Disable automatic discovery of service name - [14587](https://github.com/grafana/loki/pull/14587) **JoaoBraveCoding**: fix(operator): correctly ignore again BlotDB dashboards - [14526](https://github.com/grafana/loki/pull/14526) **periklis**: feat(operator): Update Loki operand to v3.2.1 - [14568](https://github.com/grafana/loki/pull/14568) **periklis**: refactor(operator)!: Rename loki api go module diff --git a/operator/internal/manifests/config.go b/operator/internal/manifests/config.go index f40a8ad21c54a..90c7404ebb6ee 100644 --- a/operator/internal/manifests/config.go +++ b/operator/internal/manifests/config.go @@ -194,6 +194,7 @@ func ConfigOptions(opt Options) config.Options { ObjectStorage: opt.ObjectStorage, HTTPTimeouts: opt.Timeouts.Loki, EnableRemoteReporting: opt.Gates.GrafanaLabsUsageReport, + DiscoverLogLevels: discoverLogLevels(&opt.Stack), Ruler: config.Ruler{ Enabled: rulerEnabled, RulesStorageDirectory: rulesStorageDirectory, @@ -395,3 +396,16 @@ func retentionConfig(ls *lokiv1.LokiStackSpec) config.RetentionOptions { DeleteWorkerCount: deleteWorkerCountMap[ls.Size], } } + +func discoverLogLevels(ls *lokiv1.LokiStackSpec) bool { + if ls.Tenants == nil { + return true + } + + if ls.Tenants.Mode == lokiv1.OpenshiftLogging || + ls.Tenants.Mode == lokiv1.OpenshiftNetwork { + return false + } + + return true +} diff --git a/operator/internal/manifests/internal/config/build_test.go b/operator/internal/manifests/internal/config/build_test.go index 3aeabddf6f2f7..007b921529450 100644 --- a/operator/internal/manifests/internal/config/build_test.go +++ b/operator/internal/manifests/internal/config/build_test.go @@ -97,6 +97,7 @@ limits_config: max_line_size: 256000 max_entries_limit_per_query: 5000 discover_service_name: [] + discover_log_levels: true max_global_streams_per_user: 0 max_chunks_per_query: 2000000 max_query_length: 721h @@ -259,6 +260,7 @@ overrides: }, Shippers: []string{"boltdb"}, EnableRemoteReporting: true, + DiscoverLogLevels: true, HTTPTimeouts: HTTPTimeoutConfig{ IdleTimeout: 30 * time.Second, ReadTimeout: 30 * time.Second, @@ -355,6 +357,7 @@ limits_config: max_line_size: 256000 max_entries_limit_per_query: 5000 discover_service_name: [] + discover_log_levels: false max_global_streams_per_user: 0 max_chunks_per_query: 2000000 max_query_length: 721h @@ -782,6 +785,7 @@ limits_config: max_line_size: 256000 max_entries_limit_per_query: 5000 discover_service_name: [] + discover_log_levels: false max_global_streams_per_user: 0 max_chunks_per_query: 2000000 max_query_length: 721h @@ -1141,6 +1145,7 @@ limits_config: max_line_size: 256000 max_entries_limit_per_query: 5000 discover_service_name: [] + discover_log_levels: false max_global_streams_per_user: 0 max_chunks_per_query: 2000000 max_query_length: 721h @@ -1501,6 +1506,7 @@ limits_config: max_line_size: 256000 max_entries_limit_per_query: 5000 discover_service_name: [] + discover_log_levels: false max_global_streams_per_user: 0 max_chunks_per_query: 2000000 max_query_length: 721h @@ -1895,6 +1901,7 @@ limits_config: max_line_size: 256000 max_entries_limit_per_query: 5000 discover_service_name: [] + discover_log_levels: false max_global_streams_per_user: 0 max_chunks_per_query: 2000000 max_query_length: 721h @@ -2231,6 +2238,7 @@ limits_config: max_line_size: 256000 max_entries_limit_per_query: 5000 discover_service_name: [] + discover_log_levels: false max_global_streams_per_user: 0 max_chunks_per_query: 2000000 max_query_length: 721h @@ -2671,6 +2679,7 @@ limits_config: max_line_size: 256000 max_entries_limit_per_query: 5000 discover_service_name: [] + discover_log_levels: false max_global_streams_per_user: 0 max_chunks_per_query: 2000000 max_query_length: 721h @@ -2996,6 +3005,7 @@ limits_config: max_line_size: 256000 max_entries_limit_per_query: 5000 discover_service_name: [] + discover_log_levels: false max_global_streams_per_user: 0 max_chunks_per_query: 2000000 max_query_length: 721h @@ -3494,6 +3504,7 @@ limits_config: max_line_size: 256000 max_entries_limit_per_query: 5000 discover_service_name: [] + discover_log_levels: false max_global_streams_per_user: 0 max_chunks_per_query: 2000000 max_query_length: 721h @@ -3756,6 +3767,7 @@ limits_config: max_line_size: 256000 max_entries_limit_per_query: 5000 discover_service_name: [] + discover_log_levels: false max_global_streams_per_user: 0 max_chunks_per_query: 2000000 max_query_length: 721h @@ -4019,6 +4031,7 @@ limits_config: max_line_size: 256000 max_entries_limit_per_query: 5000 discover_service_name: [] + discover_log_levels: false max_global_streams_per_user: 0 max_chunks_per_query: 2000000 max_query_length: 721h @@ -4283,6 +4296,7 @@ limits_config: max_line_size: 256000 max_entries_limit_per_query: 5000 discover_service_name: [] + discover_log_levels: false max_global_streams_per_user: 0 max_chunks_per_query: 2000000 max_query_length: 721h @@ -4583,6 +4597,7 @@ limits_config: max_line_size: 256000 max_entries_limit_per_query: 5000 discover_service_name: [] + discover_log_levels: false max_global_streams_per_user: 0 max_chunks_per_query: 2000000 max_query_length: 721h @@ -4881,6 +4896,7 @@ limits_config: max_line_size: 256000 max_entries_limit_per_query: 5000 discover_service_name: [] + discover_log_levels: false max_global_streams_per_user: 0 max_chunks_per_query: 2000000 max_query_length: 721h @@ -5380,6 +5396,7 @@ limits_config: max_line_size: 256000 max_entries_limit_per_query: 5000 discover_service_name: [] + discover_log_levels: false max_global_streams_per_user: 0 max_chunks_per_query: 2000000 max_query_length: 721h @@ -5557,6 +5574,7 @@ limits_config: max_line_size: 256000 max_entries_limit_per_query: 5000 discover_service_name: [] + discover_log_levels: false max_global_streams_per_user: 0 max_chunks_per_query: 2000000 max_query_length: 721h @@ -5727,6 +5745,7 @@ limits_config: max_line_size: 256000 max_entries_limit_per_query: 5000 discover_service_name: [] + discover_log_levels: false 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 1f07eb18f8ed1..6b44983f3d2b8 100644 --- a/operator/internal/manifests/internal/config/loki-config.yaml +++ b/operator/internal/manifests/internal/config/loki-config.yaml @@ -193,6 +193,7 @@ limits_config: max_line_size: {{ .Stack.Limits.Global.IngestionLimits.MaxLineSize }} max_entries_limit_per_query: {{ .Stack.Limits.Global.QueryLimits.MaxEntriesLimitPerQuery }} discover_service_name: [] + discover_log_levels: {{ .DiscoverLogLevels }} max_global_streams_per_user: {{ .Stack.Limits.Global.IngestionLimits.MaxGlobalStreamsPerTenant }} max_chunks_per_query: {{ .Stack.Limits.Global.QueryLimits.MaxChunksPerQuery }} max_query_length: 721h diff --git a/operator/internal/manifests/internal/config/options.go b/operator/internal/manifests/internal/config/options.go index c22f0f898fb4c..1d4e6c9cecb4d 100644 --- a/operator/internal/manifests/internal/config/options.go +++ b/operator/internal/manifests/internal/config/options.go @@ -29,6 +29,7 @@ type Options struct { MaxConcurrent MaxConcurrent WriteAheadLog WriteAheadLog EnableRemoteReporting bool + DiscoverLogLevels bool Shippers []string ObjectStorage storage.Options