fix(open-xchange): Improve ingress and serviceMonitor

docs/monitoring.md

@@ -66,7 +66,8 @@ grafana:
 
 # Components
 
-| Component | Metrics (pod- or serviceMonitor)  | Alerts (prometheusRule) | Dashboard (Grafana) |
+| Component    | Metrics (pod- or serviceMonitor)  | Alerts (prometheusRule) | Dashboard (Grafana) |
-|:----------|-----------------------------------|-------------------------|---------------------|
+|:-------------|-----------------------------------|-------------------------|---------------------|
-| Collabora | :white_check_mark:                | :white_check_mark:      | :white_check_mark:  |
+| Collabora    | :white_check_mark:                | :white_check_mark:      | :white_check_mark:  |
-| Nextcloud | :white_check_mark:                | :x:                     | :x:                 |
+| Nextcloud    | :white_check_mark:                | :x:                     | :x:                 |
+| Open-Xchange | :white_check_mark:                | :x:                     | :x:                 |

helmfile/apps/open-xchange/values-openxchange.yaml.gotmpl

@@ -87,6 +87,13 @@ appsuite:
       dav:
         hosts:
           - "{{ .Values.global.hosts.openxchange }}.{{ .Values.istio.domain }}"
+  extras:
+    monitoring:
+      enabled: {{ .Values.prometheus.serviceMonitors.enabled }}
+      serviceMonitor:
+        additionalLabels:
+          {{- toYaml .Values.prometheus.serviceMonitors.labels | nindent 10 }}
+
   core-mw:
     enabled: true
     asConfig: