From 94d72a0df6a2aca0cab528ba6c6cc5440cb6df15 Mon Sep 17 00:00:00 2001
From: Oier Bravo Urtasun <oierbravo@gmail.com>
Date: Wed, 3 Apr 2024 01:50:19 +0200
Subject: [PATCH] prom mod

---
 docker-compose.yml                   |  9 +--------
 prometheus.yml                       |  5 +++++
 web/index.toml                       |  5 +++++
 web/mods/prometheus-exporter.pw.toml | 13 +++++++++++++
 web/pack.toml                        |  2 +-
 5 files changed, 25 insertions(+), 9 deletions(-)
 create mode 100644 web/mods/prometheus-exporter.pw.toml

diff --git a/docker-compose.yml b/docker-compose.yml
index ded5db0..8b29e95 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -17,6 +17,7 @@ services:
     ports:
       - "25565:25565"
       - "24454:24454/udp"
+      - "19565:19565"
     restart: unless-stopped
     container_name: mc-forge-patata
     environment:
@@ -49,16 +50,12 @@ services:
     environment:
       EXPORT_SERVERS: mc
       DEBUG: "true"
-    ports:
-      - "8280:8080"
     depends_on:
       - mc
     networks:
       - patatanet
   cadvisor:
     image: gcr.io/cadvisor/cadvisor:v0.47.1
-    ports:
-      - "8180:8080"
     volumes:
       - /:/rootfs:ro
       - /var/run:/var/run:rw
@@ -99,8 +96,6 @@ services:
       RCON_PORT: 25575
       RCON_PASSWORD: "${RCON_PASSWORD}"
       FORGE_SERVER: True
-    ports:
-      - 9700:8000
     volumes:
       - ../patata-data/world:/world:ro
     depends_on:
@@ -109,8 +104,6 @@ services:
       - patatanet
   mc-export:
     image: ghcr.io/dirien/minecraft-exporter:latest
-    ports:
-      - 9150:9150
     environment:
       FORGE_SERVER: True
       MC_WORLD: /world
diff --git a/prometheus.yml b/prometheus.yml
index c7b4a0c..32a0444 100644
--- a/prometheus.yml
+++ b/prometheus.yml
@@ -25,3 +25,8 @@ scrape_configs:
     static_configs:
       - targets:
           - minecraft-exporter:8000
+  - job_name: 'minecraft'
+    static_configs:
+      - targets: ['mc:19565']
+        labels:
+          server_name: 'minecraft-docker'
\ No newline at end of file
diff --git a/web/index.toml b/web/index.toml
index d2d7131..64aaab4 100644
--- a/web/index.toml
+++ b/web/index.toml
@@ -1801,6 +1801,11 @@ file = "mods/polymorph.pw.toml"
 hash = "afb301ed55a33af3374b3718da3ba588228b057accbf167741ce1747905dd4f8"
 metafile = true
 
+[[files]]
+file = "mods/prometheus-exporter.pw.toml"
+hash = "48cd5d935a18a9cb721a4641409b5a5c0545ccf122fd5e9daa96df26d007bb31"
+metafile = true
+
 [[files]]
 file = "mods/puzzles-lib.pw.toml"
 hash = "cf286645d97aa16bc6949cf9515eaee267a8115f5a16c0dfda361ed893164d73"
diff --git a/web/mods/prometheus-exporter.pw.toml b/web/mods/prometheus-exporter.pw.toml
new file mode 100644
index 0000000..5e06de8
--- /dev/null
+++ b/web/mods/prometheus-exporter.pw.toml
@@ -0,0 +1,13 @@
+name = "Prometheus Exporter"
+filename = "Prometheus-Exporter-1.20.1-forge-1.0.0.jar"
+side = "both"
+
+[download]
+hash-format = "sha1"
+hash = "435aaec159dc80f33fc7722a5f0d40c7b1f87243"
+mode = "metadata:curseforge"
+
+[update]
+[update.curseforge]
+file-id = 4694230
+project-id = 351938
diff --git a/web/pack.toml b/web/pack.toml
index bb1fcbf..b611c90 100644
--- a/web/pack.toml
+++ b/web/pack.toml
@@ -6,7 +6,7 @@ pack-format = "packwiz:1.1.0"
 [index]
 file = "index.toml"
 hash-format = "sha256"
-hash = "0a8df51a99682dff09ce968b1362c0bb1a390bfe29e12d572f5607a8c054e3fe"
+hash = "33a40c6de358fe9390bd55eb28be7d7902410c9579bb550a4018709dd4807f87"
 
 [versions]
 forge = "47.2.0"