1.0.2

* added tile entities

Author: phit

build.gradle

@@ -7,7 +7,7 @@ plugins {
 }
 
 group = 'de.sldk.mc.prometheusexporter'
-version = '1.0.1'
+version = '1.0.2'
 description = "Sponge Minecraft Prometheus Exporter"
 ext.url = 'https://github.com/Stonebound/minecraft-prometheus-exporter'
 

minecraft-grafana.json

@@ -42,7 +42,7 @@
   "gnetId": null,
   "graphTooltip": 1,
   "hideControls": false,
-  "id": 4,
+  "id": null,
   "links": [],
   "refresh": false,
   "rows": [
@@ -284,7 +284,7 @@
           "decimals": null,
           "format": "bytes",
           "gauge": {
-            "maxValue": 1000000000,
+            "maxValue": 6000000000,
             "minValue": 0,
             "show": true,
             "thresholdLabels": false,
@@ -335,7 +335,7 @@
               "step": 40
             }
           ],
-          "thresholds": "900000000",
+          "thresholds": "5500000000",
           "title": "JVM Memory Used",
           "type": "singlestat",
           "valueFontSize": "80%",
@@ -552,7 +552,7 @@
           "points": false,
           "renderer": "flot",
           "seriesOverrides": [],
-          "span": 12,
+          "span": 6,
           "stack": false,
           "steppedLine": false,
           "targets": [
@@ -562,7 +562,7 @@
               "legendFormat": "{{world}}_total",
               "metric": "mc_entities_total",
               "refId": "A",
-              "step": 2
+              "step": 4
             }
           ],
           "thresholds": [],
@@ -599,6 +599,78 @@
               "show": true
             }
           ]
+        },
+        {
+          "aliasColors": {},
+          "bars": false,
+          "datasource": "Local",
+          "fill": 1,
+          "id": 10,
+          "legend": {
+            "avg": false,
+            "current": false,
+            "max": false,
+            "min": false,
+            "show": true,
+            "total": false,
+            "values": false
+          },
+          "lines": true,
+          "linewidth": 1,
+          "links": [],
+          "nullPointMode": "null",
+          "percentage": false,
+          "pointradius": 5,
+          "points": false,
+          "renderer": "flot",
+          "seriesOverrides": [],
+          "span": 6,
+          "stack": false,
+          "steppedLine": false,
+          "targets": [
+            {
+              "expr": "mc_tile_entities_total{group=\"dw20\"}",
+              "intervalFactor": 2,
+              "legendFormat": "{{world}}_total",
+              "metric": "mc_entities_total",
+              "refId": "A",
+              "step": 4
+            }
+          ],
+          "thresholds": [],
+          "timeFrom": null,
+          "timeShift": null,
+          "title": "Tile Entities",
+          "tooltip": {
+            "shared": true,
+            "sort": 0,
+            "value_type": "individual"
+          },
+          "type": "graph",
+          "xaxis": {
+            "mode": "time",
+            "name": null,
+            "show": true,
+            "values": []
+          },
+          "yaxes": [
+            {
+              "format": "short",
+              "label": null,
+              "logBase": 1,
+              "max": null,
+              "min": null,
+              "show": true
+            },
+            {
+              "format": "short",
+              "label": null,
+              "logBase": 1,
+              "max": null,
+              "min": null,
+              "show": true
+            }
+          ]
         }
       ],
       "repeat": null,

src/main/java/de/sldk/mc/prometheusexporter/MetricsController.java

@@ -6,7 +6,6 @@
 import io.prometheus.client.exporter.common.TextFormat;
 import org.eclipse.jetty.server.Request;
 import org.eclipse.jetty.server.handler.AbstractHandler;
-import org.spongepowered.api.Sponge;
 import org.spongepowered.api.world.World;
 
 import javax.servlet.http.HttpServletRequest;
@@ -21,6 +20,7 @@ public class MetricsController extends AbstractHandler {
     private Gauge loadedChunks = Gauge.build().name("mc_loaded_chunks_total").help("Chunks loaded per world").labelNames("world").create().register();
     private Gauge playersOnline = Gauge.build().name("mc_players_online_total").help("Players currently online per world").labelNames("world").create().register();
     private Gauge entities = Gauge.build().name("mc_entities_total").help("Entities loaded per world").labelNames("world").create().register();
+    private Gauge tileEntities = Gauge.build().name("mc_tile_entities_total").help("Entities loaded per world").labelNames("world").create().register();
     private Gauge memory = Gauge.build().name("mc_jvm_memory").help("JVM memory usage").labelNames("type").create().register();
 
     public MetricsController(PrometheusExporter exporter) {
@@ -34,16 +34,17 @@ public void handle(String target, Request baseRequest, HttpServletRequest reques
         }
 
         players.clear();
-        players.labels("online").set(Sponge.getServer().getOnlinePlayers().size());
-        players.labels("max").set(Sponge.getServer().getMaxPlayers());
+        players.labels("online").set(exporter.getGame().getServer().getOnlinePlayers().size());
+        players.labels("max").set(exporter.getGame().getServer().getMaxPlayers());
 
-        for (World world : Sponge.getServer().getWorlds()) {
+        for (World world : exporter.getGame().getServer().getWorlds()) {
             loadedChunks.labels(world.getName()).set(Iterables.size(world.getLoadedChunks()));
             playersOnline.labels(world.getName()).set(world.getPlayers().size());
             entities.labels(world.getName()).set(world.getEntities().size());
+            tileEntities.labels(world.getName()).set(world.getTileEntities().size());
         }
 
-        tps.labels("tps").set(Sponge.getServer().getTicksPerSecond());
+        tps.labels("tps").set(exporter.getGame().getServer().getTicksPerSecond());
         memory.labels("max").set(Runtime.getRuntime().maxMemory());
         memory.labels("free").set(Runtime.getRuntime().freeMemory());
 

src/main/java/de/sldk/mc/prometheusexporter/PrometheusExporter.java

@@ -6,6 +6,7 @@
 import ninja.leaping.configurate.loader.ConfigurationLoader;
 import org.eclipse.jetty.server.Server;
 import org.slf4j.Logger;
+import org.spongepowered.api.Game;
 import org.spongepowered.api.config.DefaultConfig;
 import org.spongepowered.api.event.Listener;
 import org.spongepowered.api.event.game.state.GamePreInitializationEvent;
@@ -28,6 +29,9 @@ public class PrometheusExporter {
     @Inject
     Logger logger;
 
+    @Inject
+    private Game game;
+
     private Server server;
     private int port;
 
@@ -88,4 +92,8 @@ public void onGameStopping(GameStoppingServerEvent event) {
     public Logger getLogger() {
         return logger;
     }
+
+    public Game getGame() {
+        return game;
+    }
 }