From 20210d7e89f51b9bdd8e473cc1191c05120be5e0 Mon Sep 17 00:00:00 2001 From: Yoan Blanc Date: Wed, 16 Oct 2024 15:42:27 +0200 Subject: [PATCH 1/2] feat(charts): probe for Postgres certificate expiration Signed-off-by: Yoan Blanc --- charts/opensearch/Chart.lock | 6 ++++++ charts/opensearch/Chart.yaml | 11 +++++++++++ charts/postgresql/templates/probe.yaml | 20 ++++++++++++++++++++ charts/postgresql/values.yaml | 9 +++++++++ 4 files changed, 46 insertions(+) create mode 100644 charts/opensearch/Chart.lock create mode 100644 charts/opensearch/Chart.yaml create mode 100644 charts/postgresql/templates/probe.yaml diff --git a/charts/opensearch/Chart.lock b/charts/opensearch/Chart.lock new file mode 100644 index 00000000..1bf67bce --- /dev/null +++ b/charts/opensearch/Chart.lock @@ -0,0 +1,6 @@ +dependencies: +- name: opensearch + repository: https://opensearch-project.github.io/helm-charts + version: 2.26.0 +digest: sha256:61c958a3786c049d2ea445ac8e2e604838e3391dfb87c652e92518de95660d61 +generated: "2024-10-16T13:18:31.468552+02:00" diff --git a/charts/opensearch/Chart.yaml b/charts/opensearch/Chart.yaml new file mode 100644 index 00000000..959fde5d --- /dev/null +++ b/charts/opensearch/Chart.yaml @@ -0,0 +1,11 @@ +apiVersion: v2 +description: A Helm chart for OpenSearch +maintainers: + - name: greut + email: yoan.blanc@chuv.ch +name: opensearch +version: 0.0.1 +dependencies: + - name: opensearch + version: 2.26.0 + repository: https://opensearch-project.github.io/helm-charts diff --git a/charts/postgresql/templates/probe.yaml b/charts/postgresql/templates/probe.yaml new file mode 100644 index 00000000..3da252e5 --- /dev/null +++ b/charts/postgresql/templates/probe.yaml @@ -0,0 +1,20 @@ +{{- if and .Values.certificate.enabled .Values.certificate.serviceMonitor.enabled }} +apiVersion: monitoring.coreos.com/v1 +kind: Probe +metadata: + name: {{ .Release.Name }}-cert-probe + labels: + {{- .Values.certificate.serviceMonitor.labels | toYaml | nindent 4 }} +spec: + jobName: tcp-insecure + interval: 60s + module: tcp_insecure + prober: + url: {{ .Values.certificate.serviceMonitor.prober.url | quote }} + scheme: http + path: /probe + targets: + staticConfig: + static: + - {{ .Release.Name }}-postgresql.{{ .Release.Namespace }}.svc:5432 +{{- end }} diff --git a/charts/postgresql/values.yaml b/charts/postgresql/values.yaml index a668e363..4d1bd7be 100644 --- a/charts/postgresql/values.yaml +++ b/charts/postgresql/values.yaml @@ -61,3 +61,12 @@ certificate: issuerRef: name: CHANGEME-issuer + + probe: + enabled: false + + labels: + environment: production + + prober: + url: prometheus-blackbox-exporter.prometheus.svc:9115 From b9c82dcc09dfc44ea939e399711fc40e94871cdb Mon Sep 17 00:00:00 2001 From: Yoan Blanc Date: Wed, 16 Oct 2024 15:43:33 +0200 Subject: [PATCH 2/2] fixup! feat(charts): probe for Postgres certificate expiration Signed-off-by: Yoan Blanc --- charts/opensearch/Chart.lock | 6 ------ charts/opensearch/Chart.yaml | 11 ----------- 2 files changed, 17 deletions(-) delete mode 100644 charts/opensearch/Chart.lock delete mode 100644 charts/opensearch/Chart.yaml diff --git a/charts/opensearch/Chart.lock b/charts/opensearch/Chart.lock deleted file mode 100644 index 1bf67bce..00000000 --- a/charts/opensearch/Chart.lock +++ /dev/null @@ -1,6 +0,0 @@ -dependencies: -- name: opensearch - repository: https://opensearch-project.github.io/helm-charts - version: 2.26.0 -digest: sha256:61c958a3786c049d2ea445ac8e2e604838e3391dfb87c652e92518de95660d61 -generated: "2024-10-16T13:18:31.468552+02:00" diff --git a/charts/opensearch/Chart.yaml b/charts/opensearch/Chart.yaml deleted file mode 100644 index 959fde5d..00000000 --- a/charts/opensearch/Chart.yaml +++ /dev/null @@ -1,11 +0,0 @@ -apiVersion: v2 -description: A Helm chart for OpenSearch -maintainers: - - name: greut - email: yoan.blanc@chuv.ch -name: opensearch -version: 0.0.1 -dependencies: - - name: opensearch - version: 2.26.0 - repository: https://opensearch-project.github.io/helm-charts