From 7cb70f316f99a7d8d4cb6cf2bf24d7c0bfbab317 Mon Sep 17 00:00:00 2001
From: Leon Morten Richter <github@leonmortenrichter.de>
Date: Sun, 12 Feb 2023 16:01:05 +0100
Subject: [PATCH] improves naming of containers

---
 docker-compose-armored.yml | 79 ++++++++++++++++++++++++++++++++++++++
 docker-compose.yml         |  7 ++--
 2 files changed, 83 insertions(+), 3 deletions(-)

diff --git a/docker-compose-armored.yml b/docker-compose-armored.yml
index e69de29..6f61efd 100644
--- a/docker-compose-armored.yml
+++ b/docker-compose-armored.yml
@@ -0,0 +1,79 @@
+version: "3.9"
+
+volumes:
+    prometheus_data: {}
+    grafana_data: {}
+
+services:
+  # Prometheus
+  # https://github.com/stefanprodan/dockprom
+  prometheus:
+    image: prom/prometheus:v2.42.0
+    container_name: prometheus
+    security_opt:
+      - apparmor:docker-mikrotik-monitoring
+    volumes:
+      - ./prometheus:/etc/prometheus
+      - prometheus_data:/prometheus
+    command:
+      - '--config.file=/etc/prometheus/prometheus.yml'
+      - '--storage.tsdb.path=/prometheus'
+    restart: unless-stopped
+    networks:
+      - default
+    labels:
+      org.label-schema.group: "monitoring"
+
+  # Grafana
+  # https://github.com/stefanprodan/dockprom
+  grafana:
+    image: grafana/grafana:9.3.6
+    security_opt:
+      - apparmor:docker-mikrotik-monitoring
+    container_name: grafana
+    volumes:
+      - grafana_data:/var/lib/grafana
+      - ./grafana/provisioning/dashboards:/etc/grafana/provisioning/dashboards:ro
+      - ./grafana/provisioning/datasources:/etc/grafana/provisioning/datasources:ro
+    environment:
+      - GF_SECURITY_ADMIN_USER=${ADMIN_USER:-admin}
+      - GF_SECURITY_ADMIN_PASSWORD=${ADMIN_PASSWORD:-admin}
+      - GF_USERS_ALLOW_SIGN_UP=false
+      - GF_INSTALL_PLUGINS=flant-statusmap-panel
+      - GF_DASHBOARDS_DEFAULT_HOME_DASHBOARD_PATH=/etc/grafana/provisioning/dashboards/mikrotik/monitor.json
+    restart: unless-stopped
+    networks:
+      - default
+    labels:
+      org.label-schema.group: "monitoring"
+
+  # MKTXP
+  # https://github.com/akpw/mktxp
+  mktxp:
+    image: ghcr.io/akpw/mktxp:gha-4093170275
+    security_opt:
+      - apparmor:docker-mikrotik-monitoring
+    volumes:
+      # Since Version v0.37 mktxp runs as single user
+      # Prior it was root
+      - './mktxp/:/home/mktxp/mktxp/'
+    networks:
+      - default
+    restart: unless-stopped
+
+  nginx:
+    image: nginx:latest
+    container_name: nginx
+    security_opt:
+      - apparmor:docker-nginx
+    volumes:
+      - ./nginx/nginx.conf:/etc/nginx/conf.d/default.conf
+      - ./nginx/nginx-selfsigned.key:/etc/nginx/ssl/nginx-selfsigned.key
+      - ./nginx/nginx-selfsigned.crt:/etc/nginx/ssl/nginx-selfsigned.crt
+      - ./nginx/self-signed.conf:/etc/nginx/ssl/self-signed.conf
+    ports:
+      - 80:80  # You may adjust to some unprivileged ports
+      - 443:443
+    networks:
+      - default
+    restart: unless-stopped
diff --git a/docker-compose.yml b/docker-compose.yml
index 28972cc..8969393 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -9,7 +9,7 @@ services:
   # https://github.com/stefanprodan/dockprom
   prometheus:
     image: prom/prometheus:v2.42.0
-    container_name: prometheus
+    container_name: mikrotik-prometheus
     volumes:
       - ./prometheus:/etc/prometheus
       - prometheus_data:/prometheus
@@ -26,7 +26,7 @@ services:
   # https://github.com/stefanprodan/dockprom
   grafana:
     image: grafana/grafana:9.3.6
-    container_name: grafana
+    container_name: mikrotik-grafana
     volumes:
       - grafana_data:/var/lib/grafana
       - ./grafana/provisioning/dashboards:/etc/grafana/provisioning/dashboards:ro
@@ -47,6 +47,7 @@ services:
   # https://github.com/akpw/mktxp
   mktxp:
     image: ghcr.io/akpw/mktxp:gha-4093170275
+    container_name: mikrotik-mktxp
     volumes:
       # Since Version v0.37 mktxp runs as single user
       # Prior it was root
@@ -57,7 +58,7 @@ services:
 
   nginx:
     image: nginx:latest
-    container_name: nginx
+    container_name: mikrotik-nginx
     volumes:
       - ./nginx/nginx.conf:/etc/nginx/conf.d/default.conf
       - ./nginx/nginx-selfsigned.key:/etc/nginx/ssl/nginx-selfsigned.key