diff --git a/docs/monitoring.md b/docs/monitoring.md index 548e8d48..df02b0ac 100644 --- a/docs/monitoring.md +++ b/docs/monitoring.md @@ -65,6 +65,7 @@ grafana: ``` ## Components -| Component | Metrics (pod- or serviceMonitor) | Alerts (prometheusRule) | Dashboard (Grafana) | -|:------------|-----------------------------------|-------------------------|---------------------| -| Collabora | :white_check_mark: | :white_check_mark: | :white_check_mark: | +| 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: | diff --git a/helmfile/apps/nextcloud/helmfile.yaml b/helmfile/apps/nextcloud/helmfile.yaml index 28d28f36..e5dbf0e9 100644 --- a/helmfile/apps/nextcloud/helmfile.yaml +++ b/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: diff --git a/helmfile/apps/nextcloud/values-bootstrap.gotmpl b/helmfile/apps/nextcloud/values-bootstrap.gotmpl index 23544f48..fdd11ec4 100644 --- a/helmfile/apps/nextcloud/values-bootstrap.gotmpl +++ b/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 }} diff --git a/helmfile/apps/nextcloud/values-nextcloud.gotmpl b/helmfile/apps/nextcloud/values-nextcloud.gotmpl index 9cde7dc0..fcd456e7 100644 --- a/helmfile/apps/nextcloud/values-nextcloud.gotmpl +++ b/helmfile/apps/nextcloud/values-nextcloud.gotmpl @@ -36,11 +36,12 @@ image: 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 }}" + tag: {{ .Values.images.nextcloudExporter.tag | quote }} pullSecrets: {{- toYaml .Values.global.imagePullSecrets | nindent 4 }} diff --git a/helmfile/environments/default/images.yaml b/helmfile/environments/default/images.yaml index 91838f1b..4c66881c 100644 --- a/helmfile/environments/default/images.yaml +++ b/helmfile/environments/default/images.yaml @@ -122,8 +122,8 @@ images: # @supplier: "Nextcloud Community" nextcloudExporter: repository: "xperimental/nextcloud-exporter" - tag: "0.6.1@sha256:2a01f270ac3a887365a9de02e9d81e47364278c9bbd2a0aef13417eaf7181a5c" - # @supplier: "?" + tag: "0.6.2@sha256:4ef2555e74ad1dd1b7b7b0680ce85f2b9333f2c2301756582ff04ae97adf796f" + # @supplier: "openDesk DevSecOps" openproject: repository: "openproject/open_desk" tag: "dev@sha256:732b5d0efe9fc64fe411c9d8143ec3f4a3c731d03c0caddb5fa4c614ff426e8d"