reorder compose
This commit is contained in:
@@ -42,6 +42,18 @@ services:
|
|||||||
volumes:
|
volumes:
|
||||||
- ../patata2-data:/data
|
- ../patata2-data:/data
|
||||||
#- ./simple-discord-bot.toml:/data/config/simple-discord-bot.toml
|
#- ./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:
|
monitor:
|
||||||
image: itzg/mc-monitor
|
image: itzg/mc-monitor
|
||||||
command: export-for-prometheus
|
command: export-for-prometheus
|
||||||
@@ -73,18 +85,6 @@ services:
|
|||||||
- minecraft-exporter
|
- minecraft-exporter
|
||||||
networks:
|
networks:
|
||||||
- patatanet
|
- 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:
|
minecraft-exporter:
|
||||||
build:
|
build:
|
||||||
context: ./minecraft-exporter
|
context: ./minecraft-exporter
|
||||||
|
|||||||
@@ -44,7 +44,8 @@ class MinecraftCollector(object):
|
|||||||
return self.player_map[uuid]
|
return self.player_map[uuid]
|
||||||
else:
|
else:
|
||||||
try:
|
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']
|
self.player_map[uuid] = result.json()['name']
|
||||||
return (result.json()['name'])
|
return (result.json()['name'])
|
||||||
except:
|
except:
|
||||||
|
|||||||
Reference in New Issue
Block a user