From 201f738bda409335821b122d1cd7c5e515f6abde Mon Sep 17 00:00:00 2001
From: Steven Sheehy <ssheehy@firescope.com>
Date: Thu, 11 Apr 2019 13:56:53 -0500
Subject: [PATCH] Remove liveness probes from promtail
Signed-off-by: Steven Sheehy <ssheehy@firescope.com>
---
production/helm/promtail/values.yaml | 10 +---------
production/ksonnet/promtail/promtail.libsonnet | 4 ----
tools/promtail.sh | 6 ------
3 files changed, 1 insertion(+), 19 deletions(-)
diff --git a/production/helm/promtail/values.yaml b/production/helm/promtail/values.yaml
index 54ac463f..e6cb8f62 100644
--- a/production/helm/promtail/values.yaml
+++ b/production/helm/promtail/values.yaml
@@ -13,15 +13,7 @@ image:
tag: latest
pullPolicy: Always # Always pull while in BETA
-livenessProbe:
- failureThreshold: 5
- httpGet:
- path: /ready
- port: http-metrics
- initialDelaySeconds: 10
- periodSeconds: 10
- successThreshold: 1
- timeoutSeconds: 1
+livenessProbe: {}
loki:
serviceName: "" # Defaults to "${RELEASE}-loki" if not set
diff --git a/production/ksonnet/promtail/promtail.libsonnet b/production/ksonnet/promtail/promtail.libsonnet
index 4fc68f60..6b796465 100644
--- a/production/ksonnet/promtail/promtail.libsonnet
+++ b/production/ksonnet/promtail/promtail.libsonnet
@@ -44,10 +44,6 @@ k + config + scrape_config {
container.withEnv([
container.envType.fromFieldPath('HOSTNAME', 'spec.nodeName'),
]) +
- container.mixin.livenessProbe.httpGet.withPath('/ready') +
- container.mixin.livenessProbe.httpGet.withPort(80) +
- container.mixin.livenessProbe.withInitialDelaySeconds(10) +
- container.mixin.livenessProbe.withTimeoutSeconds(1) +
container.mixin.readinessProbe.httpGet.withPath('/ready') +
container.mixin.readinessProbe.httpGet.withPort(80) +
container.mixin.readinessProbe.withInitialDelaySeconds(10) +
diff --git a/tools/promtail.sh b/tools/promtail.sh
index 83ba6a7b..635eb534 100755
--- a/tools/promtail.sh
+++ b/tools/promtail.sh
@@ -238,12 +238,6 @@ spec:
image: grafana/promtail:latest
imagePullPolicy: Always
name: promtail
- livenessProbe:
- httpGet:
- path: /ready
- port: http-metrics
- scheme: HTTP
- initialDelaySeconds: 10
readinessProbe:
httpGet:
path: /ready
--
GitLab