chore(release): 0.5.42 [skip ci]

## [0.5.42](https://gitlab.opencode.de/bmi/souveraener_arbeitsplatz/deployment/sovereign-workplace/compare/v0.5.41...v0.5.42) (2023-11-20)

### Bug Fixes

* **nextcloud:** Add exporter and serviceMonitor ([feed270](feed270fd7))
* **nextcloud:** Bump openDesk bootstrap to 3.2.3 to support serverinfo token ([ea14f95](ea14f953a4))

CHANGELOG.md

@@ -1,3 +1,11 @@
+## [0.5.42](https://gitlab.opencode.de/bmi/souveraener_arbeitsplatz/deployment/sovereign-workplace/compare/v0.5.41...v0.5.42) (2023-11-20)
+
+
+### Bug Fixes
+
+* **nextcloud:** Add exporter and serviceMonitor ([feed270](https://gitlab.opencode.de/bmi/souveraener_arbeitsplatz/deployment/sovereign-workplace/commit/feed270fd7949743e8f9974e7f147e89ab623347))
+* **nextcloud:** Bump openDesk bootstrap to 3.2.3 to support serverinfo token ([ea14f95](https://gitlab.opencode.de/bmi/souveraener_arbeitsplatz/deployment/sovereign-workplace/commit/ea14f953a4a54c01cc0d66db1bdb645ca4a661e5))
+
 ## [0.5.41](https://gitlab.opencode.de/bmi/souveraener_arbeitsplatz/deployment/sovereign-workplace/compare/v0.5.40...v0.5.41) (2023-11-16)
 
 

docs/monitoring.md

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

helmfile/apps/nextcloud/helmfile.yaml

@@ -28,7 +28,7 @@ repositories:
 releases:
   - name: "opendesk-nextcloud-bootstrap"
     chart: "opendesk-nextcloud-bootstrap-repo/opendesk-nextcloud-bootstrap"
-    version: "3.2.2"
+    version: "3.2.3"
     wait: true
     waitForJobs: true
     values:

helmfile/apps/nextcloud/values-bootstrap.gotmpl

@@ -39,6 +39,9 @@ config:
     host: {{ .Values.ldap.host | quote }}
     password: {{ .Values.secrets.univentionCorporateServer.ldapSearch.nextcloud | quote }}
 
+  serverinfo:
+    token: {{ .Values.secrets.nextcloud.metricsToken | quote }}
+
   smtp:
     host: {{ .Values.smtp.host | quote }}
     username: {{ .Values.smtp.username | quote }}

helmfile/apps/nextcloud/values-nextcloud.gotmpl

@@ -35,7 +35,20 @@ image:
     {{ .Values.global.imagePullSecrets | toYaml | nindent 4 }}
 
 metrics:
+  enabled: {{ .Values.prometheus.serviceMonitors.enabled }}
+  https: true
   token: {{ .Values.secrets.nextcloud.metricsToken | quote }}
+  image:
+    repository: "{{ .Values.global.imageRegistry }}/{{ .Values.images.nextcloudExporter.repository }}"
+    pullPolicy: "{{ .Values.global.imagePullPolicy }}"
+    tag: {{ .Values.images.nextcloudExporter.tag | quote }}
+    pullSecrets:
+      {{- toYaml .Values.global.imagePullSecrets | nindent 4 }}
+
+  serviceMonitor:
+    enabled: {{ .Values.prometheus.serviceMonitors.enabled }}
+    labels:
+      {{- toYaml .Values.prometheus.serviceMonitors.labels | nindent 6 }}
 
 {{- if .Values.cluster.persistence.readWriteMany.enabled }}
 replicaCount: {{ .Values.replicas.nextcloud }}

helmfile/apps/nextcloud/values-nextcloud.yaml

@@ -41,9 +41,6 @@ externalDatabase:
   # to the mariadb:
   type: "mysql"
 
-metrics:
-  enabled: false
-
 nextcloud:
   configs:
     mimetypealiases.json: |-

helmfile/environments/default/images.yaml

@@ -120,6 +120,10 @@ images:
     repository: "nextcloud"
     tag: "27.1.1-apache@sha256:47325758ffcd54563021e697905aaba6aac8c21bceefb245c67d40194813ce39"
     # @supplier: "Nextcloud Community"
+  nextcloudExporter:
+    repository: "xperimental/nextcloud-exporter"
+    tag: "0.6.2@sha256:4ef2555e74ad1dd1b7b7b0680ce85f2b9333f2c2301756582ff04ae97adf796f"
+    # @supplier: "openDesk DevSecOps"
   openproject:
     repository: "openproject/open_desk"
     tag: "dev@sha256:732b5d0efe9fc64fe411c9d8143ec3f4a3c731d03c0caddb5fa4c614ff426e8d"