👌 IMPROVE: Update Hetzner DNS mapping and targets with new instances and IP addresses

config/hetzner_dns_mapping.json

@@ -148,7 +148,23 @@
         "ip_address": "49.13.197.152"
     },
     {
-        "dns_name": "phx-healthcheck-phoenixApp-pgAdmin-Test-2",
-        "ip_address": "116.203.103.215"
+        "dns_name": "new-full-test",
+        "ip_address": "128.140.103.178"
+    },
+    {
+        "dns_name": "modern",
+        "ip_address": "157.90.228.52"
+    },
+    {
+        "dns_name": "burg-itc",
+        "ip_address": "23.88.56.89"
+    },
+    {
+        "dns_name": "test-ansible-ip-permission",
+        "ip_address": "116.203.73.240"
+    },
+    {
+        "dns_name": "test-ansible-ip-permission-2",
+        "ip_address": "91.99.29.55"
     }
 ]

config/hetzner_targets.json

@@ -371,11 +371,51 @@
     },
     {
         "targets": [
-            "116.203.103.215:9100",
-            "116.203.103.215:9113"
+            "128.140.103.178:9100",
+            "128.140.103.178:9113"
         ],
         "labels": {
-            "instance": "phx-healthcheck-phoenixApp-pgAdmin-Test-2",
+            "instance": "new-full-test",
+            "datacenter": "nbg1"
+        }
+    },
+    {
+        "targets": [
+            "157.90.228.52:9100",
+            "157.90.228.52:9113"
+        ],
+        "labels": {
+            "instance": "modern",
+            "datacenter": "nbg1"
+        }
+    },
+    {
+        "targets": [
+            "23.88.56.89:9100",
+            "23.88.56.89:9113"
+        ],
+        "labels": {
+            "instance": "burg-itc",
+            "datacenter": "nbg1"
+        }
+    },
+    {
+        "targets": [
+            "116.203.73.240:9100",
+            "116.203.73.240:9113"
+        ],
+        "labels": {
+            "instance": "test-ansible-ip-permission",
+            "datacenter": "nbg1"
+        }
+    },
+    {
+        "targets": [
+            "91.99.29.55:9100",
+            "91.99.29.55:9113"
+        ],
+        "labels": {
+            "instance": "test-ansible-ip-permission-2",
             "datacenter": "nbg1"
         }
     }

docker-compose.yml

@@ -14,24 +14,26 @@ services:
     image: docker.io/grafana/grafana-oss:12.0.0
     container_name: grafana
     environment:
-      - GF_SECURITY_ADMIN_PASSWORD=admin
+      GF_PATHS_PROVISIONING: /var/lib/grafana/provisioning/
+      GF_SECURITY_ADMIN_PASSWORD: admin
       # - GF_SERVER_DOMAIN=%(protocol)s://%(domain)s:%(http_port)s/
       # - GF_SERVER_ROOT_URL=%(protocol)s://%(domain)s/
-      - GF_SERVER_DOMAIN=grafana.phx-erp.de
-      - GF_SERVER_PROTOCOL=https
+      GF_SERVER_DOMAIN: grafana.phx-erp.de
+      GF_SERVER_PROTOCOL: https
       # - GF_SERVER_HTTP_PORT=3000
-      - GF_LOG_LEVEL=debug
-      - GF_SMTP_ENABLED=true
-      - GF_SMTP_FROM_ADDRESS=admin@phx-erp.de
-      - GF_SMTP_FROM_NAME=Grafana
-      - GF_SMTP_HOST=mail.phx-erp.de:465
-      - GF_SMTP_PASSWORD=0rB0@et68
-      - GF_SMTP_USER=yuri.lima@phx-erp.de
-      - GF_SMTP_STARTTLS_POLICY=false
-      - GF_SMTP_SKIP_VERIFY=true
-      - GF_SMTP_ENABLE_TRACING=false
+      GF_LOG_LEVEL: debug
+      GF_SMTP_ENABLED: true
+      GF_SMTP_FROM_ADDRESS: admin@phx-erp.de
+      GF_SMTP_FROM_NAME: Grafana
+      GF_SMTP_HOST: mail.phx-erp.de:465
+      GF_SMTP_PASSWORD: 0rB0@et68
+      GF_SMTP_USER: yuri.lima@phx-erp.de
+      GF_SMTP_STARTTLS_POLICY: false
+      GF_SMTP_SKIP_VERIFY: true
+      GF_SMTP_ENABLE_TRACING: false
     volumes:
       - grafana-data:/var/lib/grafana
+      - ./config/provisioning:/var/lib/grafana/provisioning/
     restart: unless-stopped
     networks:
       - grafana-prometheus
@@ -41,8 +43,8 @@ services:
     image: docker.io/prom/prometheus:v3.1.0
     container_name: prometheus
     user: "65534:65534"
-    ports:
-      - "9090:9090"
+    # ports:
+    #   - "9090:9090"
     command:
       - "--config.file=/etc/prometheus/prometheus.yaml"
       - "--web.config.file=/etc/prometheus/web-config.yaml"
@@ -64,10 +66,6 @@ services:
     container_name: loki
     image: docker.io/grafana/loki:3.5.0
     command: "-config.file=/etc/loki/config.yaml" # Tells Grafana Loki to start with the config file.
-    ports:
-      # --> (Optional) Remove when using traefik...
-      - "3100:3100"
-      # <--
     volumes:
       - ./config/loki-config.yaml:/etc/loki/config.yaml:ro
       - data_loki:/loki:rw
@@ -84,7 +82,6 @@ services:
     container_name: https_portal
     image: "steveltn/https-portal:1.21"
     restart: unless-stopped
-    user: "root"
     networks:
       - grafana-prometheus
     ports:
@@ -104,4 +101,9 @@ services:
     depends_on:
       - prometheus
       - grafana
-      - loki
+      - loki
+    deploy:
+      resources:
+        limits:
+          cpus: '0.50'
+          memory: 512M

hetzner_discovery.py

@@ -10,7 +10,7 @@ load_dotenv()
 # 🔑 Load Hetzner API Token & Prometheus URL
 HETZNER_API_TOKEN = os.getenv("HETZNER_API_TOKEN")
 # https://prometheus.io/docs/prometheus/latest/configuration/configuration/
-PROMETHEUS_RELOAD_URL = os.getenv("PROMETHEUS_RELOAD_URL", "https://prometheus.phx-erp.de:9090/-/reload")
+PROMETHEUS_RELOAD_URL = os.getenv("PROMETHEUS_RELOAD_URL", "https://prometheus.phx-erp.de/-/reload")
 
 # Check if token is loaded
 if not HETZNER_API_TOKEN: