diff --git a/helmfile/apps/nextcloud/values-nextcloud.gotmpl b/helmfile/apps/nextcloud/values-nextcloud.gotmpl index cafed186..9cde7dc0 100644 --- a/helmfile/apps/nextcloud/values-nextcloud.gotmpl +++ b/helmfile/apps/nextcloud/values-nextcloud.gotmpl @@ -35,7 +35,19 @@ image: {{ .Values.global.imagePullSecrets | toYaml | nindent 4 }} metrics: + enabled: {{ .Values.prometheus.serviceMonitors.enabled }} token: {{ .Values.secrets.nextcloud.metricsToken | quote }} + image: + repository: "{{ .Values.global.imageRegistry }}/{{ .Values.images.nextcloudExporter.repository }}" + pullPolicy: "{{ .Values.global.imagePullPolicy }}" + tag: "{{ .Values.images.nextcloudExporter.tag }}" + 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 }} diff --git a/helmfile/apps/nextcloud/values-nextcloud.yaml b/helmfile/apps/nextcloud/values-nextcloud.yaml index d507aa19..a300d00e 100644 --- a/helmfile/apps/nextcloud/values-nextcloud.yaml +++ b/helmfile/apps/nextcloud/values-nextcloud.yaml @@ -41,9 +41,6 @@ externalDatabase: # to the mariadb: type: "mysql" -metrics: - enabled: false - nextcloud: configs: mimetypealiases.json: |- diff --git a/helmfile/environments/default/images.yaml b/helmfile/environments/default/images.yaml index ab1874ad..91838f1b 100644 --- a/helmfile/environments/default/images.yaml +++ b/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.1@sha256:2a01f270ac3a887365a9de02e9d81e47364278c9bbd2a0aef13417eaf7181a5c" + # @supplier: "?" openproject: repository: "openproject/open_desk" tag: "dev@sha256:732b5d0efe9fc64fe411c9d8143ec3f4a3c731d03c0caddb5fa4c614ff426e8d"