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

Jump to bottom

Enable global limits by default in production mixin #1807

Merged
merged 1 commit into from
Mar 16, 2020
Merged

Enable global limits by default in production mixin #1807

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
9 changes: 1 addition & 8 deletions production/ksonnet/loki/config.libsonnet
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -91,10 +91,6 @@
'limits.per-user-override-config': '/etc/loki/overrides/overrides.yaml',
},

// Global limits are currently opt-in only.
max_streams_global_limit_enabled: false,
ingestion_rate_global_limit_enabled: false,

loki: {
server: {
graceful_shutdown_timeout: '5s',
Expand Down Expand Up @@ -141,10 +137,8 @@
reject_old_samples: true,
reject_old_samples_max_age: '168h',
max_query_length: '12000h', // 500 days
} + if !$._config.max_streams_global_limit_enabled then {} else {
max_streams_per_user: 0,
max_streams_per_user: 0, // Disabled in favor of the global limit
max_global_streams_per_user: 10000, // 10k
} + if !$._config.ingestion_rate_global_limit_enabled then {} else {
ingestion_rate_strategy: 'global',
ingestion_rate_mb: 10,
ingestion_burst_size_mb: 20,
Expand Down Expand Up @@ -274,7 +268,6 @@
},
},

} + if !$._config.ingestion_rate_global_limit_enabled then {} else {
distributor: {
// Creates a ring between distributors, required by the ingestion rate global limit.
ring: {
Expand Down