From 6098f235fb99101860552f772dbd931ceab832da Mon Sep 17 00:00:00 2001 From: Matthias Wirth Date: Fri, 15 Nov 2024 10:11:40 +0100 Subject: [PATCH 1/2] move the prometheus port to docker-tar1090 this is the logical place as telegraf stuff is defined there as well --- .../s6-overlay/startup.d/99-prometheus-conf | 25 ------------------- 1 file changed, 25 deletions(-) delete mode 100755 rootfs/etc/s6-overlay/startup.d/99-prometheus-conf diff --git a/rootfs/etc/s6-overlay/startup.d/99-prometheus-conf b/rootfs/etc/s6-overlay/startup.d/99-prometheus-conf deleted file mode 100755 index cc0562e..0000000 --- a/rootfs/etc/s6-overlay/startup.d/99-prometheus-conf +++ /dev/null @@ -1,25 +0,0 @@ -#!/command/with-contenv bash -#shellcheck shell=bash disable=SC1091 - -source /scripts/common - -if ! chk_enabled "$PROMETHEUS_ENABLE"; then - exit 0 -fi - -# serve port 9274 always replying with stats.prom regardless of requested path - -cat > /etc/nginx/sites-enabled/prometheus_9274 < Date: Fri, 15 Nov 2024 10:13:45 +0100 Subject: [PATCH 2/2] fix prometheus port description remove unused PROMETHEUSPORT env var from readme --- README.md | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/README.md b/README.md index de1b926..a4bb066 100644 --- a/README.md +++ b/README.md @@ -131,8 +131,8 @@ The general principle behind the port numbering, is: | `31004/tcp` | MLATHUB Beast protocol input | | `31005/tcp` | MLATHUB Beast protocol output | | `31006/tcp` | MLATHUB Beast-reduce protocol output | -| `9273/tcp` | Prometheus web interface with data from `readsb` | -| `9274/tcp` | Prometheus web interface with data from `Telegraf` | +| `9273/tcp` | Prometheus http endpoint with data from `telegraf` | +| `9274/tcp` | Prometheus http endpoint with data from `readsb` | | `80/tcp` | Tar1090 (map) web interface | Any of these ports can be made available to the host system by using the `ports:` directive in your `docker-compose.yml`. The container's web interface is rendered to port `80` in the container. This can be mapped to a port on the host using the docker-compose `ports` directive. In the example [`docker-compose.yml`](docker-compose.yml) file, the container's Tar1090 interface is mapped to `8080` on the host system, and ports `9273-9274` are exposed as-is: @@ -907,7 +907,6 @@ In order for Telegraf to serve a [Prometheus](https://prometheus.io) endpoint, t | Variable | Description | | ------------------- | ------------------------------------------------------------------------ | | `PROMETHEUS_ENABLE` | Set to `true` for a Prometheus endpoint on `http://0.0.0.0:9273/metrics` | -| `PROMETHEUSPORT` | TCP port for the Prometheus endpoint. Default value is `9273` | ### Output from Ultrafeeder to InfluxDBv2