Fix Query Frontend grpc settings to avoid noisy error log

Signed-off-by: Annanay <annanayagarwal@gmail.com>
grafana · May 6, 2021 · 6c74647 · 6c74647
1 parent dbe2f5a
commit 6c74647
Show file tree

Hide file tree

Showing 13 changed files with 29 additions and 4 deletions.
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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="
     },
     {