update alloy config version

.env.sample

@@ -53,10 +53,6 @@ SECRET_BASIC_AUTH_VERSION=v1
 # Not needed if you just want to read local log files — use SYSLOG_FILES instead.
 # SYSLOG=1
 # COMPOSE_FILE="$COMPOSE_FILE:compose.syslog.yml"
-#
-# Scrape Docker-Events via official docker-cli image using docker socket
-# COMPOSE_FILE="$COMPOSE_FILE:compose.docker-events.yml"
-
 
 # Monitoring Server
 #

.gitea/CODEOWNERS

@@ -1 +0,0 @@
-* @coop-cloud/monitoring-ng-maintainers

MAINTENANCE.md

@@ -1,32 +0,0 @@
-# Traefik Recipe Maintenance
-
-All contributions should be made via a pull request. This is to ensure a
-certain quality and consistency, that others can rely on.
-
-## Maintainer Responsibilities
-
-A recipe maintainer has the following responsibilities:
-
-- Respond to pull requests / issues within two weeks
-- Make image security updates within a week
-- Make image major updates every three months
-
-In order to fullfill these responsibilities a recipe maintainer:
-
-- Has to watch the repository (to get notifications)
-- Needs to make sure renovate is configured properly
-
-## Pull Requests
-
-A pull request can be merged if it is approved by at least one maintainer. For
-pull requests opened by a maintainer they need to be approved by another
-maintainer. Even though it is okay to merge a pull request with one approval, it
-is always better if all maintainers looked at the pull request and approved it.
-
-## Become a maintainer
-
-Everyone can apply to be a recipe maintainer:
-1. Watch the repository to always get updates
-2. Simply add your self to the list in the [README.md](./README.md) and open a new pull request with the change.
-3. Once the pull request gets merged you will be added to the [traefik maintainers team](https://git.coopcloud.tech/org/coop-cloud/teams/traefik-maintainers).
-4. Join the room [#cc-|-traefik-maintenance:matrix.org](#cc-|-traefik-maintenance:matrix.org) and chat to other maintainers.

README.md

@@ -7,7 +7,7 @@ It's based heavily on the [monitoring-lite](https://git.coopcloud.tech/coop-clou
 Metrics and logs are collected by [Grafana Alloy](https://grafana.com/docs/alloy/latest/) and pushed to a central Prometheus/Loki (via `remote_write`/`loki push`). Every `monitoring-ng` instance runs its own Alloy, whether or not it also runs the central stack.
 
 <!-- metadata -->
-- **Maintainer**: [@coop-cloud/monitoring-ng-maintainers](https://git.coopcloud.tech/org/coop-cloud/teams/monitoring-ng-maintainers)
+
 - **Category**: Apps
 - **Status**: 2, beta
 - **Image**: [`grafana/grafana`](https://hub.docker.com/r/grafana/grafana), 4, upstream
@@ -54,14 +54,6 @@ This is what a gathering host pushes into. It also runs its own Alloy, so it mon
 
 ## Additional features
 
-### Scrape docker events
-
-Just uncomment the following line in your .env to collect docker events using
-the official docker-cli image and the docker socket:
-```
-COMPOSE_FILE="$COMPOSE_FILE:compose.docker-events.yml"
-```
-
 ### Discovering metrics from other apps
 
 Alloy auto-discovers and scrapes other Docker Swarm services running on the same host, on the `proxy` network, that opt in via labels. No manual scrape config needed. On the app's `compose.yml`:

compose.docker-events.yml

@@ -1,20 +0,0 @@
-version: "3.8"
-services:
-  docker-events:
-    image: docker:29.8.1-cli
-    command: >
-      docker events
-      --format '{{json .}}'
-      --filter type=container
-      --filter event=start
-      --filter event=die
-      --filter event=kill
-      --filter event=oom
-      --filter event=restart
-      --filter event=stop
-      --filter event=health_status
-    volumes:
-      - /var/run/docker.sock:/var/run/docker.sock:ro
-    deploy:
-      restart_policy:
-        condition: on-failure

compose.yml

@@ -46,14 +46,14 @@ services:
       test: ["CMD", "bash", "-c", "exec 3<>/dev/tcp/localhost/12345 && printf 'GET /-/ready HTTP/1.0\r\nHost: localhost\r\n\r\n' >&3 && head -1 <&3 | grep -q 200"]
       interval: 5s
       timeout: 10s
-      retries: 10
-      start_period: 30s
+      retries: 3
+      start_period: 10s
     deploy:
       restart_policy:
         condition: on-failure
       labels:
         - "backupbot.backup=${ENABLE_BACKUPS:-true}"
-        - "coop-cloud.${STACK_NAME}.version=2.2.0+v1.18.1"
+        - "coop-cloud.${STACK_NAME}.version=2.0.0+v1.18.1"
 configs:
   config_alloy:
     template_driver: golang

release/2.1.0+v1.18.1

@@ -1 +0,0 @@
-alloy: split image label in "image_name" and "image_tag", relabel journald logs and drop NetworkDB stats

release/2.2.0+v1.18.1

@@ -1 +0,0 @@
-allow scraping of docker events via new compose.docker-events.yml