Skip to content

Commit f9ff593

Browse files
mjtrangonimjtrangoni
authored
fix: ServiceMonitor defaults to release.Namespace instead of monitoring namespace (#1507) (#1537)
* fix: redis-sentinel ServiceMonitor defaults to release.Namespace instead of monitoring namespace (#1507) Signed-off-by: Mario Trangoni <[email protected]> * fix: Fix ServiceMonitor logic, as the serviceMonitor is the object that could be installed somewhere else. Signed-off-by: Mario Trangoni <[email protected]> * fix: Fix redis-cluster ServiceMonitor logic, as the serviceMonitor is the object that could be installed somewhere else. Signed-off-by: Mario Trangoni <[email protected]> * fix: Fix redis-replication ServiceMonitor logic, as the serviceMonitor is the object that could be installed somewhere else. Signed-off-by: Mario Trangoni <[email protected]> * fix: Fix redis ServiceMonitor logic, as the serviceMonitor is the object that could be installed somewhere else. Signed-off-by: Mario Trangoni <[email protected]> --------- Signed-off-by: Mario Trangoni <[email protected]>
1 parent e87b8bf commit f9ff593

File tree

13 files changed

+26
-17
lines changed

13 files changed

+26
-17
lines changed

‎charts/redis-cluster/README.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -115,7 +115,7 @@ helm delete <my-release> --namespace <namespace>
115115
| serviceMonitor.enabled | bool | `false` | |
116116
| serviceMonitor.extraLabels | object | `{}` | extraLabels are added to the servicemonitor when enabled set to true |
117117
| serviceMonitor.interval | string | `"30s"` | |
118-
| serviceMonitor.namespace | string | `"monitoring"` | |
118+
| serviceMonitor.namespace | string | `""` | Namespace where servicemonitor resource will be created, if empty it will be created in the same namespace as the redis-cluster |
119119
| serviceMonitor.scrapeTimeout | string | `"10s"` | |
120120
| sidecars.env | object | `{}` | |
121121
| sidecars.image | string | `""` | |

‎charts/redis-cluster/templates/follower-sm.yaml‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@ apiVersion: monitoring.coreos.com/v1
44
kind: ServiceMonitor
55
metadata:
66
name: {{ .Values.redisCluster.name | default .Release.Name }}-follower-prometheus-monitoring
7+
namespace: {{ .Values.serviceMonitor.namespace | default .Release.Namespace }}
78
labels:
89
app.kubernetes.io/name: {{ .Values.redisCluster.name | default .Release.Name }}
910
helm.sh/chart: {{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }}
@@ -26,5 +27,5 @@ spec:
2627
scrapeTimeout: {{ .Values.serviceMonitor.scrapeTimeout }}
2728
namespaceSelector:
2829
matchNames:
29-
- {{ .Values.serviceMonitor.namespace }}
30+
- {{ .Release.Namespace }}
3031
{{- end }}

‎charts/redis-cluster/templates/leader-sm.yaml‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@ apiVersion: monitoring.coreos.com/v1
44
kind: ServiceMonitor
55
metadata:
66
name: {{ .Values.redisCluster.name | default .Release.Name }}-leader-prometheus-monitoring
7+
namespace: {{ .Values.serviceMonitor.namespace | default .Release.Namespace }}
78
labels:
89
app.kubernetes.io/name: {{ .Values.redisCluster.name | default .Release.Name }}
910
helm.sh/chart: {{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }}
@@ -26,5 +27,5 @@ spec:
2627
scrapeTimeout: {{ .Values.serviceMonitor.scrapeTimeout }}
2728
namespaceSelector:
2829
matchNames:
29-
- {{ .Values.serviceMonitor.namespace }}
30+
- {{ .Release.Namespace }}
3031
{{- end }}

‎charts/redis-cluster/values.yaml‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -127,7 +127,8 @@ serviceMonitor:
127127
enabled: false
128128
interval: 30s
129129
scrapeTimeout: 10s
130-
namespace: monitoring
130+
# -- Namespace where servicemonitor resource will be created, if empty it will be created in the same namespace as the redis-cluster
131+
namespace: ""
131132
# -- extraLabels are added to the servicemonitor when enabled set to true
132133
extraLabels: {}
133134
# foo: bar
@@ -221,4 +222,4 @@ env: []
221222
# - name: VAR_NAME
222223
# value: "value1"
223224

224-
serviceAccountName: ""
225+
serviceAccountName: ""

‎charts/redis-replication/README.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -96,7 +96,7 @@ helm delete <my-release> --namespace <namespace>
9696
| serviceMonitor.enabled | bool | `false` | |
9797
| serviceMonitor.extraLabels | object | `{}` | extraLabels are added to the servicemonitor when enabled set to true |
9898
| serviceMonitor.interval | string | `"30s"` | |
99-
| serviceMonitor.namespace | string | `"monitoring"` | |
99+
| serviceMonitor.namespace | string | `""` | Namespace where servicemonitor resource will be created, if empty it will be created in the same namespace as the redis-replication |
100100
| serviceMonitor.scrapeTimeout | string | `"10s"` | |
101101
| sidecars.env | list | `[]` | |
102102
| sidecars.image | string | `""` | |

‎charts/redis-replication/templates/servicemonitor.yaml‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@ apiVersion: monitoring.coreos.com/v1
44
kind: ServiceMonitor
55
metadata:
66
name: {{ .Values.redisReplication.name | default .Release.Name }}-prometheus-monitoring
7+
namespace: {{ .Values.serviceMonitor.namespace | default .Release.Namespace }}
78
labels:
89
app.kubernetes.io/name: {{ .Values.redisReplication.name | default .Release.Name }}
910
helm.sh/chart: {{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }}
@@ -26,5 +27,5 @@ spec:
2627
scrapeTimeout: {{ .Values.serviceMonitor.scrapeTimeout }}
2728
namespaceSelector:
2829
matchNames:
29-
- {{ .Values.serviceMonitor.namespace }}
30+
- {{ .Release.Namespace }}
3031
{{- end }}

‎charts/redis-replication/values.yaml‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,8 @@ serviceMonitor:
5151
enabled: false
5252
interval: 30s
5353
scrapeTimeout: 10s
54-
namespace: monitoring
54+
# -- Namespace where servicemonitor resource will be created, if empty it will be created in the same namespace as the redis-replication
55+
namespace: ""
5556
# -- extraLabels are added to the servicemonitor when enabled set to true
5657
extraLabels: {}
5758
# foo: bar
@@ -161,4 +162,4 @@ env: []
161162
pdb:
162163
enabled: false
163164
minAvailable: 1
164-
maxUnavailable: null
165+
maxUnavailable: null

‎charts/redis-sentinel/README.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -116,7 +116,7 @@ helm delete <my-release> --namespace <namespace>
116116
| serviceMonitor.enabled | bool | `false` | |
117117
| serviceMonitor.extraLabels | object | `{}` | extraLabels are added to the servicemonitor when enabled set to true |
118118
| serviceMonitor.interval | string | `"30s"` | |
119-
| serviceMonitor.namespace | string | `"monitoring"` | |
119+
| serviceMonitor.namespace | string | `""` | Namespace where servicemonitor resource will be created, if empty it will be created in the same namespace as the redis-sentinel |
120120
| serviceMonitor.scrapeTimeout | string | `"10s"` | |
121121
| sidecars.env | list | `[]` | |
122122
| sidecars.image | string | `""` | |

‎charts/redis-sentinel/templates/servicemonitor.yaml‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@ apiVersion: monitoring.coreos.com/v1
44
kind: ServiceMonitor
55
metadata:
66
name: {{ .Values.redisSentinel.name | default .Release.Name }}-prometheus-monitoring
7+
namespace: {{ .Values.serviceMonitor.namespace | default .Release.Namespace }}
78
labels:
89
app.kubernetes.io/name: {{ .Values.redisSentinel.name | default .Release.Name }}
910
helm.sh/chart: {{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }}
@@ -26,5 +27,5 @@ spec:
2627
scrapeTimeout: {{ .Values.serviceMonitor.scrapeTimeout }}
2728
namespaceSelector:
2829
matchNames:
29-
- {{ .Values.serviceMonitor.namespace }}
30+
- {{ .Release.Namespace }}
3031
{{- end }}

‎charts/redis-sentinel/values.yaml‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,8 @@ serviceMonitor:
6565
enabled: false
6666
interval: 30s
6767
scrapeTimeout: 10s
68-
namespace: monitoring
68+
# -- Namespace where servicemonitor resource will be created, if empty it will be created in the same namespace as the redis-sentinel
69+
namespace: ""
6970
# -- extraLabels are added to the servicemonitor when enabled set to true
7071
extraLabels: {}
7172
# foo: bar
@@ -175,4 +176,4 @@ readinessProbe:
175176

176177
env: []
177178
# - name: VAR_NAME
178-
# value: "value1"
179+
# value: "value1"

0 commit comments

Comments
 (0)