Skip to content

Commit

Permalink
Jsonnet: add $._config.memcached.memory_limit (#987)
Browse files Browse the repository at this point in the history
* Jsonnet: add $._config.memcached.memory_limit

Memcached default was already 1024
https://github.com/grafana/jsonnet-libs/blob/bc9b685050691a78ee414cd8f789857de0eabe8d/memcached/memcached.libsonnet#L24

* Update CHANGELOG.md

* Use correct property

* Update CHANGELOG.md
  • Loading branch information
yvrhdn authored Sep 28, 2021
1 parent 3e05739 commit b2518be
Show file tree
Hide file tree
Showing 3 changed files with 3 additions and 0 deletions.
1 change: 1 addition & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -50,6 +50,7 @@
* [ENHANCEMENT] Add support for vulture sending long running traces [#951](https://github.com/grafana/tempo/pull/951) (@zalegrala)
* [ENHANCEMENT] Support global denylist and per-tenant allowlist of tags for search data. [#960](https://github.com/grafana/tempo/pull/960) (@annanay25)
* [ENHANCEMENT] Add `search_query_timeout` to Querier config. [#984](https://github.com/grafana/tempo/pull/984) (@kvrhdn)
* [ENHANCEMENT] Jsonnet: add `$._config.memcached.memory_limit_mb` [#987](https://github.com/grafana/tempo/pull/987) (@kvrhdn)
* [BUGFIX] Update port spec for GCS docker-compose example [#869](https://github.com/grafana/tempo/pull/869) (@zalegrala)
* [BUGFIX] Fix "magic number" errors and other block mishandling when an ingester forcefully shuts down [#937](https://github.com/grafana/tempo/issues/937) (@mdisibio)
* [BUGFIX] Fix compactor memory leak [#806](https://github.com/grafana/tempo/pull/806) (@mdisibio)
Expand Down
1 change: 1 addition & 0 deletions operations/jsonnet/microservices/config.libsonnet
Original file line number Diff line number Diff line change
Expand Up @@ -80,6 +80,7 @@
memcached: {
replicas: 3,
connection_limit: 4096,
memory_limit_mb: 1024,
},
jaeger_ui: {
base_path: '/',
Expand Down
1 change: 1 addition & 0 deletions operations/jsonnet/microservices/memcached.libsonnet
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ memcached {
memcached+:: {
cpu_limits:: null,
connection_limit: $._config.memcached.connection_limit,
memory_limit_mb: $._config.memcached.memory_limit_mb,

deployment: {},

Expand Down

0 comments on commit b2518be

Please sign in to comment.