diff --git a/CHANGELOG.md b/CHANGELOG.md index 56db3044c58..a4301248b9d 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -5,6 +5,7 @@ * [ENHANCEMENT] Add config option to disable write extension to the ingesters. [#677](https://github.com/grafana/tempo/pull/677) * [ENHANCEMENT] Preallocate byte slices on ingester request unmarshal. [#679](https://github.com/grafana/tempo/pull/679) * [ENHANCEMENT] Zipkin Support - CombineTraces. [#688](https://github.com/grafana/tempo/pull/688) +* [CHANGE] Fix Query Frontend grpc settings to avoid noisy error log. [#690](https://github.com/grafana/tempo/pull/690) ## v0.7.0 diff --git a/example/docker-compose/etc/tempo-azure.yaml b/example/docker-compose/etc/tempo-azure.yaml index c936203b0e1..e690d6b2178 100644 --- a/example/docker-compose/etc/tempo-azure.yaml +++ b/example/docker-compose/etc/tempo-azure.yaml @@ -1,5 +1,7 @@ server: http_listen_port: 3100 + grpc_server_min_time_between_pings: 10s + grpc_server_ping_without_stream_allowed: true distributor: receivers: # this configuration will listen on all ports and protocols that tempo is capable of. diff --git a/example/docker-compose/etc/tempo-gcs-fake.yaml b/example/docker-compose/etc/tempo-gcs-fake.yaml index c58eb9340c0..ff377e36c5f 100644 --- a/example/docker-compose/etc/tempo-gcs-fake.yaml +++ b/example/docker-compose/etc/tempo-gcs-fake.yaml @@ -1,5 +1,7 @@ server: http_listen_port: 3100 + grpc_server_min_time_between_pings: 10s + grpc_server_ping_without_stream_allowed: true distributor: receivers: # this configuration will listen on all ports and protocols that tempo is capable of. diff --git a/example/docker-compose/etc/tempo-local.yaml b/example/docker-compose/etc/tempo-local.yaml index da35442412e..a0c6ddb75c1 100644 --- a/example/docker-compose/etc/tempo-local.yaml +++ b/example/docker-compose/etc/tempo-local.yaml @@ -1,5 +1,7 @@ server: http_listen_port: 3100 + grpc_server_min_time_between_pings: 10s + grpc_server_ping_without_stream_allowed: true distributor: receivers: # this configuration will listen on all ports and protocols that tempo is capable of. diff --git a/example/docker-compose/etc/tempo-s3-minio.yaml b/example/docker-compose/etc/tempo-s3-minio.yaml index ee2b8563a27..ecfa3c31cb1 100644 --- a/example/docker-compose/etc/tempo-s3-minio.yaml +++ b/example/docker-compose/etc/tempo-s3-minio.yaml @@ -1,5 +1,7 @@ server: http_listen_port: 3100 + grpc_server_min_time_between_pings: 10s + grpc_server_ping_without_stream_allowed: true distributor: receivers: # this configuration will listen on all ports and protocols that tempo is capable of. diff --git a/integration/microservices/tempo.yaml b/integration/microservices/tempo.yaml index e7395e71c3c..5915e59c20e 100644 --- a/integration/microservices/tempo.yaml +++ b/integration/microservices/tempo.yaml @@ -26,6 +26,8 @@ overrides: server: http_listen_port: 3100 + grpc_server_min_time_between_pings: 10s + grpc_server_ping_without_stream_allowed: true storage: trace: diff --git a/operations/jsonnet/microservices/configmap.libsonnet b/operations/jsonnet/microservices/configmap.libsonnet index 1e4498fe4a2..3bfc8fb0634 100644 --- a/operations/jsonnet/microservices/configmap.libsonnet +++ b/operations/jsonnet/microservices/configmap.libsonnet @@ -115,7 +115,12 @@ }), }), - tempo_query_frontend_config:: $.tempo_config{}, + tempo_query_frontend_config:: $.tempo_config { + server+: { + grpc_server_min_time_between_pings: '10s', + grpc_server_ping_without_stream_allowed: 'true', + }, + }, tempo_querier_configmap: configMap.new('tempo-querier') + diff --git a/operations/jsonnet/single-binary/configmap.libsonnet b/operations/jsonnet/single-binary/configmap.libsonnet index 4da9f253506..467e71f4efe 100644 --- a/operations/jsonnet/single-binary/configmap.libsonnet +++ b/operations/jsonnet/single-binary/configmap.libsonnet @@ -4,6 +4,8 @@ tempo_config:: { server: { http_listen_port: $._config.port + grpc_server_min_time_between_pings: '10s', + grpc_server_ping_without_stream_allowed: 'true', }, distributor: { receivers: $._config.receivers diff --git a/operations/kube-manifests/ConfigMap-tempo-query-frontend.yaml b/operations/kube-manifests/ConfigMap-tempo-query-frontend.yaml index 50bd9805be2..b91e5a2b935 100644 --- a/operations/kube-manifests/ConfigMap-tempo-query-frontend.yaml +++ b/operations/kube-manifests/ConfigMap-tempo-query-frontend.yaml @@ -24,6 +24,8 @@ data: overrides: per_tenant_override_config: /conf/overrides.yaml server: + grpc_server_min_time_between_pings: 10s + grpc_server_ping_without_stream_allowed: "true" http_listen_port: 3100 storage: trace: diff --git a/operations/kube-manifests/Deployment-query-frontend.yaml b/operations/kube-manifests/Deployment-query-frontend.yaml index c5f8073d231..e66807aacd6 100644 --- a/operations/kube-manifests/Deployment-query-frontend.yaml +++ b/operations/kube-manifests/Deployment-query-frontend.yaml @@ -18,7 +18,7 @@ spec: template: metadata: annotations: - config_hash: 76b3caf721a80349e206778e56d41a66 + config_hash: b5f4677de37dc365cc5bc31681d49ce5 labels: app: query-frontend name: query-frontend diff --git a/operations/kube-manifests/Namespace-tracing.yaml b/operations/kube-manifests/Namespace-tracing.yaml new file mode 100644 index 00000000000..3b3258321e3 --- /dev/null +++ b/operations/kube-manifests/Namespace-tracing.yaml @@ -0,0 +1,4 @@ +apiVersion: v1 +kind: Namespace +metadata: + name: tracing diff --git a/operations/kube-manifests/StatefulSet-memcached.yaml b/operations/kube-manifests/StatefulSet-memcached.yaml index e065e3ad9e2..ada0a7d6d08 100644 --- a/operations/kube-manifests/StatefulSet-memcached.yaml +++ b/operations/kube-manifests/StatefulSet-memcached.yaml @@ -50,3 +50,4 @@ spec: name: http-metrics updateStrategy: type: RollingUpdate + volumeClaimTemplates: [] diff --git a/operations/kube-manifests/util/jsonnetfile.lock.json b/operations/kube-manifests/util/jsonnetfile.lock.json index bc2dfe8e142..524f0e66037 100644 --- a/operations/kube-manifests/util/jsonnetfile.lock.json +++ b/operations/kube-manifests/util/jsonnetfile.lock.json @@ -8,7 +8,7 @@ "subdir": "ksonnet-util" } }, - "version": "2619bb87ecb336a59616df4c1fe8ced668bdbc94", + "version": "e5b5d8191dbbbaa5b4d68a946417177a44c74b16", "sum": "jelt5QWEerVPLHHZN6Ga0B4OQ/MLBl+OLj3kVzTET+Y=" }, { @@ -18,7 +18,7 @@ "subdir": "memcached" } }, - "version": "2619bb87ecb336a59616df4c1fe8ced668bdbc94", + "version": "e5b5d8191dbbbaa5b4d68a946417177a44c74b16", "sum": "dTOeEux3t9bYSqP2L/uCuLo/wUDpCKH4w+4OD9fePUk=" }, {