Merge branch 'master' into master

This commit is contained in:
Joshi 2022-02-23 22:44:20 +01:00 committed by GitHub
commit 7aa6e1a170
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 221 additions and 163 deletions

View file

@ -1,8 +1,8 @@
FROM python:3.8.12-alpine3.14
FROM python:3.10-alpine
COPY requirements.txt minecraft_exporter.py /
RUN pip install --no-cache-dir -r requirements.txt
EXPOSE 8000
ENTRYPOINT ["python","minecraft_exporter.py"]
ENTRYPOINT ["python","-u","minecraft_exporter.py"]

View file

@ -1,64 +1,94 @@
from prometheus_client import start_http_server, REGISTRY, Metric
import time
import requests
import json
import nbt
import re
import os
import schedule
from mcrcon import MCRcon
import re
import time
from os import listdir
from os.path import isfile, join
import nbt
import requests
import schedule
from mcrcon import MCRcon, MCRconException
from prometheus_client import Metric, REGISTRY, start_http_server
class MinecraftCollector(object):
def __init__(self):
self.statsdirectory = "/world/stats"
self.playerdirectory = "/world/playerdata"
self.advancementsdirectory = "/world/advancements"
self.betterquesting = "/world/betterquesting"
self.map = dict()
self.questsEnabled = False
self.stats_directory = "/world/stats"
self.player_directory = "/world/playerdata"
self.advancements_directory = "/world/advancements"
self.better_questing = "/world/betterquesting"
self.player_map = dict()
self.quests_enabled = False
self.rcon = None
if os.path.isdir(self.betterquesting):
self.questsEnabled = True
self.rcon_connected = False
if all(x in os.environ for x in ['RCON_HOST', 'RCON_PASSWORD']):
self.rcon = MCRcon(os.environ['RCON_HOST'], os.environ['RCON_PASSWORD'], port=int(os.environ['RCON_PORT']))
print("RCON is enabled for " + os.environ['RCON_HOST'])
if os.path.isdir(self.better_questing):
self.quests_enabled = True
schedule.every().day.at("01:00").do(self.flush_playernamecache)
def get_players(self):
return [f[:-5] for f in listdir(self.statsdirectory) if isfile(join(self.statsdirectory, f))]
return [f[:-5] for f in listdir(self.stats_directory) if isfile(join(self.stats_directory, f))]
def flush_playernamecache(self):
print("flushing playername cache")
self.map = dict()
return
self.player_map = dict()
def uuid_to_player(self, uuid):
uuid = uuid.replace('-', '')
if uuid in self.map:
return self.map[uuid]
if uuid in self.player_map:
return self.player_map[uuid]
else:
try:
result = requests.get('https://api.mojang.com/user/profiles/' + uuid + '/names')
self.map[uuid] = result.json()[-1]['name']
self.player_map[uuid] = result.json()[-1]['name']
return (result.json()[-1]['name'])
except:
return
def rcon_command(self,command):
if self.rcon == None:
self.rcon = MCRcon(os.environ['RCON_HOST'],os.environ['RCON_PASSWORD'],port=int(os.environ['RCON_PORT']))
def rcon_connect(self):
try:
self.rcon.connect()
self.rcon_connected = True
print("Successfully connected to RCON")
return True
except Exception as e:
print("Failed to connect to RCON")
print(e)
return False
def rcon_disconnect(self):
self.rcon.disconnect()
self.rcon_connected = False
def rcon_command(self, command):
try:
response = self.rcon.command(command)
except BrokenPipeError:
print("Lost RCON Connection, trying to reconnect")
self.rcon.connect()
response = self.rcon.command(command)
except MCRconException as e:
response = None
if e == "Connection timeout error":
print("Lost RCON Connection")
self.rcon_disconnect()
else:
print("RCON command failed")
except (ConnectionResetError, ConnectionAbortedError, BrokenPipeError):
print("Lost RCON Connection")
self.rcon_disconnect()
response = None
return response
def get_server_stats(self):
metrics = []
if not all(x in os.environ for x in ['RCON_HOST','RCON_PASSWORD']):
if self.rcon is None or (not self.rcon_connected and not self.rcon_connect()):
return []
metrics = []
dim_tps = Metric('dim_tps', 'TPS of a dimension', "counter")
dim_ticktime = Metric('dim_ticktime', "Time a Tick took in a Dimension", "counter")
overall_tps = Metric('overall_tps', 'overall TPS', "counter")
@ -69,7 +99,8 @@ class MinecraftCollector(object):
tps_5m = Metric('paper_tps_5m', '5 Minute TPS', "counter")
tps_15m = Metric('paper_tps_15m', '15 Minute TPS', "counter")
metrics.extend([dim_tps,dim_ticktime,overall_tps,overall_ticktime,player_online,entities,tps_1m,tps_5m,tps_15m])
metrics.extend(
[dim_tps, dim_ticktime, overall_tps, overall_ticktime, player_online, entities, tps_1m, tps_5m, tps_15m])
if 'PAPER_SERVER' in os.environ and os.environ['PAPER_SERVER'] == "True":
resp = str(self.rcon_command("tps")).strip().replace("§a", "")
tpsregex = re.compile("TPS from last 1m, 5m, 15m: (\d*\.\d*), (\d*\.\d*), (\d*\.\d*)")
@ -83,7 +114,8 @@ class MinecraftCollector(object):
dimtpsregex = re.compile("Dim\s*(-*\d*)\s\((.*?)\)\s:\sMean tick time:\s(.*?) ms\. Mean TPS: (\d*\.\d*)")
for dimid, dimname, meanticktime, meantps in dimtpsregex.findall(resp):
dim_tps.add_sample('dim_tps', value=meantps, labels={'dimension_id': dimid, 'dimension_name': dimname})
dim_ticktime.add_sample('dim_ticktime',value=meanticktime,labels={'dimension_id':dimid,'dimension_name':dimname})
dim_ticktime.add_sample('dim_ticktime', value=meanticktime,
labels={'dimension_id': dimid, 'dimension_name': dimname})
overallregex = re.compile("Overall\s?: Mean tick time: (.*) ms. Mean TPS: (.*)")
overall_tps.add_sample('overall_tps', value=overallregex.findall(resp)[0][1], labels={})
overall_ticktime.add_sample('overall_ticktime', value=overallregex.findall(resp)[0][0], labels={})
@ -96,23 +128,32 @@ class MinecraftCollector(object):
# dynmap
if 'DYNMAP_ENABLED' in os.environ and os.environ['DYNMAP_ENABLED'] == "True":
dynmap_tile_render_statistics = Metric('dynmap_tile_render_statistics','Tile Render Statistics reported by Dynmap',"counter")
dynmap_chunk_loading_statistics_count = Metric('dynmap_chunk_loading_statistics_count','Chunk Loading Statistics reported by Dynmap',"counter")
dynmap_chunk_loading_statistics_duration = Metric('dynmap_chunk_loading_statistics_duration','Chunk Loading Statistics reported by Dynmap',"counter")
metrics.extend([dynmap_tile_render_statistics,dynmap_chunk_loading_statistics_count,dynmap_chunk_loading_statistics_duration])
dynmap_tile_render_statistics = Metric('dynmap_tile_render_statistics',
'Tile Render Statistics reported by Dynmap', "counter")
dynmap_chunk_loading_statistics_count = Metric('dynmap_chunk_loading_statistics_count',
'Chunk Loading Statistics reported by Dynmap', "counter")
dynmap_chunk_loading_statistics_duration = Metric('dynmap_chunk_loading_statistics_duration',
'Chunk Loading Statistics reported by Dynmap', "counter")
metrics.extend([dynmap_tile_render_statistics, dynmap_chunk_loading_statistics_count,
dynmap_chunk_loading_statistics_duration])
resp = self.rcon_command("dynmap stats")
dynmaptilerenderregex = re.compile(" (.*?): processed=(\d*), rendered=(\d*), updated=(\d*)")
for dim, processed, rendered, updated in dynmaptilerenderregex.findall(resp):
dynmap_tile_render_statistics.add_sample('dynmap_tile_render_statistics',value=processed,labels={'type':'processed','file':dim})
dynmap_tile_render_statistics.add_sample('dynmap_tile_render_statistics',value=rendered,labels={'type':'rendered','file':dim})
dynmap_tile_render_statistics.add_sample('dynmap_tile_render_statistics',value=updated,labels={'type':'updated','file':dim})
dynmap_tile_render_statistics.add_sample('dynmap_tile_render_statistics', value=processed,
labels={'type': 'processed', 'file': dim})
dynmap_tile_render_statistics.add_sample('dynmap_tile_render_statistics', value=rendered,
labels={'type': 'rendered', 'file': dim})
dynmap_tile_render_statistics.add_sample('dynmap_tile_render_statistics', value=updated,
labels={'type': 'updated', 'file': dim})
dynmapchunkloadingregex = re.compile("Chunks processed: (.*?): count=(\d*), (\d*.\d*)")
for state, count, duration_per_chunk in dynmapchunkloadingregex.findall(resp):
dynmap_chunk_loading_statistics_count.add_sample('dynmap_chunk_loading_statistics',value=count,labels={'type': state})
dynmap_chunk_loading_statistics_duration.add_sample('dynmap_chunk_loading_duration',value=duration_per_chunk,labels={'type': state})
dynmap_chunk_loading_statistics_count.add_sample('dynmap_chunk_loading_statistics', value=count,
labels={'type': state})
dynmap_chunk_loading_statistics_duration.add_sample('dynmap_chunk_loading_duration',
value=duration_per_chunk, labels={'type': state})
# player
resp = self.rcon_command("list")
@ -125,7 +166,7 @@ class MinecraftCollector(object):
return metrics
def get_player_quests_finished(self, uuid):
with open(self.betterquesting+"/QuestProgress.json") as json_file:
with open(self.better_questing + "/QuestProgress.json") as json_file:
data = json.load(json_file)
json_file.close()
counter = 0
@ -136,16 +177,16 @@ class MinecraftCollector(object):
return counter
def get_player_stats(self, uuid):
with open(self.statsdirectory+"/"+uuid+".json") as json_file:
with open(self.stats_directory + "/" + uuid + ".json") as json_file:
data = json.load(json_file)
json_file.close()
nbtfile = nbt.nbt.NBTFile(self.playerdirectory+"/"+uuid+".dat",'rb')
nbtfile = nbt.nbt.NBTFile(self.player_directory + "/" + uuid + ".dat", 'rb')
data["stat.XpTotal"] = nbtfile.get("XpTotal").value
data["stat.XpLevel"] = nbtfile.get("XpLevel").value
data["stat.Score"] = nbtfile.get("Score").value
data["stat.Health"] = nbtfile.get("Health").value
data["stat.foodLevel"] = nbtfile.get("foodLevel").value
with open(self.advancementsdirectory+"/"+uuid+".json") as json_file:
with open(self.advancements_directory + "/" + uuid + ".json") as json_file:
count = 0
advancements = json.load(json_file)
for key, value in advancements.items():
@ -154,13 +195,14 @@ class MinecraftCollector(object):
if value["done"] == True:
count += 1
data["stat.advancements"] = count
if self.questsEnabled:
if self.quests_enabled:
data["stat.questsFinished"] = self.get_player_quests_finished(uuid)
return data
def update_metrics_for_player(self, uuid):
name = self.uuid_to_player(uuid)
if not name: return
if not name:
return
data = self.get_player_stats(uuid)
@ -182,21 +224,26 @@ class MinecraftCollector(object):
player_advancements = Metric('player_advancements', "Number of completed advances of a player", "counter")
player_slept = Metric('player_slept', "Times a Player slept in a bed", "counter")
player_quests_finished = Metric('player_quests_finished', 'Number of quests a Player has finished', 'counter')
player_used_crafting_table = Metric('player_used_crafting_table',"Times a Player used a Crafting Table","counter")
mc_custom = Metric('mc_custom',"Custom Minectaft stat","counter")
player_used_crafting_table = Metric('player_used_crafting_table', "Times a Player used a Crafting Table",
"counter")
mc_custom = Metric('mc_custom', "Custom Minecraft stat", "counter")
for key, value in data.items(): # pre 1.15
if key in ("stats", "DataVersion"):
continue
stat = key.split(".")[1] # entityKilledBy
if stat == "mineBlock":
blocks_mined.add_sample("blocks_mined",value=value,labels={'player':name,'block':'.'.join((key.split(".")[2],key.split(".")[3]))})
blocks_mined.add_sample("blocks_mined", value=value, labels={'player': name, 'block': '.'.join(
(key.split(".")[2], key.split(".")[3]))})
elif stat == "pickup":
blocks_picked_up.add_sample("blocks_picked_up",value=value,labels={'player':name,'block':'.'.join((key.split(".")[2],key.split(".")[3]))})
blocks_picked_up.add_sample("blocks_picked_up", value=value, labels={'player': name, 'block': '.'.join(
(key.split(".")[2], key.split(".")[3]))})
elif stat == "entityKilledBy":
if len(key.split(".")) == 4:
player_deaths.add_sample('player_deaths',value=value,labels={'player':name,'cause':'.'.join((key.split(".")[2],key.split(".")[3]))})
player_deaths.add_sample('player_deaths', value=value, labels={'player': name, 'cause': '.'.join(
(key.split(".")[2], key.split(".")[3]))})
else:
player_deaths.add_sample('player_deaths',value=value,labels={'player':name,'cause':key.split(".")[2]})
player_deaths.add_sample('player_deaths', value=value,
labels={'player': name, 'cause': key.split(".")[2]})
elif stat == "jump":
player_jumps.add_sample("player_jumps", value=value, labels={'player': name})
elif stat == "walkOneCm":
@ -228,13 +275,15 @@ class MinecraftCollector(object):
elif stat == "Score":
player_score.add_sample('player_score', value=value, labels={'player': name})
elif stat == "killEntity":
entities_killed.add_sample('entities_killed',value=value,labels={'player':name,"entity":key.split(".")[2]})
entities_killed.add_sample('entities_killed', value=value,
labels={'player': name, "entity": key.split(".")[2]})
elif stat == "damageDealt":
damage_dealt.add_sample('damage_dealt', value=value, labels={'player': name})
elif stat == "damageTaken":
damage_dealt.add_sample('damage_taken', value=value, labels={'player': name})
elif stat == "craftItem":
blocks_crafted.add_sample('blocks_crafted',value=value,labels={'player':name,'block':'.'.join((key.split(".")[2],key.split(".")[3]))})
blocks_crafted.add_sample('blocks_crafted', value=value, labels={'player': name, 'block': '.'.join(
(key.split(".")[2], key.split(".")[3]))})
elif stat == "playOneMinute":
player_playtime.add_sample('player_playtime', value=value, labels={'player': name})
elif stat == "advancements":
@ -242,7 +291,8 @@ class MinecraftCollector(object):
elif stat == "sleepInBed":
player_slept.add_sample('player_slept', value=value, labels={'player': name})
elif stat == "craftingTableInteraction":
player_used_crafting_table.add_sample('player_used_crafting_table',value=value,labels={'player':name})
player_used_crafting_table.add_sample('player_used_crafting_table', value=value,
labels={'player': name})
elif stat == "questsFinished":
player_quests_finished.add_sample('player_quests_finished', value=value, labels={'player': name})
@ -255,10 +305,12 @@ class MinecraftCollector(object):
blocks_mined.add_sample("blocks_mined", value=value, labels={'player': name, 'block': block})
if "minecraft:picked_up" in data["stats"]:
for block, value in data["stats"]["minecraft:picked_up"].items():
blocks_picked_up.add_sample("blocks_picked_up",value=value,labels={'player':name,'block':block})
blocks_picked_up.add_sample("blocks_picked_up", value=value,
labels={'player': name, 'block': block})
if "minecraft:killed" in data["stats"]:
for entity, value in data["stats"]["minecraft:killed"].items():
entities_killed.add_sample('entities_killed',value=value,labels={'player':name,"entity":entity})
entities_killed.add_sample('entities_killed', value=value,
labels={'player': name, "entity": entity})
if "minecraft:killed_by" in data["stats"]:
for entity, value in data["stats"]["minecraft:killed_by"].items():
player_deaths.add_sample('player_deaths', value=value, labels={'player': name, 'cause': entity})
@ -296,15 +348,20 @@ class MinecraftCollector(object):
elif stat == "minecraft:sleep_in_bed":
player_slept.add_sample('player_slept', value=value, labels={'player': name})
elif stat == "minecraft:interact_with_crafting_table":
player_used_crafting_table.add_sample('player_used_crafting_table',value=value,labels={'player':name})
player_used_crafting_table.add_sample('player_used_crafting_table', value=value,
labels={'player': name})
else:
mc_custom.add_sample('mc_custom', value=value, labels={'stat': stat})
return [blocks_mined,blocks_picked_up,player_deaths,player_jumps,cm_traveled,player_xp_total,player_current_level,player_food_level,player_health,player_score,entities_killed,damage_taken,damage_dealt,blocks_crafted,player_playtime,player_advancements,player_slept,player_used_crafting_table,player_quests_finished,mc_custom]
return [blocks_mined, blocks_picked_up, player_deaths, player_jumps, cm_traveled, player_xp_total,
player_current_level, player_food_level, player_health, player_score, entities_killed, damage_taken,
damage_dealt, blocks_crafted, player_playtime, player_advancements, player_slept,
player_used_crafting_table, player_quests_finished, mc_custom]
def collect(self):
for player in self.get_players():
metrics = self.update_metrics_for_player(player)
if not metrics: continue
if not metrics:
continue
for metric in metrics:
yield metric
@ -312,9 +369,6 @@ class MinecraftCollector(object):
for metric in self.get_server_stats():
yield metric
if __name__ == '__main__':
if all(x in os.environ for x in ['RCON_HOST','RCON_PASSWORD']):
print("RCON is enabled for "+ os.environ['RCON_HOST'])
HTTP_PORT = int(os.environ.get('HTTP_PORT'))
if HTTP_PORT == None:
@ -326,5 +380,9 @@ if __name__ == '__main__':
print(f'Exporter started on Port {HTTP_PORT}')
while True:
try:
time.sleep(1)
schedule.run_pending()
except MCRconException:
# RCON timeout
collector.rcon_disconnect()

View file

@ -1,5 +1,5 @@
mcrcon==0.5.2
NBT==1.5.0
prometheus-client==0.7.1
requests==2.20.0
schedule==0.6.0
mcrcon==0.7.0
NBT==1.5.1
prometheus-client==0.12.0
requests==2.27.1
schedule==1.1.0