From 007c2825a91e7a5f57adc0d1b18fbb378460e82b Mon Sep 17 00:00:00 2001 From: Jonas Friedmann Date: Fri, 19 Apr 2013 21:56:07 +0200 Subject: [PATCH] Fixed indentation + configurable SDK path --- plugins/minecraft/minecraft-jsonapi-players | 10 ++++++---- plugins/minecraft/minecraft-jsonapi-ramusage | 10 ++++++---- plugins/minecraft/minecraft-jsonapi-tps | 10 ++++++---- .../minecraft/minecraft-sql-statistician-hostile-kills | 4 ++-- .../minecraft/minecraft-sql-statistician-neutral-kills | 4 ++-- .../minecraft/minecraft-sql-statistician-newplayers | 4 ++-- .../minecraft/minecraft-sql-statistician-passive-kills | 4 ++-- plugins/minecraft/minecraft-sql-ultrabans-shame | 4 ++-- 8 files changed, 28 insertions(+), 22 deletions(-) diff --git a/plugins/minecraft/minecraft-jsonapi-players b/plugins/minecraft/minecraft-jsonapi-players index 34548064..39276e44 100644 --- a/plugins/minecraft/minecraft-jsonapi-players +++ b/plugins/minecraft/minecraft-jsonapi-players @@ -16,8 +16,10 @@ /** * JSONAPI configuration + * (get the SDK php file here: https://github.com/alecgorge/jsonapi/raw/master/sdk/php/JSONAPI.php) */ +$apisdk = '/var/cache/munin/JSONAPI.php'; $hostname = 'your-hostname'; $username = 'your-username'; $password = 'your-password'; @@ -30,18 +32,18 @@ $port = 20059; if ((count($argv) > 1) && ($argv[1] == 'config')) { -print("graph_title Bukkit / JSONAPI - players online + print("graph_title Bukkit / JSONAPI - players online graph_category bukkit_jsonapi graph_vlabel players graph_args --base 1000 -l 0 players.type GAUGE players.label players "); -exit(); + exit(); } -// Include JSONAPI.php SDK (get this file here: https://github.com/alecgorge/jsonapi/raw/master/sdk/php/JSONAPI.php) -require('/var/cache/munin/JSONAPI.php'); +// Include JSONAPI.php +require($apisdk); // Prepare API call $api = new JSONAPI($hostname, $port, $username, $password, $salt); diff --git a/plugins/minecraft/minecraft-jsonapi-ramusage b/plugins/minecraft/minecraft-jsonapi-ramusage index 67f1f8c4..49644aec 100644 --- a/plugins/minecraft/minecraft-jsonapi-ramusage +++ b/plugins/minecraft/minecraft-jsonapi-ramusage @@ -16,8 +16,10 @@ /** * JSONAPI configuration + * (get the SDK php file here: https://github.com/alecgorge/jsonapi/raw/master/sdk/php/JSONAPI.php) */ +$apisdk = '/var/cache/munin/JSONAPI.php'; $hostname = 'your-hostname'; $username = 'your-username'; $password = 'your-password'; @@ -30,7 +32,7 @@ $port = 20059; if ((count($argv) > 1) && ($argv[1] == 'config')) { -print("graph_title Bukkit / JSONAPI - RAM usage + print("graph_title Bukkit / JSONAPI - RAM usage graph_category bukkit_jsonapi graph_vlabel RAM usage in GB graph_args --base 1024 -l 0 @@ -39,11 +41,11 @@ total.type GAUGE used.label used used.type GAUGE "); -exit(); + exit(); } -// Include JSONAPI.php SDK (get this file here: https://github.com/alecgorge/jsonapi/raw/master/sdk/php/JSONAPI.php) -require('/var/cache/munin/JSONAPI.php'); +// Include JSONAPI.php +require($apisdk); // Prepare API call $api = new JSONAPI($hostname, $port, $username, $password, $salt); diff --git a/plugins/minecraft/minecraft-jsonapi-tps b/plugins/minecraft/minecraft-jsonapi-tps index fb2e52e3..09a040f4 100644 --- a/plugins/minecraft/minecraft-jsonapi-tps +++ b/plugins/minecraft/minecraft-jsonapi-tps @@ -16,8 +16,10 @@ /** * JSONAPI configuration + * (get the SDK php file here: https://github.com/alecgorge/jsonapi/raw/master/sdk/php/JSONAPI.php) */ +$apisdk = '/var/cache/munin/JSONAPI.php'; $hostname = 'your-hostname'; $username = 'your-username'; $password = 'your-password'; @@ -30,18 +32,18 @@ $port = 20059; if ((count($argv) > 1) && ($argv[1] == 'config')) { -print("graph_title Bukkit / JSONAPI - ticks per second (TPS) + print("graph_title Bukkit / JSONAPI - ticks per second (TPS) graph_category bukkit_jsonapi graph_vlabel ticks per second graph_args --base 1000 -l 0 tps.type GAUGE tps.label TPS "); -exit(); + exit(); } -// Include JSONAPI.php SDK (get this file here: https://github.com/alecgorge/jsonapi/raw/master/sdk/php/JSONAPI.php) -require('/var/cache/munin/JSONAPI.php'); +// Include JSONAPI.php +require($apisdk); // Prepare API call $api = new JSONAPI($hostname, $port, $username, $password, $salt); diff --git a/plugins/minecraft/minecraft-sql-statistician-hostile-kills b/plugins/minecraft/minecraft-sql-statistician-hostile-kills index 1afb5969..151e770d 100644 --- a/plugins/minecraft/minecraft-sql-statistician-hostile-kills +++ b/plugins/minecraft/minecraft-sql-statistician-hostile-kills @@ -31,7 +31,7 @@ $port = 3306; if ((count($argv) > 1) && ($argv[1] == 'config')) { -print("graph_title Bukkit / Statistician - hostile mob kills per day + print("graph_title Bukkit / Statistician - hostile mob kills per day graph_category bukkit_sql_kills graph_vlabel hostile mob kills per day graph_args --base 1000 -l 0 @@ -62,7 +62,7 @@ enderdragon.label killed ender dragons wither.type GAUGE wither.label killed withers "); -exit(); + exit(); } ## Construct 'minumum' timstamp diff --git a/plugins/minecraft/minecraft-sql-statistician-neutral-kills b/plugins/minecraft/minecraft-sql-statistician-neutral-kills index a4d5b93e..74fe17ff 100644 --- a/plugins/minecraft/minecraft-sql-statistician-neutral-kills +++ b/plugins/minecraft/minecraft-sql-statistician-neutral-kills @@ -31,7 +31,7 @@ $port = 3306; if ((count($argv) > 1) && ($argv[1] == 'config')) { -print("graph_title Bukkit / Statistician - neutral mob kills per day + print("graph_title Bukkit / Statistician - neutral mob kills per day graph_category bukkit_sql_kills graph_vlabel neutral mob kills per day graph_args --base 1000 -l 0 @@ -44,7 +44,7 @@ zombiepigman.label killed zombie pigmen snowman.type GAUGE snowman.label killed snowmen "); -exit(); + exit(); } // Construct 'minumum' timstamp diff --git a/plugins/minecraft/minecraft-sql-statistician-newplayers b/plugins/minecraft/minecraft-sql-statistician-newplayers index 3722dbeb..2cdf1e10 100644 --- a/plugins/minecraft/minecraft-sql-statistician-newplayers +++ b/plugins/minecraft/minecraft-sql-statistician-newplayers @@ -31,14 +31,14 @@ $port = 3306; if ((count($argv) > 1) && ($argv[1] == 'config')) { -print("graph_title Bukkit / Statistician - new players per day + print("graph_title Bukkit / Statistician - new players per day graph_category bukkit_sql graph_vlabel new players per day graph_args --base 1000 -l 0 players.type GAUGE players.label new players "); -exit(); + exit(); } // Construct 'minumum' timstamp diff --git a/plugins/minecraft/minecraft-sql-statistician-passive-kills b/plugins/minecraft/minecraft-sql-statistician-passive-kills index 7fa06b3e..9d287316 100644 --- a/plugins/minecraft/minecraft-sql-statistician-passive-kills +++ b/plugins/minecraft/minecraft-sql-statistician-passive-kills @@ -31,7 +31,7 @@ $port = 3306; if ((count($argv) > 1) && ($argv[1] == 'config')) { -print("graph_title Bukkit / Statistician - passive mob kills per day + print("graph_title Bukkit / Statistician - passive mob kills per day graph_category bukkit_sql_kills graph_vlabel passive mob kills per day graph_args --base 1000 -l 0 @@ -54,7 +54,7 @@ squid.label killed squids villager.type GAUGE villager.label killed villager "); -exit(); + exit(); } // Construct 'minumum' timstamp diff --git a/plugins/minecraft/minecraft-sql-ultrabans-shame b/plugins/minecraft/minecraft-sql-ultrabans-shame index dc63b08c..4e184d21 100644 --- a/plugins/minecraft/minecraft-sql-ultrabans-shame +++ b/plugins/minecraft/minecraft-sql-ultrabans-shame @@ -32,7 +32,7 @@ $port = 3306; if ((count($argv) > 1) && ($argv[1] == 'config')) { -print("graph_title Bukkit / Ultrabans - shame per day + print("graph_title Bukkit / Ultrabans - shame per day graph_category bukkit_sql graph_vlabel amount of shame per day graph_args --base 1000 -l 0 @@ -55,7 +55,7 @@ permban.label permbans mute.type GAUGE mute.label mutes "); -exit(); + exit(); } // Construct 'minumum' timstamp