Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

LOG-6321: Disable log level discovery for OpenShift tenancy modes #388

Merged
merged 1 commit into from
Oct 28, 2024
Merged

LOG-6321: Disable log level discovery for OpenShift tenancy modes #388

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions operator/CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,8 @@

## Release 5.9.9

- [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
- [14447](https://github.com/grafana/loki/pull/14447) **periklis**: refactor(operator)!: Migrate project layout to kubebuilder go/v4
- [14526](https://github.com/grafana/loki/pull/14526) **periklis**: feat(operator): Update Loki operand to v3.2.1
Expand Down
14 changes: 14 additions & 0 deletions operator/internal/manifests/config.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down Expand Up @@ -394,3 +395,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
}
18 changes: 18 additions & 0 deletions operator/internal/manifests/internal/config/build_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -259,6 +260,7 @@ overrides:
},
Shippers: []string{"boltdb"},
EnableRemoteReporting: true,
DiscoverLogLevels: true,
HTTPTimeouts: HTTPTimeoutConfig{
IdleTimeout: 30 * time.Second,
ReadTimeout: 30 * time.Second,
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -2672,6 +2680,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
Expand Down Expand Up @@ -2998,6 +3007,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
Expand Down Expand Up @@ -3496,6 +3506,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
Expand Down Expand Up @@ -3758,6 +3769,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
Expand Down Expand Up @@ -4021,6 +4033,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
Expand Down Expand Up @@ -4285,6 +4298,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
Expand Down Expand Up @@ -4585,6 +4599,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
Expand Down Expand Up @@ -4883,6 +4898,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
Expand Down Expand Up @@ -5382,6 +5398,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
Expand Down Expand Up @@ -5559,6 +5576,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
Expand Down
1 change: 1 addition & 0 deletions operator/internal/manifests/internal/config/loki-config.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
1 change: 1 addition & 0 deletions operator/internal/manifests/internal/config/options.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,7 @@ type Options struct {
MaxConcurrent MaxConcurrent
WriteAheadLog WriteAheadLog
EnableRemoteReporting bool
DiscoverLogLevels bool
Shippers []string

ObjectStorage storage.Options
Expand Down