diff --git a/docker-compose.yml b/docker-compose.yml index 5a7f246..a9fcc22 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -30,7 +30,6 @@ services: MOTD: "§l§cPatataPack§r" ONLINE_MODE: "FALSE" ALLOW_FLIGHT: "TRUE" - RCON_PASSWORD: ${RCON_PASSWORD} OPS: | Bailongo Amimi @@ -64,6 +63,7 @@ services: - prometheus-tsdb:/prometheus depends_on: - monitor + - minecraft-exporter grafana: image: grafana/grafana-oss:${GRAFANA_VERSION:-8.3.3} ports: @@ -78,14 +78,17 @@ services: build: context: ./minecraft-exporter environment: - RCON_HOST: localhost + RCON_HOST: 127.0.0.1 RCON_PORT: 25575 - RCON_PASSWORD: ${RCON_PASSWORD} + FORGE_SERVER: True ports: - - 9700:8000 + - 9700:8000 volumes: - - ./world:/world:ro + - ../patata-data/world:/world:ro + depends_on: + - mc volumes: patata-data: {} + world: {} prometheus-tsdb: {} grafana-lib: {} diff --git a/prometheus.yml b/prometheus.yml index 2fc108c..7bcd682 100644 --- a/prometheus.yml +++ b/prometheus.yml @@ -6,4 +6,14 @@ scrape_configs: - targets: - monitor:8080 - targets: - - cadvisor:8080 \ No newline at end of file + - cadvisor:8080 + - job_name: minecraft + scrape_interval: 15s + scrape_timeout: 15s + metrics_path: /metrics + scheme: http + static_configs: + - targets: + - 127.0.0.1:9700 + labels: + server_name: PatataPack server