Skip to content

Commit fe3bc0f

Browse files
authored
helm: remove -server.grpc.keepalive.max-connection-idle from common config (#7298)
Signed-off-by: Vladimir Varankin <vladimir.varankin@grafana.com>
1 parent a318544 commit fe3bc0f

File tree

44 files changed

+24
-48
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

44 files changed

+24
-48
lines changed

operations/compare-helm-with-jsonnet/components/config/kustomization.yaml

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -148,14 +148,6 @@ patches:
148148
- op: remove
149149
path: /config/limits/max_total_query_length
150150
151-
- target:
152-
kind: MimirConfig
153-
name: 'alertmanager|compactor|ingester|overrides-exporter|querier|query-frontend|query-scheduler|ruler|store-gateway'
154-
patch: |-
155-
# Only applied to distributors in jsonnet, remove from the rest
156-
- op: remove
157-
path: /config/server/grpc_server_max_connection_idle
158-
159151
- target:
160152
kind: MimirConfig
161153
name: 'alertmanager|compactor|distributor|ingester|overrides-exporter|querier|query-frontend|query-scheduler|ruler|store-gateway'

operations/helm/charts/mimir-distributed/CHANGELOG.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -40,6 +40,7 @@ Entries should include a reference to the Pull Request that introduced the chang
4040
* `-compactor.ring.heartbeat-timeout` set to `4m`
4141
* [CHANGE] Ruler: Set `-distributor.remote-timeout` to 10s in order to accommodate writing large rule results to the ingester. #7143
4242
* [CHANGE] Remove `-server.grpc.keepalive.max-connection-age` and `-server.grpc.keepalive.max-connection-age-grace` from default config. The configuration now applied directly to distributor, fixing parity with jsonnet. #7269
43+
* [CHANGE] Remove `-server.grpc.keepalive.max-connection-idle` from default config. The configuration now applied directly to distributor, fixing parity with jsonnet. #7298
4344
* [ENHANCEMENT] Add `jaegerReporterMaxQueueSize` Helm value for all components where configuring `JAEGER_REPORTER_MAX_QUEUE_SIZE` makes sense, and override the Jaeger client's default value of 100 for components expected to generate many trace spans. #7068 #7086 #7259
4445
* [ENHANCEMENT] Rollout-operator: upgraded to v0.10.1. #7125
4546
* [ENHANCEMENT] Query-frontend: configured `-shutdown-delay`, `-server.grpc.keepalive.max-connection-age` and termination grace period to reduce the likelihood of queries hitting terminated query-frontends. #7129

operations/helm/charts/mimir-distributed/templates/distributor/distributor-dep.yaml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -50,6 +50,7 @@ spec:
5050
# Force gRPC clients connecting to distributor to reconnect periodically in order to have them re-resolve endpoints and discover new replicas.
5151
- "-server.grpc.keepalive.max-connection-age=2m"
5252
- "-server.grpc.keepalive.max-connection-age-grace=5m"
53+
- "-server.grpc.keepalive.max-connection-idle=1m"
5354
{{- if .Values.ingester.zoneAwareReplication.migration.enabled }}
5455
{{- if not .Values.ingester.zoneAwareReplication.migration.writePath }}
5556
- "-ingester.ring.zone-awareness-enabled=false"

operations/helm/charts/mimir-distributed/values.yaml

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -374,9 +374,6 @@ mimir:
374374
runtime_config:
375375
file: /var/{{ include "mimir.name" . }}/runtime.yaml
376376
377-
server:
378-
grpc_server_max_connection_idle: 1m
379-
380377
store_gateway:
381378
sharding_ring:
382379
heartbeat_period: 1m

operations/helm/tests/enterprise-https-values-generated/mimir-distributed/templates/distributor/distributor-dep.yaml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -57,6 +57,7 @@ spec:
5757
# Force gRPC clients connecting to distributor to reconnect periodically in order to have them re-resolve endpoints and discover new replicas.
5858
- "-server.grpc.keepalive.max-connection-age=2m"
5959
- "-server.grpc.keepalive.max-connection-age-grace=5m"
60+
- "-server.grpc.keepalive.max-connection-idle=1m"
6061
volumeMounts:
6162

6263
- mountPath: /certs

operations/helm/tests/enterprise-https-values-generated/mimir-distributed/templates/mimir-config.yaml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -286,7 +286,6 @@ data:
286286
runtime_config:
287287
file: /var/mimir/runtime.yaml
288288
server:
289-
grpc_server_max_connection_idle: 1m
290289
grpc_tls_config:
291290
cert_file: /certs/tls.crt
292291
client_auth_type: VerifyClientCertIfGiven

operations/helm/tests/gateway-enterprise-values-generated/mimir-distributed/templates/distributor/distributor-dep.yaml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -57,6 +57,7 @@ spec:
5757
# Force gRPC clients connecting to distributor to reconnect periodically in order to have them re-resolve endpoints and discover new replicas.
5858
- "-server.grpc.keepalive.max-connection-age=2m"
5959
- "-server.grpc.keepalive.max-connection-age-grace=5m"
60+
- "-server.grpc.keepalive.max-connection-idle=1m"
6061
volumeMounts:
6162
- name: config
6263
mountPath: /etc/mimir

operations/helm/tests/gateway-enterprise-values-generated/mimir-distributed/templates/mimir-config.yaml

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -148,8 +148,6 @@ data:
148148
secret_access_key: supersecret
149149
runtime_config:
150150
file: /var/mimir/runtime.yaml
151-
server:
152-
grpc_server_max_connection_idle: 1m
153151
store_gateway:
154152
sharding_ring:
155153
heartbeat_period: 1m

operations/helm/tests/gateway-nginx-values-generated/mimir-distributed/templates/distributor/distributor-dep.yaml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -57,6 +57,7 @@ spec:
5757
# Force gRPC clients connecting to distributor to reconnect periodically in order to have them re-resolve endpoints and discover new replicas.
5858
- "-server.grpc.keepalive.max-connection-age=2m"
5959
- "-server.grpc.keepalive.max-connection-age-grace=5m"
60+
- "-server.grpc.keepalive.max-connection-idle=1m"
6061
volumeMounts:
6162
- name: config
6263
mountPath: /etc/mimir

operations/helm/tests/gateway-nginx-values-generated/mimir-distributed/templates/mimir-config.yaml

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -104,8 +104,6 @@ data:
104104
secret_access_key: supersecret
105105
runtime_config:
106106
file: /var/mimir/runtime.yaml
107-
server:
108-
grpc_server_max_connection_idle: 1m
109107
store_gateway:
110108
sharding_ring:
111109
heartbeat_period: 1m

0 commit comments

Comments
 (0)