Merge pull request #420 from jmlrt/override-probe

[filebeat|metricbeat] Override probes commands
elastic · Dec 27, 2019 · 1ae7c76 · 1ae7c76
2 parents 3490379 + 4d6cad6
commit 1ae7c76
Show file tree

Hide file tree

Showing 5 changed files with 29 additions and 42 deletions.
diff --git a/filebeat/templates/daemonset.yaml b/filebeat/templates/daemonset.yaml
@@ -94,22 +94,8 @@ spec:
         - "-E"
         - "http.enabled=true"
         livenessProbe:
-          exec:
-            command:
-            - sh
-            - -c
-            - |
-              #!/usr/bin/env bash -e
-              curl --fail 127.0.0.1:5066
 {{ toYaml .Values.livenessProbe | indent 10 }}
         readinessProbe:
-          exec:
-            command:
-            - sh
-            - -c
-            - |
-              #!/usr/bin/env bash -e
-              filebeat test output
 {{ toYaml .Values.readinessProbe | indent 10 }}
         resources:
 {{ toYaml .Values.resources | indent 10 }}

diff --git a/filebeat/values.yaml b/filebeat/values.yaml
@@ -43,12 +43,26 @@ imagePullPolicy: "IfNotPresent"
 imagePullSecrets: []
 
 livenessProbe:
+  exec:
+    command:
+      - sh
+      - -c
+      - |
+        #!/usr/bin/env bash -e
+        curl --fail 127.0.0.1:5066
   failureThreshold: 3
   initialDelaySeconds: 10
   periodSeconds: 10
   timeoutSeconds: 5
 
 readinessProbe:
+  exec:
+    command:
+      - sh
+      - -c
+      - |
+        #!/usr/bin/env bash -e
+        filebeat test output
   failureThreshold: 3
   initialDelaySeconds: 10
   periodSeconds: 10

diff --git a/metricbeat/templates/daemonset.yaml b/metricbeat/templates/daemonset.yaml
@@ -93,22 +93,8 @@ spec:
         - "-E"
         - "http.enabled=true"
         livenessProbe:
-          exec:
-            command:
-            - sh
-            - -c
-            - |
-              #!/usr/bin/env bash -e
-              curl --fail 127.0.0.1:5066
 {{ toYaml .Values.livenessProbe | indent 10 }}
         readinessProbe:
-          exec:
-            command:
-            - sh
-            - -c
-            - |
-              #!/usr/bin/env bash -e
-              metricbeat test output
 {{ toYaml .Values.readinessProbe | indent 10 }}
         resources:
 {{ toYaml .Values.resources | indent 10 }}

diff --git a/metricbeat/templates/deployment.yaml b/metricbeat/templates/deployment.yaml
@@ -68,21 +68,8 @@ spec:
           - "-E"
           - "http.enabled=true"
         livenessProbe:
-          exec:
-            command:
-            - sh
-            - -c
-            - |
-              #!/usr/bin/env bash -e
-              curl --fail 127.0.0.1:5066
+{{ toYaml .Values.livenessProbe | indent 10 }}
         readinessProbe:
-          exec:
-            command:
-            - sh
-            - -c
-            - |
-              #!/usr/bin/env bash -e
-              metricbeat test output
 {{ toYaml .Values.readinessProbe | indent 10 }}
         resources:
 {{ toYaml .Values.resources | indent 10 }}

diff --git a/metricbeat/values.yaml b/metricbeat/values.yaml
@@ -95,12 +95,26 @@ imagePullPolicy: "IfNotPresent"
 imagePullSecrets: []
 
 livenessProbe:
+  exec:
+    command:
+      - sh
+      - -c
+      - |
+        #!/usr/bin/env bash -e
+        curl --fail 127.0.0.1:5066
   failureThreshold: 3
   initialDelaySeconds: 10
   periodSeconds: 10
   timeoutSeconds: 5
 
 readinessProbe:
+  exec:
+    command:
+      - sh
+      - -c
+      - |
+        #!/usr/bin/env bash -e
+        metricbeat test output
   failureThreshold: 3
   initialDelaySeconds: 10
   periodSeconds: 10