Skip to content

Commit

Permalink
Set compactor memory limits (#11970)
Browse files Browse the repository at this point in the history
  • Loading branch information
MasslessParticle authored Feb 16, 2024
1 parent fb728a6 commit 918e736
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 0 deletions.
1 change: 1 addition & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -57,6 +57,7 @@
* [11499](https://github.com/grafana/loki/pull/11284) **jmichalek132** Config: Adds `frontend.log-query-request-headers` to enable logging of request headers in query logs.
* [11817](https://github.com/grafana/loki/pull/11817) **ashwanthgoli** Ruler: Add support for filtering results of `/prometheus/api/v1/rules` endpoint by rule_name, rule_group, file and type.
* [11897](https://github.com/grafana/loki/pull/11897) **ashwanthgoli** Metadata: Introduces a separate split interval of `split_recent_metadata_queries_by_interval` for `recent_metadata_query_window` to help with caching recent metadata query results.
* [11970](https://github.com/grafana/loki/pull/11897) **masslessparticle** Ksonnet: Introduces memory limits to the compactor configuration to avoid unbounded memory usage.

##### Fixes
* [11074](https://github.com/grafana/loki/pull/11074) **hainenber** Fix panic in lambda-promtail due to mishandling of empty DROP_LABELS env var.
Expand Down
1 change: 1 addition & 0 deletions production/ksonnet/loki/shipper.libsonnet
Original file line number Diff line number Diff line change
Expand Up @@ -62,6 +62,7 @@
container.mixin.readinessProbe.httpGet.withPort($._config.http_listen_port) +
container.mixin.readinessProbe.withTimeoutSeconds(1) +
k.util.resourcesRequests('4', '2Gi') +
k.util.resourcesLimits(null, '4Gi') +
container.withEnvMixin($._config.commonEnvs)
else {},

Expand Down

0 comments on commit 918e736

Please sign in to comment.