Merge pull request #415 from daixiang0/add-backoff

Add backoff_config in helm

production/helm/templates/promtail/configmap.yaml

@@ -10,6 +10,11 @@ metadata:
     heritage: {{ .Release.Service }}
 data:
   promtail.yaml: |
+    backoff_config:
+      minbackoff: {{ .Values.promtail.config.backoff_config.minbackoff }}
+      maxbackoff: {{ .Values.promtail.config.backoff_config.maxbackoff }}
+      maxretries: {{ .Values.promtail.config.backoff_config.maxretries }}
+
     scrape_configs:
       - entry_parser: '{{ .Values.promtail.entryParser }}'
         job_name: kubernetes-pods-name

production/helm/values.yaml

@@ -82,7 +82,7 @@ loki:
     #         values:
     #         - loki
     #     topologyKey: "kubernetes.io/hostname"
-  
+
   ## Enable persistence using Persistent Volume Claims
   ## ref: http://kubernetes.io/docs/user-guide/persistent-volumes/
   ## If you set enabled as "True", you need :
@@ -127,6 +127,15 @@ promtail:
 
   entryParser: docker
 
+  config:
+    backoff_config:
+      # Initial backoff time between retries
+      minbackoff: 100ms
+      # Maximum backoff time between retries
+      maxbackoff: 5s
+      # Maximum number of retires when sending batches, 0 means infinite retries
+      maxretries: 5
+
   image:
     repository: grafana/promtail
     tag: latest

production/ksonnet/promtail/config.libsonnet

@@ -13,6 +13,11 @@
       container_root_path: '/var/lib/docker',
       external_labels: {},
       entry_parser: 'docker',
+      backoff_config: {
+        minbackoff: 100ms,
+        maxbackoff: 5s,
+        maxretries: 5
+      }
     },
 
     service_url: