Skip to content

Commit 5034d34

Browse files
xperimentalxperimental
authored
fix(operator): Disable log level discovery for OpenShift tenancy modes (#14613)
1 parent a962edb commit 5034d34

File tree

4 files changed

+36
-0
lines changed

4 files changed

+36
-0
lines changed

‎operator/internal/manifests/config.go

+14
Original file line numberDiff line numberDiff line change
@@ -194,6 +194,7 @@ func ConfigOptions(opt Options) config.Options {
194194
ObjectStorage: opt.ObjectStorage,
195195
HTTPTimeouts: opt.Timeouts.Loki,
196196
EnableRemoteReporting: opt.Gates.GrafanaLabsUsageReport,
197+
DiscoverLogLevels: discoverLogLevels(&opt.Stack),
197198
Ruler: config.Ruler{
198199
Enabled: rulerEnabled,
199200
RulesStorageDirectory: rulesStorageDirectory,
@@ -396,3 +397,16 @@ func retentionConfig(ls *lokiv1.LokiStackSpec) config.RetentionOptions {
396397
DeleteWorkerCount: deleteWorkerCountMap[ls.Size],
397398
}
398399
}
400+
401+
func discoverLogLevels(ls *lokiv1.LokiStackSpec) bool {
402+
if ls.Tenants == nil {
403+
return true
404+
}
405+
406+
if ls.Tenants.Mode == lokiv1.OpenshiftLogging ||
407+
ls.Tenants.Mode == lokiv1.OpenshiftNetwork {
408+
return false
409+
}
410+
411+
return true
412+
}

‎operator/internal/manifests/internal/config/build_test.go

+20
Original file line numberDiff line numberDiff line change
@@ -97,6 +97,7 @@ limits_config:
9797
max_line_size: 256000
9898
max_entries_limit_per_query: 5000
9999
discover_service_name: []
100+
discover_log_levels: true
100101
max_global_streams_per_user: 0
101102
max_chunks_per_query: 2000000
102103
max_query_length: 721h
@@ -259,6 +260,7 @@ overrides:
259260
},
260261
Shippers: []string{"boltdb"},
261262
EnableRemoteReporting: true,
263+
DiscoverLogLevels: true,
262264
HTTPTimeouts: HTTPTimeoutConfig{
263265
IdleTimeout: 30 * time.Second,
264266
ReadTimeout: 30 * time.Second,
@@ -355,6 +357,7 @@ limits_config:
355357
max_line_size: 256000
356358
max_entries_limit_per_query: 5000
357359
discover_service_name: []
360+
discover_log_levels: false
358361
max_global_streams_per_user: 0
359362
max_chunks_per_query: 2000000
360363
max_query_length: 721h
@@ -782,6 +785,7 @@ limits_config:
782785
max_line_size: 256000
783786
max_entries_limit_per_query: 5000
784787
discover_service_name: []
788+
discover_log_levels: false
785789
max_global_streams_per_user: 0
786790
max_chunks_per_query: 2000000
787791
max_query_length: 721h
@@ -1141,6 +1145,7 @@ limits_config:
11411145
max_line_size: 256000
11421146
max_entries_limit_per_query: 5000
11431147
discover_service_name: []
1148+
discover_log_levels: false
11441149
max_global_streams_per_user: 0
11451150
max_chunks_per_query: 2000000
11461151
max_query_length: 721h
@@ -1501,6 +1506,7 @@ limits_config:
15011506
max_line_size: 256000
15021507
max_entries_limit_per_query: 5000
15031508
discover_service_name: []
1509+
discover_log_levels: false
15041510
max_global_streams_per_user: 0
15051511
max_chunks_per_query: 2000000
15061512
max_query_length: 721h
@@ -1895,6 +1901,7 @@ limits_config:
18951901
max_line_size: 256000
18961902
max_entries_limit_per_query: 5000
18971903
discover_service_name: []
1904+
discover_log_levels: false
18981905
max_global_streams_per_user: 0
18991906
max_chunks_per_query: 2000000
19001907
max_query_length: 721h
@@ -2231,6 +2238,7 @@ limits_config:
22312238
max_line_size: 256000
22322239
max_entries_limit_per_query: 5000
22332240
discover_service_name: []
2241+
discover_log_levels: false
22342242
max_global_streams_per_user: 0
22352243
max_chunks_per_query: 2000000
22362244
max_query_length: 721h
@@ -2671,6 +2679,7 @@ limits_config:
26712679
max_line_size: 256000
26722680
max_entries_limit_per_query: 5000
26732681
discover_service_name: []
2682+
discover_log_levels: false
26742683
max_global_streams_per_user: 0
26752684
max_chunks_per_query: 2000000
26762685
max_query_length: 721h
@@ -2996,6 +3005,7 @@ limits_config:
29963005
max_line_size: 256000
29973006
max_entries_limit_per_query: 5000
29983007
discover_service_name: []
3008+
discover_log_levels: false
29993009
max_global_streams_per_user: 0
30003010
max_chunks_per_query: 2000000
30013011
max_query_length: 721h
@@ -3494,6 +3504,7 @@ limits_config:
34943504
max_line_size: 256000
34953505
max_entries_limit_per_query: 5000
34963506
discover_service_name: []
3507+
discover_log_levels: false
34973508
max_global_streams_per_user: 0
34983509
max_chunks_per_query: 2000000
34993510
max_query_length: 721h
@@ -3756,6 +3767,7 @@ limits_config:
37563767
max_line_size: 256000
37573768
max_entries_limit_per_query: 5000
37583769
discover_service_name: []
3770+
discover_log_levels: false
37593771
max_global_streams_per_user: 0
37603772
max_chunks_per_query: 2000000
37613773
max_query_length: 721h
@@ -4019,6 +4031,7 @@ limits_config:
40194031
max_line_size: 256000
40204032
max_entries_limit_per_query: 5000
40214033
discover_service_name: []
4034+
discover_log_levels: false
40224035
max_global_streams_per_user: 0
40234036
max_chunks_per_query: 2000000
40244037
max_query_length: 721h
@@ -4283,6 +4296,7 @@ limits_config:
42834296
max_line_size: 256000
42844297
max_entries_limit_per_query: 5000
42854298
discover_service_name: []
4299+
discover_log_levels: false
42864300
max_global_streams_per_user: 0
42874301
max_chunks_per_query: 2000000
42884302
max_query_length: 721h
@@ -4583,6 +4597,7 @@ limits_config:
45834597
max_line_size: 256000
45844598
max_entries_limit_per_query: 5000
45854599
discover_service_name: []
4600+
discover_log_levels: false
45864601
max_global_streams_per_user: 0
45874602
max_chunks_per_query: 2000000
45884603
max_query_length: 721h
@@ -4881,6 +4896,7 @@ limits_config:
48814896
max_line_size: 256000
48824897
max_entries_limit_per_query: 5000
48834898
discover_service_name: []
4899+
discover_log_levels: false
48844900
max_global_streams_per_user: 0
48854901
max_chunks_per_query: 2000000
48864902
max_query_length: 721h
@@ -5380,6 +5396,7 @@ limits_config:
53805396
max_line_size: 256000
53815397
max_entries_limit_per_query: 5000
53825398
discover_service_name: []
5399+
discover_log_levels: false
53835400
max_global_streams_per_user: 0
53845401
max_chunks_per_query: 2000000
53855402
max_query_length: 721h
@@ -5557,6 +5574,7 @@ limits_config:
55575574
max_line_size: 256000
55585575
max_entries_limit_per_query: 5000
55595576
discover_service_name: []
5577+
discover_log_levels: false
55605578
max_global_streams_per_user: 0
55615579
max_chunks_per_query: 2000000
55625580
max_query_length: 721h
@@ -5727,6 +5745,7 @@ limits_config:
57275745
max_line_size: 256000
57285746
max_entries_limit_per_query: 5000
57295747
discover_service_name: []
5748+
discover_log_levels: false
57305749
max_global_streams_per_user: 0
57315750
max_chunks_per_query: 2000000
57325751
max_query_length: 721h
@@ -6118,6 +6137,7 @@ limits_config:
61186137
max_line_size: 256000
61196138
max_entries_limit_per_query: 5000
61206139
discover_service_name: []
6140+
discover_log_levels: false
61216141
max_global_streams_per_user: 0
61226142
max_chunks_per_query: 2000000
61236143
max_query_length: 721h

‎operator/internal/manifests/internal/config/loki-config.yaml

+1
Original file line numberDiff line numberDiff line change
@@ -198,6 +198,7 @@ limits_config:
198198
max_line_size: {{ .Stack.Limits.Global.IngestionLimits.MaxLineSize }}
199199
max_entries_limit_per_query: {{ .Stack.Limits.Global.QueryLimits.MaxEntriesLimitPerQuery }}
200200
discover_service_name: []
201+
discover_log_levels: {{ .DiscoverLogLevels }}
201202
max_global_streams_per_user: {{ .Stack.Limits.Global.IngestionLimits.MaxGlobalStreamsPerTenant }}
202203
max_chunks_per_query: {{ .Stack.Limits.Global.QueryLimits.MaxChunksPerQuery }}
203204
max_query_length: 721h

‎operator/internal/manifests/internal/config/options.go

+1
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,7 @@ type Options struct {
2929
MaxConcurrent MaxConcurrent
3030
WriteAheadLog WriteAheadLog
3131
EnableRemoteReporting bool
32+
DiscoverLogLevels bool
3233
Shippers []string
3334

3435
ObjectStorage storage.Options

0 commit comments

Comments
 (0)