From c36421f459063ddfd00cd047a24ee4e8323f384c Mon Sep 17 00:00:00 2001 From: Psycho Mantys Date: Sun, 19 May 2024 02:06:46 -0300 Subject: [PATCH 01/10] Update redis-ha-servicemonitor.yaml --- charts/redis-ha/templates/redis-ha-servicemonitor.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/charts/redis-ha/templates/redis-ha-servicemonitor.yaml b/charts/redis-ha/templates/redis-ha-servicemonitor.yaml index 0854229..6b374a8 100644 --- a/charts/redis-ha/templates/redis-ha-servicemonitor.yaml +++ b/charts/redis-ha/templates/redis-ha-servicemonitor.yaml @@ -1,4 +1,4 @@ -{{- if and ( .Capabilities.APIVersions.Has "monitoring.coreos.com/v1" ) ( .Values.exporter.serviceMonitor.enabled ) ( .Values.exporter.enabled ) }} +{{- if and ( or .Values.exporter.serviceMonitor.disableAPICheck ( .Capabilities.APIVersions.Has "monitoring.coreos.com/v1" ) ) ( .Values.exporter.serviceMonitor.enabled ) ( .Values.exporter.enabled ) }} apiVersion: monitoring.coreos.com/v1 kind: ServiceMonitor metadata: From cc0814c768cc34b46a4d889adf7fc66407a9c5a7 Mon Sep 17 00:00:00 2001 From: Psycho Mantys Date: Sun, 19 May 2024 02:09:06 -0300 Subject: [PATCH 02/10] Update redis-haproxy-servicemonitor.yaml --- charts/redis-ha/templates/redis-haproxy-servicemonitor.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/charts/redis-ha/templates/redis-haproxy-servicemonitor.yaml b/charts/redis-ha/templates/redis-haproxy-servicemonitor.yaml index 52a84b9..1f89e78 100644 --- a/charts/redis-ha/templates/redis-haproxy-servicemonitor.yaml +++ b/charts/redis-ha/templates/redis-haproxy-servicemonitor.yaml @@ -1,4 +1,4 @@ -{{- if and ( .Capabilities.APIVersions.Has "monitoring.coreos.com/v1" ) ( .Values.haproxy.metrics.serviceMonitor.enabled ) ( .Values.haproxy.metrics.enabled ) }} +{{- if and ( or .Values.exporter.serviceMonitor.disableAPICheck ( .Capabilities.APIVersions.Has "monitoring.coreos.com/v1" ) ) ( .Values.haproxy.metrics.serviceMonitor.enabled ) ( .Values.haproxy.metrics.enabled ) }} apiVersion: monitoring.coreos.com/v1 kind: ServiceMonitor metadata: From 5dd1e943aac093d73a8c996c8b905e001d2ab0d3 Mon Sep 17 00:00:00 2001 From: Psycho Mantys Date: Sun, 19 May 2024 02:11:35 -0300 Subject: [PATCH 03/10] Update values.yaml --- charts/redis-ha/values.yaml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/charts/redis-ha/values.yaml b/charts/redis-ha/values.yaml index a063ba1..a008209 100644 --- a/charts/redis-ha/values.yaml +++ b/charts/redis-ha/values.yaml @@ -156,6 +156,8 @@ haproxy: # timeout: 10s # Set additional properties for the ServiceMonitor endpoints such as relabeling, scrapeTimeout, tlsConfig, and more. endpointAdditionalProperties: {} + # for to not check if api has "monitoring.coreos.com/v1" + disableAPICheck: false init: resources: {} timeout: @@ -574,6 +576,8 @@ exporter: # timeout: 10s # Set additional properties for the ServiceMonitor endpoints such as relabeling, scrapeTimeout, tlsConfig, and more. endpointAdditionalProperties: {} + # for to not check if api has "monitoring.coreos.com/v1" + disableAPICheck: false # prometheus exporter SCANS redis db which can take some time # allow different probe settings to not let container crashloop From 0df5b41a07ded47452bddfdf75ec33d30a04fb12 Mon Sep 17 00:00:00 2001 From: Psycho Mantys Date: Sun, 19 May 2024 02:12:43 -0300 Subject: [PATCH 04/10] Update redis-haproxy-servicemonitor.yaml --- charts/redis-ha/templates/redis-haproxy-servicemonitor.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/charts/redis-ha/templates/redis-haproxy-servicemonitor.yaml b/charts/redis-ha/templates/redis-haproxy-servicemonitor.yaml index 1f89e78..188eac0 100644 --- a/charts/redis-ha/templates/redis-haproxy-servicemonitor.yaml +++ b/charts/redis-ha/templates/redis-haproxy-servicemonitor.yaml @@ -1,4 +1,4 @@ -{{- if and ( or .Values.exporter.serviceMonitor.disableAPICheck ( .Capabilities.APIVersions.Has "monitoring.coreos.com/v1" ) ) ( .Values.haproxy.metrics.serviceMonitor.enabled ) ( .Values.haproxy.metrics.enabled ) }} +{{- if and ( or .Values.haproxy.metrics.serviceMonitor.disableAPICheck ( .Capabilities.APIVersions.Has "monitoring.coreos.com/v1" ) ) ( .Values.haproxy.metrics.serviceMonitor.enabled ) ( .Values.haproxy.metrics.enabled ) }} apiVersion: monitoring.coreos.com/v1 kind: ServiceMonitor metadata: From 31a7e809d969f6116b4483dc56e0d698b3a0caa7 Mon Sep 17 00:00:00 2001 From: Psycho Mantys Date: Sun, 19 May 2024 02:25:30 -0300 Subject: [PATCH 05/10] Update README.md --- charts/redis-ha/README.md | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/charts/redis-ha/README.md b/charts/redis-ha/README.md index 136bd98..8a1918b 100644 --- a/charts/redis-ha/README.md +++ b/charts/redis-ha/README.md @@ -156,6 +156,8 @@ The following table lists the configurable parameters of the Redis chart and the | `exporter.extraArgs` | Additional args for the exporter | `{}` | | `exporter.script` | A custom custom Lua script that will be mounted to exporter for collection of custom metrics. Creates a ConfigMap and sets env var `REDIS_EXPORTER_SCRIPT`. | | | `exporter.serviceMonitor.enabled` | Use servicemonitor from prometheus operator | `false` | +| `exporter.serviceMonitor.disableAPICheck` | For to not check if api has "monitoring.coreos.com/v1" | `false` | + | `exporter.serviceMonitor.namespace` | Namespace the service monitor is created in | `default` | | `exporter.serviceMonitor.interval` | Scrape interval, If not set, the Prometheus default scrape interval is used | `nil` | | `exporter.serviceMonitor.telemetryPath` | Path to redis-exporter telemetry-path | `/metrics` | @@ -197,6 +199,8 @@ The following table lists the configurable parameters of the Redis chart and the | `haproxy.metrics.portName` | HAProxy metrics scraping port name | `http-exporter-port` | | `haproxy.metrics.scrapePath` | HAProxy prometheus metrics scraping port | `/metrics` | | `haproxy.metrics.serviceMonitor.enabled` | Use servicemonitor from prometheus operator for HAProxy metrics | `false` | +| `haproxy.metrics.serviceMonitor.disableAPICheck` | For to not check if api has "monitoring.coreos.com/v1" | `false` | + | `haproxy.metrics.serviceMonitor.namespace` | Namespace the service monitor for HAProxy metrics is created in | `default` | | `haproxy.metrics.serviceMonitor.interval` | Scrape interval, If not set, the Prometheus default scrape interval is used | `nil` | | `haproxy.metrics.serviceMonitor.telemetryPath` | Path to HAProxy metrics telemetry-path | `/metrics` | From c7e03bb18754ad8bd8a57ad9e400bbb12399ce96 Mon Sep 17 00:00:00 2001 From: Psycho Mantys Date: Sun, 19 May 2024 02:31:53 -0300 Subject: [PATCH 06/10] Update README.md --- charts/redis-ha/README.md | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/charts/redis-ha/README.md b/charts/redis-ha/README.md index 8a1918b..027edc8 100644 --- a/charts/redis-ha/README.md +++ b/charts/redis-ha/README.md @@ -156,8 +156,7 @@ The following table lists the configurable parameters of the Redis chart and the | `exporter.extraArgs` | Additional args for the exporter | `{}` | | `exporter.script` | A custom custom Lua script that will be mounted to exporter for collection of custom metrics. Creates a ConfigMap and sets env var `REDIS_EXPORTER_SCRIPT`. | | | `exporter.serviceMonitor.enabled` | Use servicemonitor from prometheus operator | `false` | -| `exporter.serviceMonitor.disableAPICheck` | For to not check if api has "monitoring.coreos.com/v1" | `false` | - +| `exporter.serviceMonitor.disableAPICheck` | For to not check if api has "monitoring.coreos.com/v1" | `false` | | `exporter.serviceMonitor.namespace` | Namespace the service monitor is created in | `default` | | `exporter.serviceMonitor.interval` | Scrape interval, If not set, the Prometheus default scrape interval is used | `nil` | | `exporter.serviceMonitor.telemetryPath` | Path to redis-exporter telemetry-path | `/metrics` | From 60251db6f1f61b2598bef300c26f07c1358cf56e Mon Sep 17 00:00:00 2001 From: Psycho Mantys Date: Sun, 19 May 2024 02:32:24 -0300 Subject: [PATCH 07/10] Update README.md --- charts/redis-ha/README.md | 1 - 1 file changed, 1 deletion(-) diff --git a/charts/redis-ha/README.md b/charts/redis-ha/README.md index 027edc8..996d6e9 100644 --- a/charts/redis-ha/README.md +++ b/charts/redis-ha/README.md @@ -199,7 +199,6 @@ The following table lists the configurable parameters of the Redis chart and the | `haproxy.metrics.scrapePath` | HAProxy prometheus metrics scraping port | `/metrics` | | `haproxy.metrics.serviceMonitor.enabled` | Use servicemonitor from prometheus operator for HAProxy metrics | `false` | | `haproxy.metrics.serviceMonitor.disableAPICheck` | For to not check if api has "monitoring.coreos.com/v1" | `false` | - | `haproxy.metrics.serviceMonitor.namespace` | Namespace the service monitor for HAProxy metrics is created in | `default` | | `haproxy.metrics.serviceMonitor.interval` | Scrape interval, If not set, the Prometheus default scrape interval is used | `nil` | | `haproxy.metrics.serviceMonitor.telemetryPath` | Path to HAProxy metrics telemetry-path | `/metrics` | From d285547013dbbf24e234e04140e0be3472537229 Mon Sep 17 00:00:00 2001 From: Psycho Mantys Date: Thu, 30 May 2024 19:48:00 -0300 Subject: [PATCH 08/10] Update Chart.yaml bump version --- charts/redis-ha/Chart.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/charts/redis-ha/Chart.yaml b/charts/redis-ha/Chart.yaml index f981eb4..3194544 100644 --- a/charts/redis-ha/Chart.yaml +++ b/charts/redis-ha/Chart.yaml @@ -5,7 +5,7 @@ keywords: - redis - keyvalue - database -version: 4.27.0 +version: 4.27.1 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 From d5bfe92372c28f2c32efb51c57b8efb3763e8a59 Mon Sep 17 00:00:00 2001 From: Aaron Layfield Date: Wed, 6 Nov 2024 13:17:00 +0000 Subject: [PATCH 09/10] Bringing up to date. Signed-off-by: Aaron Layfield --- charts/redis-ha/Chart.yaml | 2 +- charts/redis-ha/README.md | 2 ++ charts/redis-ha/values.yaml | 2 +- 3 files changed, 4 insertions(+), 2 deletions(-) diff --git a/charts/redis-ha/Chart.yaml b/charts/redis-ha/Chart.yaml index 6ee9c06..254e1b7 100644 --- a/charts/redis-ha/Chart.yaml +++ b/charts/redis-ha/Chart.yaml @@ -5,7 +5,7 @@ keywords: - redis - keyvalue - database -version: 4.29.0 +version: 4.29.1 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 diff --git a/charts/redis-ha/README.md b/charts/redis-ha/README.md index 3989a78..6841930 100644 --- a/charts/redis-ha/README.md +++ b/charts/redis-ha/README.md @@ -255,6 +255,7 @@ The following table lists the configurable parameters of the Redis chart and the | `haproxy.metrics.port` | HAProxy prometheus metrics scraping port | int | `9101` | | `haproxy.metrics.portName` | HAProxy metrics scraping port name | string | `"http-exporter-port"` | | `haproxy.metrics.scrapePath` | HAProxy prometheus metrics scraping path | string | `"/metrics"` | +| `haproxy.metrics.serviceMonitor.disableAPICheck` | | bool | `false` | | `haproxy.metrics.serviceMonitor.enabled` | When set true then use a ServiceMonitor to configure scraping | bool | `false` | | `haproxy.metrics.serviceMonitor.endpointAdditionalProperties` | Set additional properties for the ServiceMonitor endpoints such as relabeling, scrapeTimeout, tlsConfig, and more. | object | `{}` | | `haproxy.metrics.serviceMonitor.interval` | Set how frequently Prometheus should scrape (default is 30s) | string | `""` | @@ -324,6 +325,7 @@ The following table lists the configurable parameters of the Redis chart and the | `exporter.resources` | cpu/memory resource limits/requests | object | `{}` | | `exporter.scrapePath` | Exporter scrape path | string | `"/metrics"` | | `exporter.script` | A custom custom Lua script that will be mounted to exporter for collection of custom metrics. Creates a ConfigMap and sets env var `REDIS_EXPORTER_SCRIPT`. | string | `""` | +| `exporter.serviceMonitor.disableAPICheck` | Disable API Check on ServiceMonitor | bool | `false` | | `exporter.serviceMonitor.enabled` | When set true then use a ServiceMonitor to configure scraping | bool | `false` | | `exporter.serviceMonitor.endpointAdditionalProperties` | Set additional properties for the ServiceMonitor endpoints such as relabeling, scrapeTimeout, tlsConfig, and more. | object | `{}` | | `exporter.serviceMonitor.interval` | Set how frequently Prometheus should scrape (default is 30s) | string | `""` | diff --git a/charts/redis-ha/values.yaml b/charts/redis-ha/values.yaml index f871a55..463a820 100644 --- a/charts/redis-ha/values.yaml +++ b/charts/redis-ha/values.yaml @@ -764,7 +764,7 @@ exporter: timeout: "" # -- Set additional properties for the ServiceMonitor endpoints such as relabeling, scrapeTimeout, tlsConfig, and more. endpointAdditionalProperties: {} - # for to not check if api has "monitoring.coreos.com/v1" + # -- Disable API Check on ServiceMonitor disableAPICheck: false # prometheus exporter SCANS redis db which can take some time From 5d2bb009aade879f42efe472edd49f01b35db57b Mon Sep 17 00:00:00 2001 From: Aaron Layfield Date: Wed, 6 Nov 2024 14:02:48 +0000 Subject: [PATCH 10/10] Missed docs on value. Signed-off-by: Aaron Layfield --- charts/redis-ha/README.md | 2 +- charts/redis-ha/values.yaml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/charts/redis-ha/README.md b/charts/redis-ha/README.md index 6841930..a7b5b62 100644 --- a/charts/redis-ha/README.md +++ b/charts/redis-ha/README.md @@ -255,7 +255,7 @@ The following table lists the configurable parameters of the Redis chart and the | `haproxy.metrics.port` | HAProxy prometheus metrics scraping port | int | `9101` | | `haproxy.metrics.portName` | HAProxy metrics scraping port name | string | `"http-exporter-port"` | | `haproxy.metrics.scrapePath` | HAProxy prometheus metrics scraping path | string | `"/metrics"` | -| `haproxy.metrics.serviceMonitor.disableAPICheck` | | bool | `false` | +| `haproxy.metrics.serviceMonitor.disableAPICheck` | Disable API Check on ServiceMonitor | bool | `false` | | `haproxy.metrics.serviceMonitor.enabled` | When set true then use a ServiceMonitor to configure scraping | bool | `false` | | `haproxy.metrics.serviceMonitor.endpointAdditionalProperties` | Set additional properties for the ServiceMonitor endpoints such as relabeling, scrapeTimeout, tlsConfig, and more. | object | `{}` | | `haproxy.metrics.serviceMonitor.interval` | Set how frequently Prometheus should scrape (default is 30s) | string | `""` | diff --git a/charts/redis-ha/values.yaml b/charts/redis-ha/values.yaml index 463a820..2621632 100644 --- a/charts/redis-ha/values.yaml +++ b/charts/redis-ha/values.yaml @@ -210,7 +210,7 @@ haproxy: timeout: "" # -- Set additional properties for the ServiceMonitor endpoints such as relabeling, scrapeTimeout, tlsConfig, and more. endpointAdditionalProperties: {} - # for to not check if api has "monitoring.coreos.com/v1" + # -- Disable API Check on ServiceMonitor disableAPICheck: false init: # -- Extra init resources