diff --git a/charts/redis-cluster/Chart.yaml b/charts/redis-cluster/Chart.yaml index 6238ab9cb..5cbbed4fe 100644 --- a/charts/redis-cluster/Chart.yaml +++ b/charts/redis-cluster/Chart.yaml @@ -1,8 +1,8 @@ apiVersion: v2 name: redis-cluster description: Provides easy redis setup definitions for Kubernetes services, and deployment. -version: 0.16.4 -appVersion: "0.16.4" +version: 0.16.5 +appVersion: "0.16.5" home: https://github.com/ot-container-kit/redis-operator sources: - https://github.com/ot-container-kit/redis-operator diff --git a/charts/redis-cluster/README.md b/charts/redis-cluster/README.md index b5a0ce1d0..8cbdd182b 100644 --- a/charts/redis-cluster/README.md +++ b/charts/redis-cluster/README.md @@ -107,6 +107,7 @@ helm delete --namespace | redisExporter.tag | string | `"v1.44.0"` | | | serviceAccountName | string | `""` | | | serviceMonitor.enabled | bool | `false` | | +| serviceMonitor.extraLabels | object | `{}` | extraLabels are added to the servicemonitor when enabled set to true | | serviceMonitor.interval | string | `"30s"` | | | serviceMonitor.namespace | string | `"monitoring"` | | | serviceMonitor.scrapeTimeout | string | `"10s"` | | diff --git a/charts/redis-cluster/templates/follower-sm.yaml b/charts/redis-cluster/templates/follower-sm.yaml index c1f199776..17712744f 100644 --- a/charts/redis-cluster/templates/follower-sm.yaml +++ b/charts/redis-cluster/templates/follower-sm.yaml @@ -11,6 +11,9 @@ metadata: app.kubernetes.io/instance: {{ .Values.redisCluster.name | default .Release.Name }} app.kubernetes.io/version: {{ .Chart.AppVersion }} app.kubernetes.io/component: middleware + {{- with .Values.serviceMonitor.extraLabels }} + {{- toYaml . | nindent 4 }} + {{- end }} spec: selector: matchLabels: diff --git a/charts/redis-cluster/templates/leader-sm.yaml b/charts/redis-cluster/templates/leader-sm.yaml index 1fabfab1d..1310a799a 100644 --- a/charts/redis-cluster/templates/leader-sm.yaml +++ b/charts/redis-cluster/templates/leader-sm.yaml @@ -11,6 +11,9 @@ metadata: app.kubernetes.io/instance: {{ .Values.redisCluster.name | default .Release.Name }} app.kubernetes.io/version: {{ .Chart.AppVersion }} app.kubernetes.io/component: middleware + {{- with .Values.serviceMonitor.extraLabels }} + {{- toYaml . | nindent 4 }} + {{- end }} spec: selector: matchLabels: diff --git a/charts/redis-cluster/values.yaml b/charts/redis-cluster/values.yaml index 2510b0b85..a256399c0 100644 --- a/charts/redis-cluster/values.yaml +++ b/charts/redis-cluster/values.yaml @@ -97,6 +97,10 @@ serviceMonitor: interval: 30s scrapeTimeout: 10s namespace: monitoring + # -- extraLabels are added to the servicemonitor when enabled set to true + extraLabels: {} + # foo: bar + # team: devops redisExporter: enabled: false diff --git a/charts/redis-replication/Chart.yaml b/charts/redis-replication/Chart.yaml index 800a0592f..370f6d7e9 100644 --- a/charts/redis-replication/Chart.yaml +++ b/charts/redis-replication/Chart.yaml @@ -1,8 +1,8 @@ apiVersion: v2 name: redis-replication description: Provides easy redis setup definitions for Kubernetes services, and deployment. -version: 0.16.6 -appVersion: "0.16.6" +version: 0.16.7 +appVersion: "0.16.7" type: application engine: gotpl maintainers: diff --git a/charts/redis-replication/README.md b/charts/redis-replication/README.md index 14597c8b6..df023e4b3 100644 --- a/charts/redis-replication/README.md +++ b/charts/redis-replication/README.md @@ -90,6 +90,7 @@ helm delete --namespace | securityContext | object | `{}` | | | serviceAccountName | string | `""` | | | serviceMonitor.enabled | bool | `false` | | +| serviceMonitor.extraLabels | object | `{}` | extraLabels are added to the servicemonitor when enabled set to true | | serviceMonitor.interval | string | `"30s"` | | | serviceMonitor.namespace | string | `"monitoring"` | | | serviceMonitor.scrapeTimeout | string | `"10s"` | | diff --git a/charts/redis-replication/templates/servicemonitor.yaml b/charts/redis-replication/templates/servicemonitor.yaml index 1eaef343a..17466295b 100644 --- a/charts/redis-replication/templates/servicemonitor.yaml +++ b/charts/redis-replication/templates/servicemonitor.yaml @@ -11,6 +11,9 @@ metadata: app.kubernetes.io/instance: {{ .Values.redisReplication.name | default .Release.Name }} app.kubernetes.io/version: {{ .Chart.AppVersion }} app.kubernetes.io/component: middleware + {{- with .Values.serviceMonitor.extraLabels }} + {{- toYaml . | nindent 4 }} + {{- end }} spec: selector: matchLabels: diff --git a/charts/redis-replication/values.yaml b/charts/redis-replication/values.yaml index 73916bbe3..3aa3b4a01 100644 --- a/charts/redis-replication/values.yaml +++ b/charts/redis-replication/values.yaml @@ -51,6 +51,10 @@ serviceMonitor: interval: 30s scrapeTimeout: 10s namespace: monitoring + # -- extraLabels are added to the servicemonitor when enabled set to true + extraLabels: {} + # foo: bar + # team: devops redisExporter: enabled: false diff --git a/charts/redis-sentinel/Chart.yaml b/charts/redis-sentinel/Chart.yaml index 8168667fd..787ebd594 100644 --- a/charts/redis-sentinel/Chart.yaml +++ b/charts/redis-sentinel/Chart.yaml @@ -1,8 +1,8 @@ apiVersion: v2 name: redis-sentinel description: Provides easy redis setup definitions for Kubernetes services, and deployment. -version: 0.16.8 -appVersion: "0.16.8" +version: 0.16.9 +appVersion: "0.16.9" home: https://github.com/ot-container-kit/redis-operator sources: - https://github.com/ot-container-kit/redis-operator diff --git a/charts/redis-sentinel/README.md b/charts/redis-sentinel/README.md index 258da9c5a..1363d919b 100644 --- a/charts/redis-sentinel/README.md +++ b/charts/redis-sentinel/README.md @@ -111,6 +111,7 @@ helm delete --namespace | securityContext | object | `{}` | | | serviceAccountName | string | `""` | | | serviceMonitor.enabled | bool | `false` | | +| serviceMonitor.extraLabels | object | `{}` | extraLabels are added to the servicemonitor when enabled set to true | | serviceMonitor.interval | string | `"30s"` | | | serviceMonitor.namespace | string | `"monitoring"` | | | serviceMonitor.scrapeTimeout | string | `"10s"` | | diff --git a/charts/redis-sentinel/templates/servicemonitor.yaml b/charts/redis-sentinel/templates/servicemonitor.yaml index 401e223e4..28d013eae 100644 --- a/charts/redis-sentinel/templates/servicemonitor.yaml +++ b/charts/redis-sentinel/templates/servicemonitor.yaml @@ -11,6 +11,9 @@ metadata: app.kubernetes.io/instance: {{ .Values.redisSentinel.name | default .Release.Name }} app.kubernetes.io/version: {{ .Chart.AppVersion }} app.kubernetes.io/component: middleware + {{- with .Values.serviceMonitor.extraLabels }} + {{- toYaml . | nindent 4 }} + {{- end }} spec: selector: matchLabels: diff --git a/charts/redis-sentinel/values.yaml b/charts/redis-sentinel/values.yaml index 640920ede..cb4ff3011 100644 --- a/charts/redis-sentinel/values.yaml +++ b/charts/redis-sentinel/values.yaml @@ -63,6 +63,10 @@ serviceMonitor: interval: 30s scrapeTimeout: 10s namespace: monitoring + # -- extraLabels are added to the servicemonitor when enabled set to true + extraLabels: {} + # foo: bar + # team: devops redisExporter: enabled: false diff --git a/charts/redis/Chart.yaml b/charts/redis/Chart.yaml index 8af3add95..f4a1f9a3b 100644 --- a/charts/redis/Chart.yaml +++ b/charts/redis/Chart.yaml @@ -2,8 +2,8 @@ apiVersion: v2 name: redis description: Provides easy redis setup definitions for Kubernetes services, and deployment. -version: 0.16.4 -appVersion: "0.16.4" +version: 0.16.5 +appVersion: "0.16.5" home: https://github.com/ot-container-kit/redis-operator sources: - https://github.com/ot-container-kit/redis-operator diff --git a/charts/redis/README.md b/charts/redis/README.md index acae504cd..a969dfe09 100644 --- a/charts/redis/README.md +++ b/charts/redis/README.md @@ -88,6 +88,7 @@ helm delete --namespace | securityContext | object | `{}` | | | serviceAccountName | string | `""` | | | serviceMonitor.enabled | bool | `false` | | +| serviceMonitor.extraLabels | object | `{}` | extraLabels are added to the servicemonitor when enabled set to true | | serviceMonitor.interval | string | `"30s"` | | | serviceMonitor.namespace | string | `"monitoring"` | | | serviceMonitor.scrapeTimeout | string | `"10s"` | | diff --git a/charts/redis/templates/servicemonitor.yaml b/charts/redis/templates/servicemonitor.yaml index 883f16b58..2e01caeaf 100644 --- a/charts/redis/templates/servicemonitor.yaml +++ b/charts/redis/templates/servicemonitor.yaml @@ -11,6 +11,9 @@ metadata: app.kubernetes.io/instance: {{ .Values.redisStandalone.name | default .Release.Name }} app.kubernetes.io/version: {{ .Chart.AppVersion }} app.kubernetes.io/component: middleware + {{- with .Values.serviceMonitor.extraLabels }} + {{- toYaml . | nindent 4 }} + {{- end }} spec: selector: matchLabels: diff --git a/charts/redis/values.yaml b/charts/redis/values.yaml index e628c4c45..a2040d129 100644 --- a/charts/redis/values.yaml +++ b/charts/redis/values.yaml @@ -47,6 +47,10 @@ serviceMonitor: interval: 30s scrapeTimeout: 10s namespace: monitoring + # -- extraLabels are added to the servicemonitor when enabled set to true + extraLabels: {} + # foo: bar + # team: devops redisExporter: enabled: false