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.

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

Loki Tanka microservices: common environment variables #6124

Merged
merged 3 commits into from
May 17, 2022
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
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
Next Next commit
fix(tanka): add customizable common env vars
Signed-off-by: Ivan Rizzante <i.rizzante@gmail.com>
  • Loading branch information
irizzant committed May 6, 2022
commit b59b3c3b6ea474460af0c85836643205bf5867d2
3 changes: 2 additions & 1 deletion production/ksonnet/loki/boltdb_shipper.libsonnet
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,8 @@
container.mixin.readinessProbe.httpGet.withPath('/ready') +
container.mixin.readinessProbe.httpGet.withPort($._config.http_listen_port) +
container.mixin.readinessProbe.withTimeoutSeconds(1) +
k.util.resourcesRequests('4', '2Gi')
k.util.resourcesRequests('4', '2Gi') +
container.withEnvMixin($._config.commonEnvs)
else {},

compactor_statefulset: if $._config.using_boltdb_shipper then
Expand Down
2 changes: 2 additions & 0 deletions production/ksonnet/loki/config.libsonnet
Original file line number Diff line number Diff line change
Expand Up @@ -141,6 +141,8 @@
'limits.per-user-override-config': '/etc/loki/overrides/overrides.yaml',
},

commonEnvs: [],

loki: {
server: {
graceful_shutdown_timeout: '5s',
Expand Down
3 changes: 2 additions & 1 deletion production/ksonnet/loki/distributor.libsonnet
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,8 @@ local k = import 'ksonnet-util/kausal.libsonnet';
container.mixin.readinessProbe.withInitialDelaySeconds(15) +
container.mixin.readinessProbe.withTimeoutSeconds(1) +
k.util.resourcesRequests('500m', '500Mi') +
k.util.resourcesLimits('1', '1Gi'),
k.util.resourcesLimits('1', '1Gi') +
container.withEnvMixin($._config.commonEnvs),

local deployment = k.apps.v1.deployment,

Expand Down
3 changes: 2 additions & 1 deletion production/ksonnet/loki/index-gateway.libsonnet
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,8 @@
container.mixin.readinessProbe.httpGet.withPath('/ready') +
container.mixin.readinessProbe.httpGet.withPort($._config.http_listen_port) +
container.mixin.readinessProbe.withTimeoutSeconds(1) +
k.util.resourcesRequests('500m', '2Gi')
k.util.resourcesRequests('500m', '2Gi') +
container.withEnvMixin($._config.commonEnvs)
else {},

index_gateway_statefulset: if $._config.use_index_gateway then
Expand Down
1 change: 1 addition & 0 deletions production/ksonnet/loki/ingester.libsonnet
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,7 @@ local k = import 'ksonnet-util/kausal.libsonnet';
container.mixin.readinessProbe.withTimeoutSeconds(1) +
k.util.resourcesRequests('1', '5Gi') +
k.util.resourcesLimits('2', '10Gi') +
container.withEnvMixin($._config.commonEnvs) +
if $._config.stateful_ingesters then
container.withVolumeMountsMixin([
volumeMount.new('ingester-data', '/data'),
Expand Down
1 change: 1 addition & 0 deletions production/ksonnet/loki/querier.libsonnet
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@ local k = import 'ksonnet-util/kausal.libsonnet';
container.mixin.readinessProbe.withInitialDelaySeconds(15) +
container.mixin.readinessProbe.withTimeoutSeconds(1) +
k.util.resourcesRequests('4', '2Gi') +
container.withEnvMixin($._config.commonEnvs) +
if $._config.stateful_queriers then
container.withVolumeMountsMixin([
volumeMount.new('querier-data', '/data'),
Expand Down
1 change: 1 addition & 0 deletions production/ksonnet/loki/query-frontend.libsonnet
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@ local k = import 'ksonnet-util/kausal.libsonnet';
container.mixin.readinessProbe.httpGet.withPort($._config.http_listen_port) +
container.mixin.readinessProbe.withInitialDelaySeconds(15) +
container.mixin.readinessProbe.withTimeoutSeconds(1) +
container.withEnvMixin($._config.commonEnvs) +
$.jaeger_mixin +
// sharded queries may need to do a nonzero amount of aggregation on the frontend.
if $._config.queryFrontend.sharded_queries_enabled then
Expand Down
3 changes: 2 additions & 1 deletion production/ksonnet/loki/query-scheduler.libsonnet
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,8 @@ local k = import 'ksonnet-util/kausal.libsonnet';
container.withArgsMixin(k.util.mapToFlags($.query_scheduler_args)) +
$.jaeger_mixin +
k.util.resourcesRequests('2', '600Mi') +
k.util.resourcesLimits(null, '1200Mi')
k.util.resourcesLimits(null, '1200Mi') +
container.withEnvMixin($._config.commonEnvs)
else {},

local deployment = k.apps.v1.deployment,
Expand Down
1 change: 1 addition & 0 deletions production/ksonnet/loki/ruler.libsonnet
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,7 @@ local k = import 'ksonnet-util/kausal.libsonnet';
k.util.resourcesRequests('1', '6Gi') +
k.util.resourcesLimits('16', '16Gi') +
$.util.readinessProbe +
container.withEnvMixin($._config.commonEnvs) +
$.jaeger_mixin +
if $._config.stateful_rulers then
container.withVolumeMountsMixin([
Expand Down
1 change: 1 addition & 0 deletions production/ksonnet/loki/table-manager.libsonnet
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,7 @@ local k = import 'ksonnet-util/kausal.libsonnet';
container.mixin.readinessProbe.httpGet.withPort($._config.http_listen_port) +
container.mixin.readinessProbe.withInitialDelaySeconds(15) +
container.mixin.readinessProbe.withTimeoutSeconds(1) +
container.withEnvMixin($._config.commonEnvs) +
k.util.resourcesRequests('100m', '100Mi') +
k.util.resourcesLimits('200m', '200Mi'),

Expand Down