Skip to content

Adding GOMEMLIMIT to compactor libsonnet #1758

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

Merged
joe-elliott merged 5 commits into from
Sep 23, 2022
Merged

Adding GOMEMLIMIT to compactor libsonnet #1758

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
bd09971
adding GOMEMLIMIT to compactor libsonnet
ie-pham Sep 22, 2022
cdd4263
missing import
ie-pham Sep 22, 2022
cf335c3
adding yamls
ie-pham Sep 22, 2022
4c0451b
changelog
ie-pham Sep 23, 2022
1f48288
add conditional statement
ie-pham Sep 23, 2022
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
1 change: 1 addition & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@
* [CHANGE] Remove unsued scheduler frontend code [#1734](https://github.com/grafana/tempo/pull/1734) (@mapno)
* [CHANGE] Deprecated `query-frontend.query_shards` in favor of `query_frontend.trace_by_id.query_shards`.
Old config will still work but will be removed in a future release. [#1735](https://github.com/grafana/tempo/pull/1735) (@mapno)
* [CHANGE] Add GOMEMLIMIT variable to compactor jsonnet and set the value to equal compactor memory limit. [#1758](https://github.com/grafana/tempo/pull/1758/files) (@ie-pham)
* [FEATURE] Add capability to configure the used S3 Storage Class [#1697](https://github.com/grafana/tempo/pull/1714) (@amitsetty)
* [ENHANCEMENT] cache: expose username and sentinel_username redis configuration options for ACL-based Redis Auth support [#1708](https://github.com/grafana/tempo/pull/1708) (@jsievenpiper)
* [ENHANCEMENT] metrics-generator: expose span size as a metric [#1662](https://github.com/grafana/tempo/pull/1662) (@ie-pham)
Expand Down
3 changes: 3 additions & 0 deletions operations/jsonnet-compiled/Deployment-compactor.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,9 @@ spec:
- -target=compactor
- -config.file=/conf/tempo.yaml
- -mem-ballast-size-mbs=1024
env:
- name: GOMEMLIMIT
value: 5GiB
image: grafana/tempo:latest
imagePullPolicy: IfNotPresent
name: compactor
Expand Down
6 changes: 3 additions & 3 deletions operations/jsonnet-compiled/util/jsonnetfile.lock.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
"subdir": "ksonnet-util"
}
},
"version": "c132c4afcf17491718539db4c2d94c0ea4346120",
"version": "351bfae3eee23db305597f272ef29ec16f99ee49",
"sum": "2++XoPslyz02LRgsxREWxjLgYgiCIqhAtXCyVSvYcoE="
},
{
Expand All @@ -18,8 +18,8 @@
"subdir": "memcached"
}
},
"version": "c132c4afcf17491718539db4c2d94c0ea4346120",
"sum": "8hXTN4QOMkpad75LESkdfRD4/Sl81fMqZcD0ZPx2SNc="
"version": "351bfae3eee23db305597f272ef29ec16f99ee49",
"sum": "SWywAq4U0MRPMbASU0Ez8O9ArRNeoZzb75sEuReueow="
},
{
"source": {
Expand Down
15 changes: 14 additions & 1 deletion ...sonnet-compiled/util/vendor/github.com/grafana/jsonnet-libs/memcached/memcached.libsonnet
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 3 additions & 1 deletion operations/jsonnet/microservices/compactor.libsonnet
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@
local volumeMount = k.core.v1.volumeMount,
local deployment = k.apps.v1.deployment,
local volume = k.core.v1.volume,
local envVar = k.core.v1.envVar,

local target_name = 'compactor',
local tempo_config_volume = 'tempo-conf',
Expand All @@ -28,7 +29,8 @@
]) +
$.util.withResources($._config.compactor.resources) +
$.util.readinessProbe +
(if $._config.variables_expansion then container.withArgsMixin(['--config.expand-env=true']) else {}),
(if $._config.variables_expansion then container.withArgsMixin(['--config.expand-env=true']) else {}) +
(if $._config.compactor.resources.limits.memory != null then container.withEnvMixin([envVar.new('GOMEMLIMIT', $._config.compactor.resources.limits.memory + 'B')]) else {}),

tempo_compactor_deployment:
deployment.new(target_name,
Expand Down