SunRed/minecraft-exporter
1
0
Fork 0
Code Issues Pull requests Releases Activity

Change to Python 3.9 and add prefix to metrics

Browse source
This commit is contained in:
Manuel 2021-12-01 09:58:15 +01:00
parent 46661024f3
commit 6827b82f51
Signed by: Manuel
GPG key ID: 4085037435E1F07A
2 changed files with 70 additions and 70 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
Dockerfile
View file

@ -1,4 +1,4 @@
FROM python:3-alpine FROM python:3.9-alpine
COPY requirements.txt minecraft_exporter.py / COPY requirements.txt minecraft_exporter.py /
RUN pip install --no-cache-dir -r requirements.txt RUN pip install --no-cache-dir -r requirements.txt

138
minecraft_exporter.py
View file

@ -59,12 +59,12 @@ class MinecraftCollector(object):
metrics = [] metrics = []
if not all(x in os.environ for x in ['RCON_HOST','RCON_PASSWORD']): if not all(x in os.environ for x in ['RCON_HOST','RCON_PASSWORD']):
return [] return []
dim_tps = Metric('dim_tps','TPS of a dimension',"counter") dim_tps = Metric('mc_dim_tps','TPS of a dimension',"counter")
dim_ticktime = Metric('dim_ticktime',"Time a Tick took in a Dimension","counter") dim_ticktime = Metric('mc_dim_ticktime',"Time a Tick took in a Dimension","counter")
overall_tps = Metric('overall_tps','overall TPS',"counter") overall_tps = Metric('mc_overall_tps','overall TPS',"counter")
overall_ticktime = Metric('overall_ticktime',"overall Ticktime","counter") overall_ticktime = Metric('mc_overall_ticktime',"overall Ticktime","counter")
player_online = Metric('player_online',"is 1 if player is online","counter") player_online = Metric('mc_player_online',"is 1 if player is online","counter")
entities = Metric('entities',"type and count of active entites", "counter") entities = Metric('mc_entities',"type and count of active entites", "counter")
metrics.extend([dim_tps,dim_ticktime,overall_tps,overall_ticktime,player_online,entities]) metrics.extend([dim_tps,dim_ticktime,overall_tps,overall_ticktime,player_online,entities])
@ -74,37 +74,37 @@ class MinecraftCollector(object):
resp = self.rcon_command("forge tps") resp = self.rcon_command("forge tps")
dimtpsregex = re.compile("Dim\s*(-*\d*)\s\((.*?)\)\s:\sMean tick time:\s(.*?) ms\. Mean TPS: (\d*\.\d*)") 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): 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_tps.add_sample('mc_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('mc_dim_ticktime',value=meanticktime,labels={'dimension_id':dimid,'dimension_name':dimname})
overallregex = re.compile("Overall\s?: Mean tick time: (.*) ms. Mean TPS: (.*)") 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_tps.add_sample('mc_overall_tps',value=overallregex.findall(resp)[0][1],labels={})
overall_ticktime.add_sample('overall_ticktime',value=overallregex.findall(resp)[0][0],labels={}) overall_ticktime.add_sample('mc_overall_ticktime',value=overallregex.findall(resp)[0][0],labels={})
# entites # entites
resp = self.rcon_command("forge entity list") resp = self.rcon_command("forge entity list")
entityregex = re.compile("(\d+): (.*?:.*?)\s") entityregex = re.compile("(\d+): (.*?:.*?)\s")
for entitycount, entityname in entityregex.findall(resp): for entitycount, entityname in entityregex.findall(resp):
entities.add_sample('entities',value=entitycount,labels={'entity':entityname}) entities.add_sample('mc_entities',value=entitycount,labels={'entity':entityname})
# dynmap # dynmap
if 'DYNMAP_ENABLED' in os.environ and os.environ['DYNMAP_ENABLED'] == "True": 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_tile_render_statistics = Metric('mc_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_count = Metric('mc_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") dynmap_chunk_loading_statistics_duration = Metric('mc_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]) metrics.extend([dynmap_tile_render_statistics,dynmap_chunk_loading_statistics_count,dynmap_chunk_loading_statistics_duration])
resp = self.rcon_command("dynmap stats") resp = self.rcon_command("dynmap stats")
dynmaptilerenderregex = re.compile(" (.*?): processed=(\d*), rendered=(\d*), updated=(\d*)") dynmaptilerenderregex = re.compile(" (.*?): processed=(\d*), rendered=(\d*), updated=(\d*)")
for dim, processed, rendered, updated in dynmaptilerenderregex.findall(resp): 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('mc_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('mc_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('mc_dynmap_tile_render_statistics',value=updated,labels={'type':'updated','file':dim})
dynmapchunkloadingregex = re.compile("Chunks processed: (.*?): count=(\d*), (\d*.\d*)") dynmapchunkloadingregex = re.compile("Chunks processed: (.*?): count=(\d*), (\d*.\d*)")
for state, count, duration_per_chunk in dynmapchunkloadingregex.findall(resp): 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_count.add_sample('mc_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_duration.add_sample('mc_dynmap_chunk_loading_duration',value=duration_per_chunk,labels={'type': state})
# player # player
resp = self.rcon_command("list") resp = self.rcon_command("list")
@ -112,7 +112,7 @@ class MinecraftCollector(object):
if playerregex.findall(resp): if playerregex.findall(resp):
for player in playerregex.findall(resp)[0].split(","): for player in playerregex.findall(resp)[0].split(","):
if not player.isspace(): if not player.isspace():
player_online.add_sample('player_online',value=1,labels={'player':player.lstrip()}) player_online.add_sample('mc_player_online',value=1,labels={'player':player.lstrip()})
return metrics return metrics
@ -181,112 +181,112 @@ class MinecraftCollector(object):
continue continue
stat = key.split(".")[1] # entityKilledBy stat = key.split(".")[1] # entityKilledBy
if stat == "mineBlock": 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("mc_blocks_mined",value=value,labels={'player':name,'block':'.'.join((key.split(".")[2],key.split(".")[3]))})
elif stat == "pickup": 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("mc_blocks_picked_up",value=value,labels={'player':name,'block':'.'.join((key.split(".")[2],key.split(".")[3]))})
elif stat == "entityKilledBy": elif stat == "entityKilledBy":
if len(key.split(".")) == 4: 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('mc_player_deaths',value=value,labels={'player':name,'cause':'.'.join((key.split(".")[2],key.split(".")[3]))})
else: else:
player_deaths.add_sample('player_deaths',value=value,labels={'player':name,'cause':key.split(".")[2]}) player_deaths.add_sample('mc_player_deaths',value=value,labels={'player':name,'cause':key.split(".")[2]})
elif stat == "jump": elif stat == "jump":
player_jumps.add_sample("player_jumps",value=value,labels={'player':name}) player_jumps.add_sample("mc_player_jumps",value=value,labels={'player':name})
elif stat == "walkOneCm": elif stat == "walkOneCm":
cm_traveled.add_sample("cm_traveled",value=value,labels={'player':name,'method':"walking"}) cm_traveled.add_sample("mc_cm_traveled",value=value,labels={'player':name,'method':"walking"})
elif stat == "swimOneCm": elif stat == "swimOneCm":
cm_traveled.add_sample("cm_traveled",value=value,labels={'player':name,'method':"swimming"}) cm_traveled.add_sample("mc_cm_traveled",value=value,labels={'player':name,'method':"swimming"})
elif stat == "sprintOneCm": elif stat == "sprintOneCm":
cm_traveled.add_sample("cm_traveled",value=value,labels={'player':name,'method':"sprinting"}) cm_traveled.add_sample("mc_cm_traveled",value=value,labels={'player':name,'method':"sprinting"})
elif stat == "diveOneCm": elif stat == "diveOneCm":
cm_traveled.add_sample("cm_traveled",value=value,labels={'player':name,'method':"diving"}) cm_traveled.add_sample("mc_cm_traveled",value=value,labels={'player':name,'method':"diving"})
elif stat == "fallOneCm": elif stat == "fallOneCm":
cm_traveled.add_sample("cm_traveled",value=value,labels={'player':name,'method':"falling"}) cm_traveled.add_sample("mc_cm_traveled",value=value,labels={'player':name,'method':"falling"})
elif stat == "flyOneCm": elif stat == "flyOneCm":
cm_traveled.add_sample("cm_traveled",value=value,labels={'player':name,'method':"flying"}) cm_traveled.add_sample("mc_cm_traveled",value=value,labels={'player':name,'method':"flying"})
elif stat == "boatOneCm": elif stat == "boatOneCm":
cm_traveled.add_sample("cm_traveled",value=value,labels={'player':name,'method':"boat"}) cm_traveled.add_sample("mc_cm_traveled",value=value,labels={'player':name,'method':"boat"})
elif stat == "horseOneCm": elif stat == "horseOneCm":
cm_traveled.add_sample("cm_traveled",value=value,labels={'player':name,'method':"horse"}) cm_traveled.add_sample("mc_cm_traveled",value=value,labels={'player':name,'method':"horse"})
elif stat == "climbOneCm": elif stat == "climbOneCm":
cm_traveled.add_sample("cm_traveled",value=value,labels={'player':name,'method':"climbing"}) cm_traveled.add_sample("mc_cm_traveled",value=value,labels={'player':name,'method':"climbing"})
elif stat == "XpTotal": elif stat == "XpTotal":
player_xp_total.add_sample('player_xp_total',value=value,labels={'player':name}) player_xp_total.add_sample('mc_player_xp_total',value=value,labels={'player':name})
elif stat == "XpLevel": elif stat == "XpLevel":
player_current_level.add_sample('player_current_level',value=value,labels={'player':name}) player_current_level.add_sample('mc_player_current_level',value=value,labels={'player':name})
elif stat == "foodLevel": elif stat == "foodLevel":
player_food_level.add_sample('player_food_level',value=value,labels={'player':name}) player_food_level.add_sample('mc_player_food_level',value=value,labels={'player':name})
elif stat == "Health": elif stat == "Health":
player_health.add_sample('player_health',value=value,labels={'player':name}) player_health.add_sample('mc_player_health',value=value,labels={'player':name})
elif stat == "Score": elif stat == "Score":
player_score.add_sample('player_score',value=value,labels={'player':name}) player_score.add_sample('mc_player_score',value=value,labels={'player':name})
elif stat == "killEntity": elif stat == "killEntity":
entities_killed.add_sample('entities_killed',value=value,labels={'player':name,"entity":key.split(".")[2]}) entities_killed.add_sample('mc_entities_killed',value=value,labels={'player':name,"entity":key.split(".")[2]})
elif stat == "damageDealt": elif stat == "damageDealt":
damage_dealt.add_sample('damage_dealt',value=value,labels={'player':name}) damage_dealt.add_sample('mc_damage_dealt',value=value,labels={'player':name})
elif stat == "damageTaken": elif stat == "damageTaken":
damage_dealt.add_sample('damage_taken',value=value,labels={'player':name}) damage_dealt.add_sample('mc_damage_taken',value=value,labels={'player':name})
elif stat == "craftItem": 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('mc_blocks_crafted',value=value,labels={'player':name,'block':'.'.join((key.split(".")[2],key.split(".")[3]))})
elif stat == "playOneMinute": elif stat == "playOneMinute":
player_playtime.add_sample('player_playtime',value=value,labels={'player':name}) player_playtime.add_sample('mc_player_playtime',value=value,labels={'player':name})
elif stat == "advancements": elif stat == "advancements":
player_advancements.add_sample('player_advancements',value=value,labels={'player':name}) player_advancements.add_sample('mc_player_advancements',value=value,labels={'player':name})
elif stat == "sleepInBed": elif stat == "sleepInBed":
player_slept.add_sample('player_slept',value=value,labels={'player':name}) player_slept.add_sample('mc_player_slept',value=value,labels={'player':name})
elif stat == "craftingTableInteraction": elif stat == "craftingTableInteraction":
player_used_crafting_table.add_sample('player_used_crafting_table',value=value,labels={'player':name}) player_used_crafting_table.add_sample('mc_player_used_crafting_table',value=value,labels={'player':name})
elif stat == "questsFinished": elif stat == "questsFinished":
player_quests_finished.add_sample('player_quests_finished',value=value,labels={'player':name}) player_quests_finished.add_sample('mc_player_quests_finished',value=value,labels={'player':name})
if "stats" in data: # Minecraft > 1.15 if "stats" in data: # Minecraft > 1.15
if "minecraft:crafted" in data["stats"]: if "minecraft:crafted" in data["stats"]:
for block, value in data["stats"]["minecraft:crafted"].items(): for block, value in data["stats"]["minecraft:crafted"].items():
blocks_crafted.add_sample('blocks_crafted',value=value,labels={'player':name,'block':block}) blocks_crafted.add_sample('mc_blocks_crafted',value=value,labels={'player':name,'block':block})
if "minecraft:mined" in data["stats"]: if "minecraft:mined" in data["stats"]:
for block, value in data["stats"]["minecraft:mined"].items(): for block, value in data["stats"]["minecraft:mined"].items():
blocks_mined.add_sample("blocks_mined",value=value,labels={'player':name,'block':block}) blocks_mined.add_sample("mc_blocks_mined",value=value,labels={'player':name,'block':block})
if "minecraft:picked_up" in data["stats"]: if "minecraft:picked_up" in data["stats"]:
for block, value in data["stats"]["minecraft:picked_up"].items(): 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("mc_blocks_picked_up",value=value,labels={'player':name,'block':block})
if "minecraft:killed" in data["stats"]: if "minecraft:killed" in data["stats"]:
for entity, value in data["stats"]["minecraft:killed"].items(): 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('mc_entities_killed',value=value,labels={'player':name,"entity":entity})
if "minecraft:killed_by" in data["stats"]: if "minecraft:killed_by" in data["stats"]:
for entity, value in data["stats"]["minecraft:killed_by"].items(): for entity, value in data["stats"]["minecraft:killed_by"].items():
player_deaths.add_sample('player_deaths',value=value,labels={'player':name,'cause': entity}) player_deaths.add_sample('mc_player_deaths',value=value,labels={'player':name,'cause': entity})
for stat, value in data["stats"]["minecraft:custom"].items(): for stat, value in data["stats"]["minecraft:custom"].items():
if stat == "minecraft:jump": if stat == "minecraft:jump":
player_jumps.add_sample("player_jumps",value=value,labels={'player':name}) player_jumps.add_sample("mc_player_jumps",value=value,labels={'player':name})
elif stat == "minecraft:deaths": elif stat == "minecraft:deaths":
player_deaths.add_sample('player_deaths',value=value,labels={'player':name}) player_deaths.add_sample('mc_player_deaths',value=value,labels={'player':name})
elif stat == "minecraft:damage_taken": elif stat == "minecraft:damage_taken":
damage_taken.add_sample('damage_taken',value=value,labels={'player':name}) damage_taken.add_sample('mc_damage_taken',value=value,labels={'player':name})
elif stat == "minecraft:damage_dealt": elif stat == "minecraft:damage_dealt":
damage_dealt.add_sample('damage_dealt',value=value,labels={'player':name}) damage_dealt.add_sample('mc_damage_dealt',value=value,labels={'player':name})
elif stat == "minecraft:play_one_minute": elif stat == "minecraft:play_one_minute":
player_playtime.add_sample('player_playtime',value=value,labels={'player':name}) player_playtime.add_sample('mc_player_playtime',value=value,labels={'player':name})
elif stat == "minecraft:walk_one_cm": elif stat == "minecraft:walk_one_cm":
cm_traveled.add_sample("cm_traveled",value=value,labels={'player':name,'method':"walking"}) cm_traveled.add_sample("mc_cm_traveled",value=value,labels={'player':name,'method':"walking"})
elif stat == "minecraft:walk_on_water_one_cm": elif stat == "minecraft:walk_on_water_one_cm":
cm_traveled.add_sample("cm_traveled",value=value,labels={'player':name,'method':"swimming"}) cm_traveled.add_sample("mc_cm_traveled",value=value,labels={'player':name,'method':"swimming"})
elif stat == "minecraft:sprint_one_cm": elif stat == "minecraft:sprint_one_cm":
cm_traveled.add_sample("cm_traveled",value=value,labels={'player':name,'method':"sprinting"}) cm_traveled.add_sample("mc_cm_traveled",value=value,labels={'player':name,'method':"sprinting"})
elif stat == "minecraft:walk_under_water_one_cm": elif stat == "minecraft:walk_under_water_one_cm":
cm_traveled.add_sample("cm_traveled",value=value,labels={'player':name,'method':"diving"}) cm_traveled.add_sample("mc_cm_traveled",value=value,labels={'player':name,'method':"diving"})
elif stat == "minecraft:fall_one_cm": elif stat == "minecraft:fall_one_cm":
cm_traveled.add_sample("cm_traveled",value=value,labels={'player':name,'method':"falling"}) cm_traveled.add_sample("mc_cm_traveled",value=value,labels={'player':name,'method':"falling"})
elif stat == "minecraft:fly_one_cm": elif stat == "minecraft:fly_one_cm":
cm_traveled.add_sample("cm_traveled",value=value,labels={'player':name,'method':"flying"}) cm_traveled.add_sample("mc_cm_traveled",value=value,labels={'player':name,'method':"flying"})
elif stat == "minecraft:boat_one_cm": elif stat == "minecraft:boat_one_cm":
cm_traveled.add_sample("cm_traveled",value=value,labels={'player':name,'method':"boat"}) cm_traveled.add_sample("mc_cm_traveled",value=value,labels={'player':name,'method':"boat"})
elif stat == "minecraft:horse_one_cm": elif stat == "minecraft:horse_one_cm":
cm_traveled.add_sample("cm_traveled",value=value,labels={'player':name,'method':"horse"}) cm_traveled.add_sample("mc_cm_traveled",value=value,labels={'player':name,'method':"horse"})
elif stat == "minecraft:climb_one_cm": elif stat == "minecraft:climb_one_cm":
cm_traveled.add_sample("cm_traveled",value=value,labels={'player':name,'method':"climbing"}) cm_traveled.add_sample("mc_cm_traveled",value=value,labels={'player':name,'method':"climbing"})
elif stat == "minecraft:sleep_in_bed": elif stat == "minecraft:sleep_in_bed":
player_slept.add_sample('player_slept',value=value,labels={'player':name}) player_slept.add_sample('mc_player_slept',value=value,labels={'player':name})
elif stat == "minecraft:interact_with_crafting_table": 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('mc_player_used_crafting_table',value=value,labels={'player':name})
else: else:
mc_custom.add_sample('mc_custom',value=value,labels={'stat':stat}) 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]