From f62326e461d3495dec0179f7225fa5f76f37ecd3 Mon Sep 17 00:00:00 2001 From: Abhishek Jaisingh Date: Sat, 23 Feb 2019 01:49:03 +0530 Subject: [PATCH] [stable/mongodb] make metrics exporter checks configurable (#11587) Signed-off-by: Abhishek Jaisingh --- stable/mongodb/Chart.yaml | 2 +- stable/mongodb/README.md | 4 ++++ stable/mongodb/templates/deployment-standalone.yaml | 8 ++++---- stable/mongodb/templates/statefulset-primary-rs.yaml | 8 ++++---- stable/mongodb/templates/statefulset-secondary-rs.yaml | 8 ++++---- 5 files changed, 17 insertions(+), 13 deletions(-) diff --git a/stable/mongodb/Chart.yaml b/stable/mongodb/Chart.yaml index a23040ce26..465ccbc692 100644 --- a/stable/mongodb/Chart.yaml +++ b/stable/mongodb/Chart.yaml @@ -1,5 +1,5 @@ name: mongodb -version: 5.4.0 +version: 5.5.0 appVersion: 4.0.6 description: NoSQL document-oriented database that stores JSON-like documents with dynamic schemas, simplifying the integration of data in content-driven applications. keywords: diff --git a/stable/mongodb/README.md b/stable/mongodb/README.md index 7f959ebc16..15d02f879b 100644 --- a/stable/mongodb/README.md +++ b/stable/mongodb/README.md @@ -119,6 +119,10 @@ The following table lists the configurable parameters of the MongoDB chart and t | `metrics.serviceMonitor.relabellings` | Specify Metric Relabellings to add to the scrape endpoint | `nil` | | `metrics.serviceMonitor.alerting.rules` | Define individual alerting rules as required | {} | | `metrics.serviceMonitor.alerting.additionalLabels` | Used to pass Labels that are required by the Installed Prometheus Operator | {} | +| `metrics.livenessProbe.initialDelaySeconds` | Iniitial Delay for Liveness Check of Prometheus metrics exporter | 15 | +| `metrics.livenessProbe.timeoutSeconds` | Timeout for Liveness Check of Prometheus metrics exporter | 5 | +| `metrics.readinessProbe.initialDelaySeconds` | Iniitial Delay for Readiness Check of Prometheus metrics exporter | 5 | +| `metrics.readinessProbe.timeoutSeconds` | Timeout for Readiness Check of Prometheus metrics exporter | 1 | Specify each parameter using the `--set key=value[,key=value]` argument to `helm install`. For example, diff --git a/stable/mongodb/templates/deployment-standalone.yaml b/stable/mongodb/templates/deployment-standalone.yaml index 6360b928de..2b33b9d616 100644 --- a/stable/mongodb/templates/deployment-standalone.yaml +++ b/stable/mongodb/templates/deployment-standalone.yaml @@ -176,14 +176,14 @@ spec: httpGet: path: /metrics port: metrics - initialDelaySeconds: 15 - timeoutSeconds: 5 + initialDelaySeconds: {{ default 15 .Values.metrics.livenessProbe.initialDelaySeconds }} + timeoutSeconds: {{ default 5 .Values.metrics.livenessProbe.timeoutSeconds }} readinessProbe: httpGet: path: /metrics port: metrics - initialDelaySeconds: 5 - timeoutSeconds: 1 + initialDelaySeconds: {{ default 5 .Values.metrics.readinessProbe.initialDelaySeconds }} + timeoutSeconds: {{ default 1 .Values.metrics.readinessProbe.timeoutSeconds }} resources: {{ toYaml .Values.metrics.resources | indent 10 }} {{- end }} diff --git a/stable/mongodb/templates/statefulset-primary-rs.yaml b/stable/mongodb/templates/statefulset-primary-rs.yaml index b32523699f..98883a3641 100644 --- a/stable/mongodb/templates/statefulset-primary-rs.yaml +++ b/stable/mongodb/templates/statefulset-primary-rs.yaml @@ -197,14 +197,14 @@ spec: httpGet: path: /metrics port: metrics - initialDelaySeconds: 15 - timeoutSeconds: 5 + initialDelaySeconds: {{ default 15 .Values.metrics.livenessProbe.initialDelaySeconds }} + timeoutSeconds: {{ default 5 .Values.metrics.livenessProbe.timeoutSeconds }} readinessProbe: httpGet: path: /metrics port: metrics - initialDelaySeconds: 5 - timeoutSeconds: 1 + initialDelaySeconds: {{ default 5 .Values.metrics.readinessProbe.initialDelaySeconds }} + timeoutSeconds: {{ default 1 .Values.metrics.readinessProbe.timeoutSeconds }} resources: {{ toYaml .Values.metrics.resources | indent 12 }} {{- end }} diff --git a/stable/mongodb/templates/statefulset-secondary-rs.yaml b/stable/mongodb/templates/statefulset-secondary-rs.yaml index 1ff5e6995d..bdcc8fda9d 100644 --- a/stable/mongodb/templates/statefulset-secondary-rs.yaml +++ b/stable/mongodb/templates/statefulset-secondary-rs.yaml @@ -181,14 +181,14 @@ spec: httpGet: path: /metrics port: metrics - initialDelaySeconds: 15 - timeoutSeconds: 5 + initialDelaySeconds: {{ default 15 .Values.metrics.livenessProbe.initialDelaySeconds }} + timeoutSeconds: {{ default 5 .Values.metrics.livenessProbe.timeoutSeconds }} readinessProbe: httpGet: path: /metrics port: metrics - initialDelaySeconds: 5 - timeoutSeconds: 1 + initialDelaySeconds: {{ default 5 .Values.metrics.readinessProbe.initialDelaySeconds }} + timeoutSeconds: {{ default 1 .Values.metrics.readinessProbe.timeoutSeconds }} resources: {{ toYaml .Values.metrics.resources | indent 12 }} {{- end }}