reorder compose

This commit is contained in:
2024-09-15 08:50:45 +02:00
parent e6816d8a83
commit f17720878a
2 changed files with 14 additions and 13 deletions

View File

@@ -42,6 +42,18 @@ services:
volumes:
- ../patata2-data:/data
#- ./simple-discord-bot.toml:/data/config/simple-discord-bot.toml
grafana:
image: grafana/grafana-oss:${GRAFANA_VERSION:-8.3.3}
ports:
- "3000:3000"
volumes:
- grafana-lib:/var/lib/grafana
- ./grafana/provisioning:/etc/grafana/provisioning
- ./dashboards:/etc/grafana/dashboards
depends_on:
- prometheus
networks:
- patatanet
monitor:
image: itzg/mc-monitor
command: export-for-prometheus
@@ -73,18 +85,6 @@ services:
- minecraft-exporter
networks:
- patatanet
grafana:
image: grafana/grafana-oss:${GRAFANA_VERSION:-8.3.3}
ports:
- "3000:3000"
volumes:
- grafana-lib:/var/lib/grafana
- ./grafana/provisioning:/etc/grafana/provisioning
- ./dashboards:/etc/grafana/dashboards
depends_on:
- prometheus
networks:
- patatanet
minecraft-exporter:
build:
context: ./minecraft-exporter

View File

@@ -44,7 +44,8 @@ class MinecraftCollector(object):
return self.player_map[uuid]
else:
try:
result = requests.get('https://sessionserver.mojang.com/session/minecraft/profile/' + uuid)
result = requests.get('https://auth.oier.ovh/api/yggdrasil/session/minecraft/profile/' + uuid)
#result = requests.get('https://sessionserver.mojang.com/session/minecraft/profile/' + uuid)
self.player_map[uuid] = result.json()['name']
return (result.json()['name'])
except: