Merge pull request #253 from weaviate/improve_servicemonitor

Add label to weaviate service for monitoring.

Author: jfrancoa

weaviate/templates/weaviateService.yaml

@@ -5,6 +5,9 @@ metadata:
   labels:
     app.kubernetes.io/name: weaviate
     app.kubernetes.io/managed-by: {{ .Release.Service }}
+{{- if and .Values.env.PROMETHEUS_MONITORING_ENABLED .Values.serviceMonitor.enabled }}
+    monitoring: enabled
+{{- end }}
   {{- with .Values.service.annotations }}
   annotations: {{ toYaml . | nindent 4 }}
   {{- end }}

weaviate/templates/weaviateServiceMonitor.yaml

@@ -14,6 +14,7 @@ spec:
     matchLabels:
       app.kubernetes.io/name: weaviate
       app.kubernetes.io/managed-by: {{ .Release.Service }}
+      monitoring: enabled
   namespaceSelector:
     matchNames:
       - {{ .Release.Namespace | quote }}

weaviate/values.yaml

@@ -162,6 +162,8 @@ grpcService:
 
 # The service monitor defines prometheus monitoring for a set of services
 # https://github.com/prometheus-operator/prometheus-operator/blob/main/Documentation/api.md#monitoring.coreos.com/v1.ServiceMonitor
+# Make sure to set the following prometheus values if deploying observability with the kube-prometheus-stack helm chart:
+# - prometheus.prometheusSpec.serviceMonitorSelectorNilUsesHelmValues: false
 serviceMonitor:
   enabled: false
   interval: 30s