Merge pull request grafana#422 from daixiang0/add-health

Add health check
owen-d · Apr 1, 2019 · f019e57 · f019e57
2 parents c994823 + 3732814
commit f019e57
Show file tree

Hide file tree

Showing 2 changed files with 28 additions and 0 deletions.
diff --git a/production/helm/templates/promtail/daemonset.yaml b/production/helm/templates/promtail/daemonset.yaml
@@ -57,6 +57,14 @@ spec:
               name: http-metrics
           securityContext:
             {{- toYaml .Values.promtail.securityContext | nindent 12 }}
+          {{- if .Values.promtail.livenessProbe }}
+          livenessProbe:
+            {{- toYaml .Values.promtail.livenessProbe | nindent 12 }}
+          {{- end }}
+          {{- if .Values.promtail.readinessProbe }}
+          readinessProbe:
+            {{- toYaml .Values.promtail.readinessProbe | nindent 12 }}
+          {{- end }}
           resources:
             {{- toYaml .Values.promtail.resources | nindent 12 }}
       nodeSelector:

diff --git a/production/helm/values.yaml b/production/helm/values.yaml
@@ -158,6 +158,26 @@ promtail:
       mountPath: /var/lib/docker/containers
       readOnly: true
 
+  readinessProbe:
+    failureThreshold: 5
+    httpGet:
+      path: /metrics
+      port: http-metrics
+    initialDelaySeconds: 10
+    periodSeconds: 10
+    successThreshold: 1
+    timeoutSeconds: 1
+
+  livenessProbe:
+    failureThreshold: 5
+    httpGet:
+      path: /metrics
+      port: http-metrics
+    initialDelaySeconds: 10
+    periodSeconds: 10
+    successThreshold: 1
+    timeoutSeconds: 1
+
   resources: {}
   #  limits:
   #    cpu: 200m