diff --git a/production/helm/promtail/values.yaml b/production/helm/promtail/values.yaml index 54ac463f916c98d70ed2dad1fe922caa40671ef0..e6cb8f620ff5c93974e71319bdcc7c384a3f88a5 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 4fc68f60be093cda56b0be1f8b20a9d056d3e21a..6b7964658b9f7a16062b4248645e336de1ebf4ed 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 83ba6a7bbedd8c80d23a3978c32c2242019bb161..635eb534e7b27f30170fb42f5f873429fc1a0c44 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