Skip to content
This repository has been archived by the owner on Feb 22, 2022. It is now read-only.

[incubator/cassandra] Add parameter additionalLabels to serviceMonitor template #21450

Merged
merged 1 commit into from
Mar 16, 2020
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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 incubator/cassandra/Chart.yaml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
apiVersion: v1
name: cassandra
version: 0.14.2
version: 0.14.3
appVersion: 3.11.5
description: Apache Cassandra is a free and open-source distributed database management
system designed to handle large amounts of data across many commodity servers, providing
Expand Down
3 changes: 2 additions & 1 deletion incubator/cassandra/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -158,7 +158,8 @@ The following table lists the configurable parameters of the Cassandra chart and
| `backup.destination` | Destination to store backup artifacts | `s3://bucket/cassandra` |
| `backup.google.serviceAccountSecret` | Secret containing credentials if GCS is used as destination | |
| `exporter.enabled` | Enable Cassandra exporter | `false` |
| `exporter.servicemonitor` | Enable ServiceMonitor for exporter | `true` |
| `exporter.servicemonitor` | Enable ServiceMonitor for exporter | `true` |
| `exporter.additionalLabels` | Additional labels for Service Monitor | `{}` |
| `exporter.image.repo` | Exporter image repository | `criteord/cassandra_exporter` |
| `exporter.image.tag` | Exporter image tag | `2.0.2` |
| `exporter.port` | Exporter port | `5556` |
Expand Down
3 changes: 3 additions & 0 deletions incubator/cassandra/templates/servicemonitor.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,9 @@ metadata:
chart: {{ template "cassandra.chart" . }}
release: {{ .Release.Name }}
heritage: {{ .Release.Service }}
{{- if .Values.metrics.serviceMonitor.additionalLabels }}
{{ toYaml .Values.metrics.serviceMonitor.additionalLabels | indent 4 }}
{{- end }}
spec:
jobLabel: {{ template "cassandra.name" . }}
endpoints:
Expand Down
2 changes: 2 additions & 0 deletions incubator/cassandra/values.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -215,6 +215,8 @@ exporter:
# If exporter is enabled this will create a ServiceMonitor by default as well
servicemonitor: true
enabled: false
additionalLabels: {}
# prometheus: default
image:
repo: criteord/cassandra_exporter
tag: 2.0.2
Expand Down