Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[chart/redis-ha] Make exporter probes optional #228

Merged
merged 2 commits into from
Apr 7, 2024
Merged

[chart/redis-ha] Make exporter probes optional #228

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
9242c74
fix(): Add optional exporter checks
sonrai-doyle Sep 7, 2022
7fb8754
Merge branch 'master' into fix/optional-exporter-checks
DandyDeveloper Apr 7, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion charts/redis-ha/Chart.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ keywords:
- redis
- keyvalue
- database
version: 4.26.3
version: 4.26.4
appVersion: 7.2.4
description: This Helm chart provides a highly available Redis implementation with a master/slave configuration and uses Sentinel sidecars for failover management
icon: https://upload.wikimedia.org/wikipedia/en/thumb/6/6b/Redis_Logo.svg/1200px-Redis_Logo.svg.png
Expand Down
14 changes: 2 additions & 12 deletions charts/redis-ha/templates/redis-ha-statefulset.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -487,19 +487,9 @@ spec:
value: /tls-certs/{{ .Values.tls.caCertFile }}
{{- end }}
livenessProbe:
httpGet:
path: {{ .Values.exporter.scrapePath }}
port: {{ .Values.exporter.port }}
initialDelaySeconds: {{ .Values.exporter.livenessProbe.initialDelaySeconds }}
timeoutSeconds: {{ .Values.exporter.livenessProbe.timeoutSeconds }}
periodSeconds: {{ .Values.exporter.livenessProbe.periodSeconds }}
{{ toYaml .Values.exporter.livenessProbe | indent 10 }}
readinessProbe:
httpGet:
path: {{ .Values.exporter.scrapePath }}
port: {{ .Values.exporter.port }}
initialDelaySeconds: {{ .Values.exporter.readinessProbe.initialDelaySeconds }}
timeoutSeconds: {{ .Values.exporter.readinessProbe.timeoutSeconds }}
periodSeconds: {{ .Values.exporter.readinessProbe.periodSeconds }}
{{ toYaml .Values.exporter.readinessProbe | indent 10 }}
resources:
{{ toYaml .Values.exporter.resources | indent 10 }}
ports:
Expand Down
10 changes: 8 additions & 2 deletions charts/redis-ha/values.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -507,9 +507,9 @@ exporter:
pullPolicy: IfNotPresent

# prometheus port & scrape path
port: 9121
port: &exporter_port 9121
portName: exporter-port
scrapePath: /metrics
scrapePath: &exporter_scrapePath /metrics

# Address/Host for Redis instance. Default: localhost
# Exists to circumvent issues with IPv6 dns resolution that occurs on certain environments
Expand Down Expand Up @@ -569,11 +569,17 @@ exporter:
# prometheus exporter SCANS redis db which can take some time
# allow different probe settings to not let container crashloop
livenessProbe:
httpGet:
path: *exporter_scrapePath
port: *exporter_port
initialDelaySeconds: 15
timeoutSeconds: 3
periodSeconds: 15

readinessProbe:
httpGet:
path: *exporter_scrapePath
port: *exporter_port
initialDelaySeconds: 15
timeoutSeconds: 3
periodSeconds: 15
Expand Down
Loading