fix(open-xchange): Improve ingress and serviceMonitor

2025-12-06 15:31:38 +01:00 · 2024-02-19 17:19:07 +01:00
2 changed files with 12 additions and 4 deletions
--- a/docs/monitoring.md
+++ b/docs/monitoring.md
@@ -66,7 +66,8 @@ grafana:

 # Components

-| Component | Metrics (pod- or serviceMonitor)  | Alerts (prometheusRule) | Dashboard (Grafana) |
-|:----------|-----------------------------------|-------------------------|---------------------|
-| Collabora | :white_check_mark:                | :white_check_mark:      | :white_check_mark:  |
-| Nextcloud | :white_check_mark:                | :x:                     | :x:                 |
+| Component    | Metrics (pod- or serviceMonitor)  | Alerts (prometheusRule) | Dashboard (Grafana) |
+|:-------------|-----------------------------------|-------------------------|---------------------|
+| Collabora    | :white_check_mark:                | :white_check_mark:      | :white_check_mark:  |
+| Nextcloud    | :white_check_mark:                | :x:                     | :x:                 |
+| Open-Xchange | :white_check_mark:                | :x:                     | :x:                 |
--- a/helmfile/apps/open-xchange/values-openxchange.yaml.gotmpl
+++ b/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: