From 56a32e3126f35b4fa9f0fba84d46c5c97cc762e8 Mon Sep 17 00:00:00 2001
From: Tom Hughes <tom@compton.nu>
Date: Thu, 29 Aug 2013 17:39:16 +0100
Subject: [PATCH 1/1] Remove local copies of mod_tile and renderd mumin plugins

---
 .../files/default/plugins/mod_tile_fresh      |  47 -----
 .../files/default/plugins/mod_tile_latency    | 178 ------------------
 .../files/default/plugins/mod_tile_response   |  48 -----
 .../files/default/plugins/renderd_processed   |  60 ------
 .../munin/files/default/plugins/renderd_queue |  40 ----
 .../munin/files/default/plugins/renderd_zoom  |  72 -------
 .../files/default/plugins/renderd_zoom_time   |  76 --------
 7 files changed, 521 deletions(-)
 delete mode 100755 cookbooks/munin/files/default/plugins/mod_tile_fresh
 delete mode 100755 cookbooks/munin/files/default/plugins/mod_tile_latency
 delete mode 100755 cookbooks/munin/files/default/plugins/mod_tile_response
 delete mode 100755 cookbooks/munin/files/default/plugins/renderd_processed
 delete mode 100755 cookbooks/munin/files/default/plugins/renderd_queue
 delete mode 100755 cookbooks/munin/files/default/plugins/renderd_zoom
 delete mode 100755 cookbooks/munin/files/default/plugins/renderd_zoom_time

diff --git a/cookbooks/munin/files/default/plugins/mod_tile_fresh b/cookbooks/munin/files/default/plugins/mod_tile_fresh
deleted file mode 100755
index 55aef1431..000000000
--- a/cookbooks/munin/files/default/plugins/mod_tile_fresh
+++ /dev/null
@@ -1,47 +0,0 @@
-#!/bin/sh
-#
-# Plugin to monitor the state / freshness  of the tiles returned by mod_tile
-#
-# Parameters: 
-#
-# 	config   (required)
-# 	autoconf (optional - used by munin-config)
-#
-
-if [ "$1" = "config" ]; then
-
-	echo 'graph_title freshness of served tiles'
-	echo 'graph_args --base 1000 -l 0'
-	echo 'graph_vlabel tiles per ${graph_period}'
-	echo 'graph_category mod_tile'
-	echo 'fresh.label Fresh from disk'
-	echo 'fresh.draw AREA'
-	echo 'fresh.type DERIVE'
-	echo 'fresh.min 0'
-	echo 'freshrender.label Freshly rendered'
-	echo 'freshrender.draw STACK'
-	echo 'freshrender.type DERIVE'
-	echo 'freshrender.min 0'
-	echo 'old.label Old from disk'
-	echo 'old.draw STACK'
-	echo 'old.type DERIVE'
-	echo 'old.min 0'
-	echo 'oldrender.label Old tile, attempted render'
-	echo 'oldrender.draw STACK'
-	echo 'oldrender.type DERIVE'
-	echo 'oldrender.min 0'
-
-	exit 0
-fi
-
-data=`wget -q http://localhost/mod_tile -O -`
-
-fresh=`expr match "$data" '.*NoFreshCache: \([0-9]*\)'`
-freshRender=`expr match "$data" '.*NoFreshRender: \([0-9]*\)'`
-old=`expr match "$data" '.*NoOldCache: \([0-9]*\)'`
-oldRender=`expr match "$data" '.*NoOldRender: \([0-9]*\)'`
-
-echo "fresh.value " $fresh
-echo "freshrender.value " $freshRender
-echo "old.value " $old
-echo "oldrender.value " $oldRender
diff --git a/cookbooks/munin/files/default/plugins/mod_tile_latency b/cookbooks/munin/files/default/plugins/mod_tile_latency
deleted file mode 100755
index e2a6f5af1..000000000
--- a/cookbooks/munin/files/default/plugins/mod_tile_latency
+++ /dev/null
@@ -1,178 +0,0 @@
-#!/bin/sh
-#
-# Plugin to monitor the state / freshness  of the tiles returned by mod_tile
-#
-# Parameters: 
-#
-# 	config   (required)
-# 	autoconf (optional - used by munin-config)
-#
-
-if [ "$1" = "config" ]; then
-
-	echo 'graph_title avg latency of tile retrival from disk'
-	echo 'graph_args --base 1000 -l 0'
-	echo 'graph_vlabel latency in s'
-	echo 'graph_category mod_tile'
-	echo 'total.label All served tiles'
-	echo 'total.draw LINE2'
-	echo 'total.type GAUGE'
-	echo 'total.min 0'
-    echo 'z1.label z1-8'
-	echo 'z1.draw LINE1'
-	echo 'z1.type GAUGE'
-	echo 'z1.min 0'
-    echo 'z2.label z9-12'
-	echo 'z2.draw LINE1'
-	echo 'z2.type GAUGE'
-	echo 'z2.min 0'
-    echo 'z3.label z13-14'
-	echo 'z3.draw LINE1'
-	echo 'z3.type GAUGE'
-	echo 'z3.min 0'
-    echo 'z4.label z15-16'
-	echo 'z4.draw LINE1'
-	echo 'z4.type GAUGE'
-	echo 'z4.min 0'
-    echo 'z5.label z17-18'
-	echo 'z5.draw LINE1'
-	echo 'z5.type GAUGE'
-	echo 'z5.min 0'
-	exit 0
-fi
-
-MUNIN_STATEFILE=/tmp/munin-mod-tile-latency.state
-
-data=`wget -q http://localhost/mod_tile -O -`
-
-
-totalDuration=`expr match "$data" '.*DurationTileBufferReads: \([0-9]*\)'`
-noTotal=`expr match "$data" '.*NoTileBufferReads: \([0-9]*\)'`
-totalDurationPrev=`sed -e '/^DurationTileBufferReads/!d' -e 's/.*: //' -e q $MUNIN_STATEFILE`
-noTotalPrev=`sed -e '/^NoTileBufferReads/!d' -e 's/.*: //' -e q $MUNIN_STATEFILE`
-
-z0Duration=`expr match "$data" '.*DurationTileBufferReadZoom00: \([0-9]*\)'`
-z1Duration=`expr match "$data" '.*DurationTileBufferReadZoom01: \([0-9]*\)'`
-z2Duration=`expr match "$data" '.*DurationTileBufferReadZoom02: \([0-9]*\)'`
-z3Duration=`expr match "$data" '.*DurationTileBufferReadZoom03: \([0-9]*\)'`
-z4Duration=`expr match "$data" '.*DurationTileBufferReadZoom04: \([0-9]*\)'`
-z5Duration=`expr match "$data" '.*DurationTileBufferReadZoom05: \([0-9]*\)'`
-z6Duration=`expr match "$data" '.*DurationTileBufferReadZoom06: \([0-9]*\)'`
-z7Duration=`expr match "$data" '.*DurationTileBufferReadZoom07: \([0-9]*\)'`
-z8Duration=`expr match "$data" '.*DurationTileBufferReadZoom08: \([0-9]*\)'`
-z9Duration=`expr match "$data" '.*DurationTileBufferReadZoom09: \([0-9]*\)'`
-z10Duration=`expr match "$data" '.*DurationTileBufferReadZoom10: \([0-9]*\)'`
-z11Duration=`expr match "$data" '.*DurationTileBufferReadZoom11: \([0-9]*\)'`
-z12Duration=`expr match "$data" '.*DurationTileBufferReadZoom12: \([0-9]*\)'`
-z13Duration=`expr match "$data" '.*DurationTileBufferReadZoom13: \([0-9]*\)'`
-z14Duration=`expr match "$data" '.*DurationTileBufferReadZoom14: \([0-9]*\)'`
-z15Duration=`expr match "$data" '.*DurationTileBufferReadZoom15: \([0-9]*\)'`
-z16Duration=`expr match "$data" '.*DurationTileBufferReadZoom16: \([0-9]*\)'`
-z17Duration=`expr match "$data" '.*DurationTileBufferReadZoom17: \([0-9]*\)'`
-z18Duration=`expr match "$data" '.*DurationTileBufferReadZoom18: \([0-9]*\)'`
-
-z0NoServed=`expr match "$data" '.*NoTileBufferReadZoom00: \([0-9]*\)'`
-z1NoServed=`expr match "$data" '.*NoTileBufferReadZoom01: \([0-9]*\)'`
-z2NoServed=`expr match "$data" '.*NoTileBufferReadZoom02: \([0-9]*\)'`
-z3NoServed=`expr match "$data" '.*NoTileBufferReadZoom03: \([0-9]*\)'`
-z4NoServed=`expr match "$data" '.*NoTileBufferReadZoom04: \([0-9]*\)'`
-z5NoServed=`expr match "$data" '.*NoTileBufferReadZoom05: \([0-9]*\)'`
-z6NoServed=`expr match "$data" '.*NoTileBufferReadZoom06: \([0-9]*\)'`
-z7NoServed=`expr match "$data" '.*NoTileBufferReadZoom07: \([0-9]*\)'`
-z8NoServed=`expr match "$data" '.*NoTileBufferReadZoom08: \([0-9]*\)'`
-z9NoServed=`expr match "$data" '.*NoTileBufferReadZoom09: \([0-9]*\)'`
-z10NoServed=`expr match "$data" '.*NoTileBufferReadZoom10: \([0-9]*\)'`
-z11NoServed=`expr match "$data" '.*NoTileBufferReadZoom11: \([0-9]*\)'`
-z12NoServed=`expr match "$data" '.*NoTileBufferReadZoom12: \([0-9]*\)'`
-z13NoServed=`expr match "$data" '.*NoTileBufferReadZoom13: \([0-9]*\)'`
-z14NoServed=`expr match "$data" '.*NoTileBufferReadZoom14: \([0-9]*\)'`
-z15NoServed=`expr match "$data" '.*NoTileBufferReadZoom15: \([0-9]*\)'`
-z16NoServed=`expr match "$data" '.*NoTileBufferReadZoom16: \([0-9]*\)'`
-z17NoServed=`expr match "$data" '.*NoTileBufferReadZoom17: \([0-9]*\)'`
-z18NoServed=`expr match "$data" '.*NoTileBufferReadZoom18: \([0-9]*\)'`
-
-zl1Duration=`expr $z0Duration + $z1Duration + $z2Duration + $z3Duration + $z4Duration + $z5Duration + $z6Duration + $z7Duration + $z8Duration`
-zl1NoServed=`expr $z0NoServed + $z1NoServed + $z2NoServed + $z3NoServed + $z4NoServed + $z5NoServed + $z6NoServed + $z7NoServed + $z8NoServed`
-zl2Duration=`expr $z9Duration + $z10Duration + $z11Duration + $z12Duration`
-zl2NoServed=`expr $z9NoServed + $z10NoServed + $z11NoServed + $z12NoServed`
-zl3Duration=`expr $z13Duration + $z14Duration`
-zl3NoServed=`expr $z13NoServed + $z14NoServed`
-zl4Duration=`expr $z15Duration + $z16Duration`
-zl4NoServed=`expr $z15NoServed + $z16NoServed`
-zl5Duration=`expr $z17Duration + $z18Duration`
-zl5NoServed=`expr $z17NoServed + $z18NoServed`
-
-zl1DurationPrev=`sed -e '/^DurationTileBufferReadZoomGroup1/!d' -e 's/.*: //' -e q $MUNIN_STATEFILE`
-zl1NoServedPrev=`sed -e '/^NoTileBufferReadZoomGroup1/!d' -e 's/.*: //' -e q $MUNIN_STATEFILE`
-zl2DurationPrev=`sed -e '/^DurationTileBufferReadZoomGroup2/!d' -e 's/.*: //' -e q $MUNIN_STATEFILE`
-zl2NoServedPrev=`sed -e '/^NoTileBufferReadZoomGroup2/!d' -e 's/.*: //' -e q $MUNIN_STATEFILE`
-zl3DurationPrev=`sed -e '/^DurationTileBufferReadZoomGroup3/!d' -e 's/.*: //' -e q $MUNIN_STATEFILE`
-zl3NoServedPrev=`sed -e '/^NoTileBufferReadZoomGroup3/!d' -e 's/.*: //' -e q $MUNIN_STATEFILE`
-zl4DurationPrev=`sed -e '/^DurationTileBufferReadZoomGroup4/!d' -e 's/.*: //' -e q $MUNIN_STATEFILE`
-zl4NoServedPrev=`sed -e '/^NoTileBufferReadZoomGroup4/!d' -e 's/.*: //' -e q $MUNIN_STATEFILE`
-zl5DurationPrev=`sed -e '/^DurationTileBufferReadZoomGroup5/!d' -e 's/.*: //' -e q $MUNIN_STATEFILE`
-zl5NoServedPrev=`sed -e '/^NoTileBufferReadZoomGroup5/!d' -e 's/.*: //' -e q $MUNIN_STATEFILE`
-
-
-echo "DurationTileBufferReads: $totalDuration" > $MUNIN_STATEFILE
-echo "NoTileBufferReads: $noTotal" >> $MUNIN_STATEFILE
-echo "DurationTileBufferReadZoomGroup1: $zl1Duration" >> $MUNIN_STATEFILE
-echo "NoTileBufferReadZoomGroup1: $zl1NoServed" >> $MUNIN_STATEFILE
-echo "DurationTileBufferReadZoomGroup2: $zl2Duration" >> $MUNIN_STATEFILE
-echo "NoTileBufferReadZoomGroup2: $zl2NoServed" >> $MUNIN_STATEFILE
-echo "DurationTileBufferReadZoomGroup3: $zl3Duration" >> $MUNIN_STATEFILE
-echo "NoTileBufferReadZoomGroup3: $zl3NoServed" >> $MUNIN_STATEFILE
-echo "DurationTileBufferReadZoomGroup4: $zl4Duration" >> $MUNIN_STATEFILE
-echo "NoTileBufferReadZoomGroup4: $zl4NoServed" >> $MUNIN_STATEFILE
-echo "DurationTileBufferReadZoomGroup5: $zl5Duration" >> $MUNIN_STATEFILE
-echo "NoTileBufferReadZoomGroup5: $zl5NoServed" >> $MUNIN_STATEFILE
-
-
-if [ "$noTotal" = "$noTotalPrev" ];
-then
-    totalLatency=0
-else
-    totalLatency=$(echo "$totalDuration $totalDurationPrev $noTotal $noTotalPrev" | awk '{ totalLat = ($1 - $2) / ($3 - $4) / 1000000.0; print totalLat}' )
-fi
-
-if [ "$zl1NoServed" = "$zl1NoServedPrev" ];
-then
-    zl1Latency=0
-else
-    zl1Latency=$(echo "$zl1Duration $zl1DurationPrev $zl1NoServed $zl1NoServedPrev" | awk '{ zl1Lat = ($1 - $2) / ($3 - $4) / 1000000.0; print zl1Lat}' )
-fi
-
-if [ "$zl2NoServed" = "$zl2NoServedPrev" ];
-then
-    zl2Latency=0
-else
-    zl2Latency=$(echo "$zl2Duration $zl2DurationPrev $zl2NoServed $zl2NoServedPrev" | awk '{ zl2Lat = ($1 - $2) / ($3 - $4) / 1000000.0; print zl2Lat}' )
-fi
-
-if [ "$zl3NoServed" = "$zl3NoServedPrev" ];
-then
-    zl3Latency=0
-else
-    zl3Latency=$(echo "$zl3Duration $zl3DurationPrev $zl3NoServed $zl3NoServedPrev" | awk '{ zl3Lat = ($1 - $2) / ($3 - $4) / 1000000.0; print zl3Lat}' )
-fi
-
-if [ "$zl4NoServed" = "$zl4NoServedPrev" ];
-then
-    zl4Latency=0
-else
-    zl4Latency=$(echo "$zl4Duration $zl4DurationPrev $zl4NoServed $zl4NoServedPrev" | awk '{ zl4Lat = ($1 - $2) / ($3 - $4) / 1000000.0; print zl4Lat}' )
-fi
-
-if [ "$zl5NoServed" = "$zl5NoServedPrev" ];
-then
-    zl5Latency=0
-else
-    zl5Latency=$(echo "$zl5Duration $zl5DurationPrev $zl5NoServed $zl5NoServedPrev" | awk '{ zl5Lat = ($1 - $2) / ($3 - $4) / 1000000.0; print zl5Lat}' )
-fi
-
-echo "total.value " $totalLatency
-echo "z1.value " $zl1Latency
-echo "z2.value " $zl2Latency
-echo "z3.value " $zl3Latency
-echo "z4.value " $zl4Latency
-echo "z5.value " $zl5Latency
diff --git a/cookbooks/munin/files/default/plugins/mod_tile_response b/cookbooks/munin/files/default/plugins/mod_tile_response
deleted file mode 100755
index 2a098af76..000000000
--- a/cookbooks/munin/files/default/plugins/mod_tile_response
+++ /dev/null
@@ -1,48 +0,0 @@
-#!/bin/sh
-#
-# Plugin to monitor the response codes of tiles returned by mod_tile
-#
-# Parameters: 
-#
-# 	config   (required)
-# 	autoconf (optional - used by munin-config)
-#
-
-if [ "$1" = "config" ]; then
-
-	echo 'graph_title mod_tile HTTP response codes'
-	echo 'graph_args --base 1000 -l 0'
-	echo 'graph_vlabel responses per ${graph_period}'
-	echo 'graph_category mod_tile'
-	echo 'response200.label 200 OK'
-	echo 'response200.draw AREA'
-	echo 'response200.type DERIVE'
-	echo 'response200.min 0'
-	echo 'response304.label 304 Not Modified'
-	echo 'response304.draw STACK'
-	echo 'response304.type DERIVE'
-	echo 'response304.min 0'
-	echo 'response404.label 404 Not Found'
-	echo 'response404.draw STACK'
-	echo 'response404.type DERIVE'
-	echo 'response404.min 0'
-	echo 'response500.label 500 Internal Error'
-	echo 'response500.draw STACK'
-	echo 'response500.type DERIVE'
-	echo 'response500.min 0'
-
-	exit 0
-fi
-
-
-data=`wget -q http://localhost/mod_tile -O -`
-
-ok_resp=`expr match "$data" '.*NoResp200: \([0-9]*\)'`
-nm_resp=`expr match "$data" '.*NoResp304: \([0-9]*\)'`
-fnf_resp=`expr match "$data" '.*NoResp404: \([0-9]*\)'`
-error_resp=`expr match "$data" '.*NoResp5XX: \([0-9]*\)'`
-
-echo "response200.value " $ok_resp
-echo "response304.value " $nm_resp
-echo "response404.value " $fnf_resp
-echo "response500.value " $error_resp
diff --git a/cookbooks/munin/files/default/plugins/renderd_processed b/cookbooks/munin/files/default/plugins/renderd_processed
deleted file mode 100755
index 9cc953bed..000000000
--- a/cookbooks/munin/files/default/plugins/renderd_processed
+++ /dev/null
@@ -1,60 +0,0 @@
-#!/bin/sh
-#
-# Plugin to monitor the rendering throughput of Renderd
-#
-# Parameters: 
-#
-# 	config   (required)
-# 	autoconf (optional - used by munin-config)
-#
-
-if [ "$1" = "config" ]; then
-
-	echo 'graph_title Renderd throughput'
-	echo 'graph_args --base 1000 -l 0'
-	echo 'graph_vlabel Metatiles per ${graph_period}'
-	echo 'graph_category renderd'
-	echo 'graph_info Displays the number of metatiles being rendered by renderd per ${graph_period}'
-	echo 'req.label Request Queue'
-	echo 'req.type DERIVE'
-	echo 'req.min 0'
-	echo 'req.draw AREA'
-	echo 'req.info Throughput of Metatiles submitted for on the fly rendering'
-	echo 'reqPrio.label Priority request Queue'
-	echo 'reqPrio.type DERIVE'
-	echo 'reqPrio.min 0'
-	echo 'reqPrio.draw STACK'
-	echo 'reqPrio.info Throughput of Metatiles submitted high priority for on the fly rendering'
-	echo 'dirty.label Dirty Queue'
-	echo 'dirty.type DERIVE'
-	echo 'dirty.min 0'
-	echo 'dirty.draw STACK'
-	echo 'dirty.info Throughput of dirty Metatiles submitted for re-render'
-	echo 'reqBulk.label Bulk request Queue'
-	echo 'reqBulk.type DERIVE'
-	echo 'reqBulk.min 0'
-	echo 'reqBulk.draw STACK'
-	echo 'reqBulk.info Throughput of Metatiles submitted with background priority'
-	echo 'dropped.label Dropped (x20)'
-	echo 'dropped.type DERIVE'
-	echo 'dropped.min 0'
-	echo 'dropped.draw LINE2'
-	echo 'dropped.info Number of Tiles dropped due to queue overload (x20)'
-	echo 'dropped.cdef dropped,20,/'
-	exit 0
-fi
-
-reqprocessed=`sed -e '/^ReqRendered/!d' -e 's/.*: //' -e q /var/run/renderd/renderd.stats`
-reqprioprocessed=`sed -e '/^ReqPrioRendered/!d' -e 's/.*: //' -e q /var/run/renderd/renderd.stats`
-dirtprocessed=`sed -e '/^DirtyRendered/!d' -e 's/.*: //' -e q /var/run/renderd/renderd.stats`
-reqbulkprocessed=`sed -e '/^ReqBulkRendered/!d' -e 's/.*: //' -e q /var/run/renderd/renderd.stats`
-dropped=`sed -e '/^DropedRequest/!d' -e 's/.*: //' -e q /var/run/renderd/renderd.stats`
-
-echo "req.value " $reqprocessed
-echo "reqPrio.value " $reqprioprocessed
-echo "dirty.value " $dirtprocessed
-echo "reqBulk.value " $reqbulkprocessed
-echo "dropped.value " $dropped
-
-#  LocalWords:  reqprocessed ReqRendered dirtprocessed DirtyRendered req
-#  LocalWords:  DropedRequest
diff --git a/cookbooks/munin/files/default/plugins/renderd_queue b/cookbooks/munin/files/default/plugins/renderd_queue
deleted file mode 100755
index 1bd79d18d..000000000
--- a/cookbooks/munin/files/default/plugins/renderd_queue
+++ /dev/null
@@ -1,40 +0,0 @@
-#!/bin/sh
-#
-# Plugin to monitor queue length of tiles submited for rendering in renderd
-#
-# Parameters: 
-#
-# 	config   (required)
-# 	autoconf (optional - used by munin-config)
-#
-
-if [ "$1" = "config" ]; then
-
-	echo 'graph_title Renderd queue length'
-	echo 'graph_args --base 1000 -l 0'
-	echo 'graph_vlabel metatiles'
-	echo 'graph_category renderd'
-	echo 'req.label Request Queue'
-	echo 'req.type GAUGE'
-	echo 'req.max 100'
-	echo 'reqPrio.label Priority request Queue'
-	echo 'reqPrio.type GAUGE'
-	echo 'reqPrio.max 100'
-	echo 'dirty.label Dirty Queue'
-	echo 'dirty.type GAUGE'
-	echo 'dirty.max 1000'
-	echo 'reqBulk.label Bulk request Queue'
-	echo 'reqBulk.type GAUGE'
-	echo 'reqBulk.max 100'
-	exit 0
-fi
-
-reqlength=`sed -e '/^ReqQueueLength/!d' -e 's/.*: //' -e q /var/run/renderd/renderd.stats`
-reqpriolength=`sed -e '/^ReqPrioQueueLength/!d' -e 's/.*: //' -e q /var/run/renderd/renderd.stats`
-reqbulklength=`sed -e '/^ReqBulkQueueLength/!d' -e 's/.*: //' -e q /var/run/renderd/renderd.stats`
-dirtlength=`sed -e '/^DirtQueueLength/!d' -e 's/.*: //' -e q /var/run/renderd/renderd.stats`
-
-echo "req.value " $reqlength
-echo "reqPrio.value " $reqpriolength
-echo "dirty.value " $dirtlength
-echo "reqBulk.value " $reqbulklength
diff --git a/cookbooks/munin/files/default/plugins/renderd_zoom b/cookbooks/munin/files/default/plugins/renderd_zoom
deleted file mode 100755
index 19cdd7233..000000000
--- a/cookbooks/munin/files/default/plugins/renderd_zoom
+++ /dev/null
@@ -1,72 +0,0 @@
-#!/bin/sh
-#
-# Plugin to monitor the rendering throughput of Renderd
-#
-# Parameters: 
-#
-# 	config   (required)
-# 	autoconf (optional - used by munin-config)
-#
-
-if [ "$1" = "config" ]; then
-
-	echo 'graph_title Renderd throughput by zoom'
-	echo 'graph_args --base 1000 -l 0'
-	echo 'graph_vlabel Metatiles per ${graph_period}'
-	echo 'graph_category renderd'
-	echo 'graph_info Displays the number of metatiles being rendered by renderd per ${graph_period}'
-	echo 'lowest.label zoom z0 - z8'
-	echo 'lowest.type DERIVE'
-	echo 'lowest.min 0'
-	echo 'lowest.draw AREA'
-	echo 'lowest.info Throughput of Metatiles for z0 - z8'
-	echo 'low.label zoom z9 - z12'
-	echo 'low.type DERIVE'
-	echo 'low.min 0'
-	echo 'low.draw STACK'
-	echo 'low.info Throughput of Metatiles for z9 - z12'
-	echo 'medium.label zoom z13 - z14'
-	echo 'medium.type DERIVE'
-	echo 'medium.min 0'
-	echo 'medium.draw STACK'
-	echo 'medium.info Throughput of Metatiles for z13 - z14'
-	echo 'high.label zoom z15 - z16'
-	echo 'high.type DERIVE'
-	echo 'high.min 0'
-	echo 'high.draw STACK'
-	echo 'high.info Throughput of Metatiles for z15 - z16'
-	echo 'highest.label zoom z17 - z18'
-	echo 'highest.type DERIVE'
-	echo 'highest.min 0'
-	echo 'highest.draw STACK'
-	echo 'highest.info Throughput of Metatiles for z17 - z18'
-
-	exit 0
-fi
-
-req0=`sed -e '/^ZoomRendered00/!d' -e 's/.*: //' -e q /var/run/renderd/renderd.stats`
-req1=`sed -e '/^ZoomRendered01/!d' -e 's/.*: //' -e q /var/run/renderd/renderd.stats`
-req2=`sed -e '/^ZoomRendered02/!d' -e 's/.*: //' -e q /var/run/renderd/renderd.stats`
-req3=`sed -e '/^ZoomRendered03/!d' -e 's/.*: //' -e q /var/run/renderd/renderd.stats`
-req4=`sed -e '/^ZoomRendered04/!d' -e 's/.*: //' -e q /var/run/renderd/renderd.stats`
-req5=`sed -e '/^ZoomRendered05/!d' -e 's/.*: //' -e q /var/run/renderd/renderd.stats`
-req6=`sed -e '/^ZoomRendered06/!d' -e 's/.*: //' -e q /var/run/renderd/renderd.stats`
-req7=`sed -e '/^ZoomRendered07/!d' -e 's/.*: //' -e q /var/run/renderd/renderd.stats`
-req8=`sed -e '/^ZoomRendered08/!d' -e 's/.*: //' -e q /var/run/renderd/renderd.stats`
-req9=`sed -e '/^ZoomRendered09/!d' -e 's/.*: //' -e q /var/run/renderd/renderd.stats`
-req10=`sed -e '/^ZoomRendered10/!d' -e 's/.*: //' -e q /var/run/renderd/renderd.stats`
-req11=`sed -e '/^ZoomRendered11/!d' -e 's/.*: //' -e q /var/run/renderd/renderd.stats`
-req12=`sed -e '/^ZoomRendered12/!d' -e 's/.*: //' -e q /var/run/renderd/renderd.stats`
-req13=`sed -e '/^ZoomRendered13/!d' -e 's/.*: //' -e q /var/run/renderd/renderd.stats`
-req14=`sed -e '/^ZoomRendered14/!d' -e 's/.*: //' -e q /var/run/renderd/renderd.stats`
-req15=`sed -e '/^ZoomRendered15/!d' -e 's/.*: //' -e q /var/run/renderd/renderd.stats`
-req16=`sed -e '/^ZoomRendered16/!d' -e 's/.*: //' -e q /var/run/renderd/renderd.stats`
-req17=`sed -e '/^ZoomRendered17/!d' -e 's/.*: //' -e q /var/run/renderd/renderd.stats`
-req18=`sed -e '/^ZoomRendered18/!d' -e 's/.*: //' -e q /var/run/renderd/renderd.stats`
-
-
-echo "lowest.value " `expr $req0 + $req1 + + $req2 + $req3 + $req4 + $req5 + $req6 + $req7 + $req8`
-echo "low.value " `expr $req9 + $req10 + + $req11 + $req12`
-echo "medium.value " `expr $req13 + $req14`
-echo "high.value " `expr $req15 + $req16`
-echo "highest.value " `expr $req17 + $req18`
\ No newline at end of file
diff --git a/cookbooks/munin/files/default/plugins/renderd_zoom_time b/cookbooks/munin/files/default/plugins/renderd_zoom_time
deleted file mode 100755
index b2163e284..000000000
--- a/cookbooks/munin/files/default/plugins/renderd_zoom_time
+++ /dev/null
@@ -1,76 +0,0 @@
-#!/bin/sh
-#
-# Plugin to monitor the rendering throughput of Renderd
-#
-# Parameters: 
-#
-# 	config   (required)
-# 	autoconf (optional - used by munin-config)
-#
-
-if [ "$1" = "config" ]; then
-
-	echo 'graph_title Renderd time spent by zoom'
-	echo 'graph_args --base 1000 -l 0'
-	echo 'graph_vlabel time spent per ${graph_period}'
-	echo 'graph_category renderd'
-	echo 'graph_info Displays the amount of time renderd has spent rendering tiles of a given zoom per ${graph_period}'
-	echo 'zoomtime1.label zoom z0 - z8'
-	echo 'zoomtime1.type DERIVE'
-	echo 'zoomtime1.min 0'
-	echo 'zoomtime1.cdef zoomtime1,1000,/'
-	echo 'zoomtime1.draw AREA'
-	echo 'zoomtime1.info Time for Metatiles z0 - z8'
-	echo 'zoomtime2.label zoom z9 - z12'
-	echo 'zoomtime2.type DERIVE'
-	echo 'zoomtime2.min 0'
-	echo 'zoomtime2.cdef zoomtime2,1000,/'
-	echo 'zoomtime2.draw STACK'
-	echo 'zoomtime2.info Time for Metatiles for z9 - z12'
-	echo 'zoomtime3.label zoom z13 - z14'
-	echo 'zoomtime3.type DERIVE'
-	echo 'zoomtime3.min 0'
-	echo 'zoomtime3.cdef zoomtime3,1000,/'
-	echo 'zoomtime3.draw STACK'
-	echo 'zoomtime3.info Time for Metatiles for z13 - z14'
-	echo 'zoomtime4.label zoom z15 - z16'
-	echo 'zoomtime4.type DERIVE'
-	echo 'zoomtime4.min 0'
-	echo 'zoomtime4.cdef zoomtime4,1000,/'
-	echo 'zoomtime4.draw STACK'
-	echo 'zoomtime4.info Time for Metatiles for z15 - z16'
-	echo 'zoomtime5.label zoom z17 - z18'
-	echo 'zoomtime5.type DERIVE'
-	echo 'zoomtime5.min 0'
-	echo 'zoomtime5.cdef zoomtime5,1000,/'
-	echo 'zoomtime5.draw STACK'
-	echo 'zoomtime5.info Time for Metatiles for z17 - z18'
-
-	exit 0
-fi
-
-req0=`sed -e '/^TimeRenderedZoom00/!d' -e 's/.*: //' -e q /var/run/renderd/renderd.stats`
-req1=`sed -e '/^TimeRenderedZoom01/!d' -e 's/.*: //' -e q /var/run/renderd/renderd.stats`
-req2=`sed -e '/^TimeRenderedZoom02/!d' -e 's/.*: //' -e q /var/run/renderd/renderd.stats`
-req3=`sed -e '/^TimeRenderedZoom03/!d' -e 's/.*: //' -e q /var/run/renderd/renderd.stats`
-req4=`sed -e '/^TimeRenderedZoom04/!d' -e 's/.*: //' -e q /var/run/renderd/renderd.stats`
-req5=`sed -e '/^TimeRenderedZoom05/!d' -e 's/.*: //' -e q /var/run/renderd/renderd.stats`
-req6=`sed -e '/^TimeRenderedZoom06/!d' -e 's/.*: //' -e q /var/run/renderd/renderd.stats`
-req7=`sed -e '/^TimeRenderedZoom07/!d' -e 's/.*: //' -e q /var/run/renderd/renderd.stats`
-req8=`sed -e '/^TimeRenderedZoom08/!d' -e 's/.*: //' -e q /var/run/renderd/renderd.stats`
-req9=`sed -e '/^TimeRenderedZoom09/!d' -e 's/.*: //' -e q /var/run/renderd/renderd.stats`
-req10=`sed -e '/^TimeRenderedZoom10/!d' -e 's/.*: //' -e q /var/run/renderd/renderd.stats`
-req11=`sed -e '/^TimeRenderedZoom11/!d' -e 's/.*: //' -e q /var/run/renderd/renderd.stats`
-req12=`sed -e '/^TimeRenderedZoom12/!d' -e 's/.*: //' -e q /var/run/renderd/renderd.stats`
-req13=`sed -e '/^TimeRenderedZoom13/!d' -e 's/.*: //' -e q /var/run/renderd/renderd.stats`
-req14=`sed -e '/^TimeRenderedZoom14/!d' -e 's/.*: //' -e q /var/run/renderd/renderd.stats`
-req15=`sed -e '/^TimeRenderedZoom15/!d' -e 's/.*: //' -e q /var/run/renderd/renderd.stats`
-req16=`sed -e '/^TimeRenderedZoom16/!d' -e 's/.*: //' -e q /var/run/renderd/renderd.stats`
-req17=`sed -e '/^TimeRenderedZoom17/!d' -e 's/.*: //' -e q /var/run/renderd/renderd.stats`
-req18=`sed -e '/^TimeRenderedZoom18/!d' -e 's/.*: //' -e q /var/run/renderd/renderd.stats`
-
-echo "zoomtime1.value " `expr $req0 + $req1 + + $req2 + $req3 + $req4 + $req5 + $req6 + $req7 + $req8`
-echo "zoomtime2.value " `expr $req9 + $req10 + + $req11 + $req12`
-echo "zoomtime3.value " `expr $req13 + $req14`
-echo "zoomtime4.value " `expr $req15 + $req16`
-echo "zoomtime5.value " `expr $req17 + $req18`
\ No newline at end of file
-- 
2.43.2