Promtail: (and also fluent-bit) change the max batch size to 1MB (gra…

…fana#2710) * change the max batch size to 1MB for all the defaults including helm and fluent-bit, attempt to centralize this config a little where possible. * fix test
mraboosk · Oct 1, 2020 · 59acd8b · 59acd8b
1 parent cc74e68
commit 59acd8b
Show file tree

Hide file tree

Showing 5 changed files with 8 additions and 8 deletions.
diff --git a/production/helm/fluent-bit/Chart.yaml b/production/helm/fluent-bit/Chart.yaml
@@ -1,6 +1,6 @@
 apiVersion: "v1"
 name: fluent-bit
-version: 0.3.0
+version: 0.3.1
 appVersion: v1.6.0
 kubeVersion: "^1.10.0-0"
 description: "Uses fluent-bit Loki go plugin for gathering logs and sending them to Loki"

diff --git a/production/helm/fluent-bit/values.yaml b/production/helm/fluent-bit/values.yaml
@@ -10,7 +10,7 @@ config:
   port: 2020
   tenantID: '""'
   batchWait: 1
-  batchSize: 10240
+  batchSize: 1048576
   loglevel: warn
   lineFormat: json
   k8sLoggingParser: "Off"

diff --git a/production/helm/loki-stack/Chart.yaml b/production/helm/loki-stack/Chart.yaml
@@ -1,6 +1,6 @@
 apiVersion: "v1"
 name: loki-stack
-version: 0.41.0
+version: 0.41.1
 appVersion: v1.6.0
 kubeVersion: "^1.10.0-0"
 description: "Loki: like Prometheus, but for logs."

diff --git a/production/helm/promtail/Chart.yaml b/production/helm/promtail/Chart.yaml
@@ -1,6 +1,6 @@
 apiVersion: "v1"
 name: promtail
-version: 0.25.0
+version: 0.25.1
 appVersion: v1.6.0
 kubeVersion: "^1.10.0-0"
 description: "Responsible for gathering logs and sending them to Loki"

diff --git a/production/helm/promtail/values.yaml b/production/helm/promtail/values.yaml
@@ -159,18 +159,18 @@ config:
     # Maximum wait period before sending batch
     batchwait: 1s
     # Maximum batch size to accrue before sending, unit is byte
-    batchsize: 102400
+    batchsize: 1048576
 
     # Maximum time to wait for server to respond to a request
     timeout: 10s
 
     backoff_config:
       # Initial backoff time between retries
-      min_period: 100ms
+      min_period: 500ms
       # Maximum backoff time between retries
-      max_period: 5s
+      max_period: 5m
       # Maximum number of retries when sending batches, 0 means infinite retries
-      max_retries: 20
+      max_retries: 10
 
     # The labels to add to any time series or alerts when communicating with loki
     external_labels: {}