replace sidecar metrics exporter with native metrics endpoint

.env.sample

@@ -107,3 +107,6 @@ DEFAULT_QUOTA="10 GB"
 #HSTS_ENABLED=1
 # Uncomment this line to add the `preload` part
 #HSTS_PRELOAD=1
+
+# Metrics
+# COMPOSE_FILE="$COMPOSE_FILE:compose.metrics.yml"

README.md

@@ -129,6 +129,21 @@ To disable dashboard app (since it is so corporate):
 
 - Configure a `defaultapp` in your `config.php` or use [apporder](https://apps.nextcloud.com/apps/apporder)
 
+## Metrics
+
+Since Version 33, Nextcloud offers a /metrics endpoint (see [here](https://docs.nextcloud.com/server/stable/admin_manual/configuration_monitoring/index.html)).
+Its configured via alloys label-based auto-discovery provided by the updated
+[monitoring-stack](https://git.coopcloud.tech/coop-cloud/monitoring-ng). 
+
+To enable, uncomment 
+```
+COMPOSE_FILE="$COMPOSE_FILE:compose.metrics.yml"
+```
+and run `configure_metrics`:
+```
+abra app cmd <domain> app configure_metrics
+```
+
 ## Upgrading Nextcloud
 
 Upgrading Nextcloud can be a hair raising experiance. They

abra.sh

@@ -1,7 +1,7 @@
 #!/bin/bash
 
 export FPM_TUNE_VERSION=v5
-export NGINX_CONF_VERSION=v8
+export NGINX_CONF_VERSION=v9
 export MY_CNF_VERSION=v6
 export ENTRYPOINT_VERSION=v3
 export ENTRYPOINT_WHITEBOARD_VERSION=v1
@@ -195,6 +195,10 @@ upgrade_mariadb() {
     mariadb-upgrade -p`cat /run/secrets/db_root_password`
 }
 
+configure_metrics() {
+    run_occ "config:system:set openmetrics_allowed_clients 0 --value='10.0.0.0/8'"
+}
+
 # Checks whether this instance looks ready to update to the next Nextcloud
 # major version.
 #

compose.fulltextsearch.yml

@@ -29,7 +29,7 @@ services:
         mode: 0600
 
   searchindexer:
-    image: nextcloud:35.0.0-fpm
+    image: nextcloud:33.0.9-fpm
     volumes:
       - nextcloud:/var/www/html/
       - nextapps:/var/www/html/custom_apps:cached

compose.metrics.yml

@@ -0,0 +1,10 @@
+version: "3.8"
+services:
+  web:
+    environment:
+      - METRICS_ENABLED=true
+    deploy:
+      labels:
+        - "prometheus.io/scrape=true"
+        - "prometheus.io/port=9205"
+        - "prometheus.io/path=/metrics"

compose.yml

@@ -1,7 +1,7 @@
 version: "3.8"
 services:
   web:
-    image: nginx:1.31.6
+    image: nginx:1.31.5
     depends_on:
       - app
     configs:
@@ -48,7 +48,7 @@ services:
       start_period: 5m
 
   app:
-    image: nextcloud:35.0.0-fpm
+    image: nextcloud:33.0.9-fpm
     depends_on:
       - db
     configs:
@@ -109,7 +109,7 @@ services:
       start_period: 15m
 
   cron:
-    image: nextcloud:35.0.0-fpm
+    image: nextcloud:33.0.9-fpm
     volumes:
       - nextcloud:/var/www/html/
       - nextapps:/var/www/html/custom_apps:cached

nginx.conf.tmpl

@@ -185,4 +185,23 @@ http {
             try_files $uri $uri/ /index.php$request_uri;
         }
     }
+
+    {{ if env "METRICS_ENABLED" }}
+    server {
+        listen 9205;
+
+        location = /metrics {
+            include fastcgi_params;
+            fastcgi_param SCRIPT_FILENAME /var/www/html/index.php;
+            fastcgi_param SCRIPT_NAME /index.php;
+            fastcgi_param REQUEST_URI /metrics;
+            fastcgi_param HTTP_HOST {{ env "DOMAIN" }};
+            fastcgi_pass php-handler;
+        }
+
+        location / {
+            return 404;
+        }
+    }
+    {{ end }}
 }

release/next

@@ -0,0 +1 @@
+add option to scrape native /metrics endpoint via alloys auto-discovery