Skip to content

Commit

Permalink
Enable global limits by default in production mixin (#1807)
Browse files Browse the repository at this point in the history
Signed-off-by: Marco Pracucci <marco@pracucci.com>
  • Loading branch information
pracucci authored Mar 16, 2020
1 parent 97165fc commit 7c6cbc2
Showing 1 changed file with 1 addition and 8 deletions.
9 changes: 1 addition & 8 deletions production/ksonnet/loki/config.libsonnet
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

0 comments on commit 7c6cbc2

Please sign in to comment.