docker: rename docker-compose-monitoring.yml to -prometheus.yml

And move back kafka-ui into the common setup. kafka-ui is useful to
debug stuff and I want to be able to refer to it when troubleshooting
setup.

.env

@@ -10,8 +10,8 @@ COMPOSE_FILE=${COMPOSE_FILE}:docker/docker-compose-ipinfo.yml
 # GEOIPUPDATE_LICENSE_KEY=...
 # And you need to update the paths in config/akvorado.yaml.
 
-## Monitoring
-# COMPOSE_FILE=${COMPOSE_FILE}:docker/docker-compose-monitoring.yml
+## Prometheus
+# COMPOSE_FILE=${COMPOSE_FILE}:docker/docker-compose-prometheus.yml
 
 ## Grafana
 # COMPOSE_FILE=${COMPOSE_FILE}:docker/docker-compose-grafana.yml

console/data/docs/99-changelog.md

@@ -36,6 +36,9 @@ scratch:
 
 - 💥 *outlet*: new service
 - 💥 *inlet*: flow rate limiting feature has been removed
+- 💥 *docker*: rename `docker-compose-monitoring.yml` to
+  `docker-compose-prometheus.yml` (you need to update your `.env` if you were
+  using it)
 - 💥 *docker*: switch to Apache Kafka 4.0
 - 💥 *docker*: switch Kafka to KRaft mode
 - 🩹 *console*: fix deletion of saved filters

docker/docker-compose-prometheus.yml

@@ -61,18 +61,3 @@ services:
     volumes:
       - akvorado-jmx-agent:/opt/jmx-exporter
       - ./kafka-jmx-exporter-config.yaml:/etc/kafka/jmx-exporter.yaml
-  kafka-ui:
-    extends:
-      file: versions.yml
-      service: kafka-ui
-    restart: unless-stopped
-    depends_on:
-      - kafka
-    environment:
-      - KAFKA_CLUSTERS_0_NAME=local
-      - KAFKA_CLUSTERS_0_BOOTSTRAPSERVERS=kafka:9092
-      - SERVER_SERVLET_CONTEXT_PATH=/kafka-ui
-    labels:
-      - traefik.enable=true
-      - traefik.http.routers.kafka-ui.entrypoints=private
-      - traefik.http.routers.kafka-ui.rule=PathPrefix(`/kafka-ui`)

docker/docker-compose.yml

@@ -39,6 +39,21 @@ services:
       test: ["CMD",
              "env", "-u", "KAFKA_OPTS",
              "/opt/kafka/bin/kafka-topics.sh", "--list", "--bootstrap-server", "kafka:9092"]
+  kafka-ui:
+    extends:
+      file: versions.yml
+      service: kafka-ui
+    restart: unless-stopped
+    depends_on:
+      - kafka
+    environment:
+      - KAFKA_CLUSTERS_0_NAME=local
+      - KAFKA_CLUSTERS_0_BOOTSTRAPSERVERS=kafka:9092
+      - SERVER_SERVLET_CONTEXT_PATH=/kafka-ui
+    labels:
+      - traefik.enable=true
+      - traefik.http.routers.kafka-ui.entrypoints=private
+      - traefik.http.routers.kafka-ui.rule=PathPrefix(`/kafka-ui`)
 
   redis:
     extends: