From add8a5fea5ee73aa9c54566684d0e87599c7cede Mon Sep 17 00:00:00 2001
From: Naseem <naseem@transit.app>
Date: Thu, 2 Apr 2020 06:46:23 -0400
Subject: [PATCH] Disable Cassandra exporter by default. (#21659)

A saner default is to disable the exporter and service monitor by default as not everyone is using Prometheus let alone Prometheus Operator. Also changing the key name from servicemonitor to serviceMonitor as it seems to be the standard way of spelling it across charts.

Signed-off-by: Naseem <naseem@transit.app>
---
 incubator/cassandra/Chart.yaml                    | 4 ++--
 incubator/cassandra/templates/servicemonitor.yaml | 6 +++---
 incubator/cassandra/values.yaml                   | 9 ++++-----
 3 files changed, 9 insertions(+), 10 deletions(-)

diff --git a/incubator/cassandra/Chart.yaml b/incubator/cassandra/Chart.yaml
index d10c3bf5cc..d03981ae82 100644
--- a/incubator/cassandra/Chart.yaml
+++ b/incubator/cassandra/Chart.yaml
@@ -1,7 +1,7 @@
 apiVersion: v1
 name: cassandra
-version: 0.14.4
-appVersion: 3.11.5
+version: 0.15.0
+appVersion: 3.11.6
 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
   high availability with no single point of failure.
diff --git a/incubator/cassandra/templates/servicemonitor.yaml b/incubator/cassandra/templates/servicemonitor.yaml
index 87cb025de5..30841b4c4a 100644
--- a/incubator/cassandra/templates/servicemonitor.yaml
+++ b/incubator/cassandra/templates/servicemonitor.yaml
@@ -1,4 +1,4 @@
-{{- if and .Values.exporter.enabled .Values.exporter.servicemonitor.enabled }}
+{{- if and .Values.exporter.enabled .Values.exporter.serviceMonitor.enabled }}
 apiVersion: monitoring.coreos.com/v1
 kind: ServiceMonitor
 metadata:
@@ -9,8 +9,8 @@ metadata:
     chart: {{ template "cassandra.chart" . }}
     release: {{ .Release.Name }}
     heritage: {{ .Release.Service }}
-    {{- if .Values.exporter.servicemonitor.additionalLabels }}
-{{ toYaml .Values.exporter.servicemonitor.additionalLabels | indent 4 }}
+    {{- if .Values.exporter.serviceMonitor.additionalLabels }}
+{{ toYaml .Values.exporter.serviceMonitor.additionalLabels | indent 4 }}
     {{- end }}
 spec:
   jobLabel: {{ template "cassandra.name" . }}
diff --git a/incubator/cassandra/values.yaml b/incubator/cassandra/values.yaml
index 9504916dcb..dd2516dd30 100644
--- a/incubator/cassandra/values.yaml
+++ b/incubator/cassandra/values.yaml
@@ -2,7 +2,7 @@
 ## ref: https://hub.docker.com/r/library/cassandra/
 image:
   repo: cassandra
-  tag: 3.11.5
+  tag: 3.11.6
   pullPolicy: IfNotPresent
   ## Specify ImagePullSecrets for Pods
   ## ref: https://kubernetes.io/docs/concepts/containers/images/#specifying-imagepullsecrets-on-a-pod
@@ -212,10 +212,9 @@ backup:
 ## Cassandra exported configuration
 ## ref: https://github.com/criteo/cassandra_exporter
 exporter:
-  # If exporter is enabled this will create a ServiceMonitor by default as well
-  enabled: true
-  servicemonitor:
-    enabled: true
+  enabled: false
+  serviceMonitor:
+    enabled: false
     additionalLabels: {}
       # prometheus: default
   image: