Merge pull request #234 from grafana/fix-grpc-settings

Fixed gRPC settings

Author: pracucci

CHANGELOG.md

@@ -15,7 +15,7 @@
   - Cortex / Queries: added "Lazy loaded index-headers" and "Index-header lazy load duration"
   - Cortex / Compactor: added "Tenants compaction progress", "Average blocks / tenant" and "Tenants with largest number of blocks"
   - Alerts: added "CortexMemoryMapAreasTooHigh"
-* [ENHANCEMENT] Fine-tuned gRPC keepalive pings to work nicely with Cortex default settings.
+* [ENHANCEMENT] Fine-tuned gRPC keepalive pings to work nicely with Cortex default settings. #233 #234
   - `-server.grpc.keepalive.min-time-between-pings=10s`
   - `-server.grpc.keepalive.ping-without-stream-allowed:true`
 * [BUGFIX] Fixed workingset memory panel while rolling out a StatefulSet. #229

cortex/ingester.libsonnet

@@ -41,15 +41,17 @@
       else {}
     ),
 
-  ingester_statefulset_args:: {
-    'ingester.wal-enabled': true,
-    'ingester.checkpoint-enabled': true,
-    'ingester.recover-from-wal': true,
-    'ingester.wal-dir': $._config.ingester.wal_dir,
-    'ingester.checkpoint-duration': '15m',
-    '-log.level': 'info',
-    'ingester.tokens-file-path': $._config.ingester.wal_dir + '/tokens',
-  },
+  ingester_statefulset_args::
+    $._config.grpcConfig +
+    {
+      'ingester.wal-enabled': true,
+      'ingester.checkpoint-enabled': true,
+      'ingester.recover-from-wal': true,
+      'ingester.wal-dir': $._config.ingester.wal_dir,
+      'ingester.checkpoint-duration': '15m',
+      '-log.level': 'info',
+      'ingester.tokens-file-path': $._config.ingester.wal_dir + '/tokens',
+    },
 
   ingester_ports:: $.util.defaultPorts,
 

cortex/query-frontend.libsonnet

@@ -2,7 +2,7 @@
   local container = $.core.v1.container,
 
   query_frontend_args::
-    $._config.ringConfig +
+    $._config.grpcConfig +
     {
       target: 'query-frontend',