From 18003e781327599f2c6e033212c864c978d6a665 Mon Sep 17 00:00:00 2001
From: DerGrumpf <p.keier@beyerstedt-it.de>
Date: Sat, 16 Nov 2024 22:57:04 +0100
Subject: [PATCH] Added deployment strategie for garde-studios.de

---
 deployment/garde-studios.de.compose.yml |  4 ++++
 fallback/compose.yml                    |  4 +++-
 fallback/config/FabricProxy-Lite.toml   |  2 +-
 fallback/config/exporter.properties     |  3 ---
 fallback/mods.txt                       |  1 +
 main/config/FabricProxy-Lite.toml       |  2 +-
 monitoring/compose.yml                  |  3 +++
 monitoring/grafana/compose.yml          | 13 +++++++++++++
 monitoring/prometheus/compose.yml       |  2 ++
 monitoring/prometheus/prometheus.yml    |  2 +-
 10 files changed, 29 insertions(+), 7 deletions(-)
 create mode 100644 deployment/garde-studios.de.compose.yml
 delete mode 100644 fallback/config/exporter.properties

diff --git a/deployment/garde-studios.de.compose.yml b/deployment/garde-studios.de.compose.yml
new file mode 100644
index 0000000..401ccac
--- /dev/null
+++ b/deployment/garde-studios.de.compose.yml
@@ -0,0 +1,4 @@
+include:
+  - ../proxy/compose.yml
+  - ../fallback/compose.yml
+  - ../monitoring/compose.yml
diff --git a/fallback/compose.yml b/fallback/compose.yml
index 70ce203..e38af9a 100644
--- a/fallback/compose.yml
+++ b/fallback/compose.yml
@@ -44,10 +44,12 @@ services:
       SYNC_SKIP_NEWER_IN_DESTINATION: false
     ports:
       - 30000:25565 # Connection Port
-      - 9000:25585 # Fabric Exporter
+      - 9100:9100 # unified Exporter
     volumes:
       - ./data:/data
       - ./mods.txt:/extras/mods.txt:ro
+      - ./ops.json:/extras/ops.json:ro 
+      - ./whitelist.json:/extras/whitelist.json:ro
       - ./config:/config
 
 networks: {}
diff --git a/fallback/config/FabricProxy-Lite.toml b/fallback/config/FabricProxy-Lite.toml
index 47762f5..b6b7e84 100644
--- a/fallback/config/FabricProxy-Lite.toml
+++ b/fallback/config/FabricProxy-Lite.toml
@@ -1,4 +1,4 @@
 hackOnlineMode = true
 hackEarlySend = false
 hackMessageChain = true
-secret = "CMhgx3vF17Nu"
+secret = "bGAJSlLeA4Wf"
diff --git a/fallback/config/exporter.properties b/fallback/config/exporter.properties
deleted file mode 100644
index a5a29af..0000000
--- a/fallback/config/exporter.properties
+++ /dev/null
@@ -1,3 +0,0 @@
-server-port: 25585
-update-interval: 1000
-use-spark: true
diff --git a/fallback/mods.txt b/fallback/mods.txt
index 8a13540..e3749f7 100644
--- a/fallback/mods.txt
+++ b/fallback/mods.txt
@@ -12,6 +12,7 @@ https://cdn.modrinth.com/data/8dI2tmqs/versions/AQhF7kvw/FabricProxy-Lite-2.9.0.
 
 # Monitoring
 https://cdn.modrinth.com/data/p1ewR5kV/versions/xwRVtqbA/unifiedmetrics-platform-fabric-0.3.8.jar
+https://cdn.modrinth.com/data/Ha28R6CL/versions/B0fZidZi/fabric-language-kotlin-1.12.3%2Bkotlin.2.0.21.jar
 
 # World Edit
 https://cdn.modrinth.com/data/1u6JkXh5/versions/vBzkrSYP/worldedit-mod-7.3.6.jar
diff --git a/main/config/FabricProxy-Lite.toml b/main/config/FabricProxy-Lite.toml
index 47762f5..b6b7e84 100644
--- a/main/config/FabricProxy-Lite.toml
+++ b/main/config/FabricProxy-Lite.toml
@@ -1,4 +1,4 @@
 hackOnlineMode = true
 hackEarlySend = false
 hackMessageChain = true
-secret = "CMhgx3vF17Nu"
+secret = "bGAJSlLeA4Wf"
diff --git a/monitoring/compose.yml b/monitoring/compose.yml
index e69de29..8278c53 100644
--- a/monitoring/compose.yml
+++ b/monitoring/compose.yml
@@ -0,0 +1,3 @@
+include:
+  - grafana/compose.yml
+  - prometheus/compose.yml
diff --git a/monitoring/grafana/compose.yml b/monitoring/grafana/compose.yml
index e69de29..b6a4f6a 100644
--- a/monitoring/grafana/compose.yml
+++ b/monitoring/grafana/compose.yml
@@ -0,0 +1,13 @@
+services:
+  grafana:
+    image: grafana/grafana-oss
+    container_name: grafana 
+    restart: unless-stopped
+    user: '1000'
+    volumes:
+      - grafana-storage:/var/lib/grafana
+    ports:
+      - 3000:3000
+
+volumes:
+  grafana-storage: {}
diff --git a/monitoring/prometheus/compose.yml b/monitoring/prometheus/compose.yml
index 2c3ede7..8a347f1 100644
--- a/monitoring/prometheus/compose.yml
+++ b/monitoring/prometheus/compose.yml
@@ -1,6 +1,8 @@
 services:
   prometheus:
     image: prom/prometheus
+    container_name: prometheus
+    restart: unless-stopped
     volumes:
       - ./prometheus.yml:/etc/prometheus/prometheus.yml
     ports:
diff --git a/monitoring/prometheus/prometheus.yml b/monitoring/prometheus/prometheus.yml
index 6c315bd..07ef7f3 100644
--- a/monitoring/prometheus/prometheus.yml
+++ b/monitoring/prometheus/prometheus.yml
@@ -11,7 +11,7 @@ scrape_configs:
   # Server Scrapers
   - job_name: 'mc-server'
     static_configs:
-      - targets: ['localhost:9100']
+      - targets: ['100.113.167.128:9100']
         labels:
           instance: 'Fallback'
       - targets: ['100.80.35.55:9100']