fix: service monitoring labels in helm release (#13238)

fixes #13236

helm/minio/Chart.yaml

@@ -1,7 +1,7 @@
 apiVersion: v1
 description: Multi-Cloud Object Storage
 name: minio
-version: 3.1.1
+version: 3.1.2
 appVersion: RELEASE.2021-09-09T21-37-07Z
 keywords:
   - minio

helm/minio/templates/service.yaml

@@ -11,6 +11,7 @@ metadata:
     chart: {{ template "minio.chart" . }}
     release: {{ .Release.Name }}
     heritage: {{ .Release.Service }}
+    monitoring: true
 {{- if .Values.service.annotations }}
   annotations:
 {{ toYaml .Values.service.annotations | indent 4 }}

helm/minio/templates/servicemonitor.yaml

@@ -28,9 +28,11 @@ spec:
       {{- if .Values.metrics.serviceMonitor.scrapeTimeout }}
       scrapeTimeout: {{ .Values.metrics.serviceMonitor.scrapeTimeout }}
       {{- end }}
+      {{- if not .Values.metrics.serviceMonitor.public }}
       bearerTokenSecret:
         name: {{ template "minio.fullname" . }}-prometheus
         key: token
+      {{- end }}
   namespaceSelector:
     matchNames:
       - {{ .Release.Namespace | quote }}
@@ -38,4 +40,5 @@ spec:
     matchLabels:
       app: {{ include "minio.name" . }}
       release: {{ .Release.Name }}
+      monitoring: true
 {{- end }}

helm/minio/templates/statefulset.yaml

@@ -127,6 +127,10 @@ spec:
                 secretKeyRef:
                   name: {{ template "minio.secretName" . }}
                   key: rootPassword
+            {{- if .Values.metrics.podMonitor.public }}
+            - name: MINIO_PROMETHEUS_AUTH_TYPE
+              value: "public"
+            {{- end}}
             {{- range $key, $val := .Values.environment }}
             - name: {{ $key }}
               value: {{ $val | quote }}

helm/minio/values.yaml

@@ -331,6 +331,7 @@ metrics:
   serviceMonitor:
     enabled: false
     additionalLabels: {}
+    public: true
     # namespace: monitoring
     # interval: 30s
     # scrapeTimeout: 10s