fix(open-xchange): Improve ingress and serviceMonitor

docs/monitoring.md

@@ -67,6 +67,7 @@ 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:                 |
+| 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:

helmfile/apps/services/values-redis.yaml.gotmpl

@@ -38,28 +38,7 @@ master:
     {{ .Values.resources.redis | toYaml | nindent 4 }}
 
 metrics:
-  enabled: {{ .Values.prometheus.serviceMonitors.enabled }}
+  enabled: false
-  image:
-    registry: {{ .Values.global.imageRegistry | default .Values.images.redisExporter.registry | quote }}
-    repository: {{ .Values.images.redisExporter.repository | quote }}
-    tag: {{ .Values.images.redisExporter.tag | quote }}
-    pullPolicy: {{ .Values.global.imagePullPolicy | quote }}
-  serviceMonitor:
-    enabled: {{ .Values.prometheus.serviceMonitors.enabled }}
-    additionalLabels:
-      {{- toYaml .Values.prometheus.serviceMonitors.labels | nindent 6 }}
-  containerSecurityContext:
-    enabled: true
-    seLinuxOptions: {}
-    runAsUser: 1001
-    runAsGroup: 0
-    runAsNonRoot: true
-    allowPrivilegeEscalation: false
-    seccompProfile:
-      type: RuntimeDefault
-    capabilities:
-      drop:
-        - ALL
 
 sentinel:
   enabled: false

helmfile/environments/default/charts.yaml

@@ -393,7 +393,7 @@ charts:
     registry: "registry.opencode.de"
     repository: "bmi/opendesk/components/external/charts/bitnami-charts"
     name: "redis"
-    version: "18.8.0"
+    version: "18.6.1"
     verify: true
     # @supplier: "openDesk"
 

helmfile/environments/default/images.yaml

@@ -532,16 +532,7 @@ images:
     # dependencyType=external
     registry: "registry-1.docker.io"
     repository: "bitnami/redis"
-    tag: "7.2.4-debian-11-r3@sha256:eff4f460bf4a0f4f8ec6c2908ba9b41ad033437b46f1f6e48d39ca98c4bbf50a"
+    tag: "7.2.3-debian-11-r2@sha256:9ac3bbf7740969d32689e360ddcfa5f672538c47f6f6cf296173c3078de0edf2"
-    # @supplier: "openDesk"
-  redisExporter:
-    # renovate:
-    # upstreamRegistry=registry-1.docker.io
-    # upstreamRepository=bitnami/redis-exporter
-    # dependencyType=external
-    registry: "registry-1.docker.io"
-    repository: "bitnami/redis-exporter"
-    tag: "1.56.0-debian-11-r2@sha256:cd218dab62af45197ec097512da08053fd3dbd20cc64e1c385de0e80a3acb392"
     # @supplier: "openDesk"
 
   synapse: