From a151502ea9f72b9a8f2fe0fbcdf45855cf8b1352 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Martin=20M=C3=BCller?= Date: Mon, 18 Dec 2023 16:26:42 +0100 Subject: [PATCH] fix(open-xchange): Improve ingress and serviceMonitor --- docs/monitoring.md | 9 +++++---- .../apps/open-xchange/values-openxchange.yaml.gotmpl | 7 +++++++ 2 files changed, 12 insertions(+), 4 deletions(-) diff --git a/docs/monitoring.md b/docs/monitoring.md index a5169dba..a90b4d22 100644 --- 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: | diff --git a/helmfile/apps/open-xchange/values-openxchange.yaml.gotmpl b/helmfile/apps/open-xchange/values-openxchange.yaml.gotmpl index 9bb8b68c..576988f8 100644 --- 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: