From: Tom Hughes <tom@compton.nu>
Date: Sun, 11 Sep 2016 21:24:18 +0000 (+0100)
Subject: Order renderd munin graphs consistently
X-Git-Url: https://git.openstreetmap.org/chef.git/commitdiff_plain/de16319004d8f13f3baba7dbe2e35dcf4bbebfa9?hp=5d5c042e9be07873bae0ca2847f5b81280499f9a

Order renderd munin graphs consistently
---

diff --git a/cookbooks/munin/templates/default/munin.conf.erb b/cookbooks/munin/templates/default/munin.conf.erb
index a1c9aa263..3fed5baf2 100644
--- a/cookbooks/munin/templates/default/munin.conf.erb
+++ b/cookbooks/munin/templates/default/munin.conf.erb
@@ -575,7 +575,7 @@ unknown_limit 144
     renderd_processed.graph_title Renderd throughput
     renderd_processed.graph_args --base 1000 -l 0
     renderd_processed.graph_vlabel Metatiles per ${graph_period}
-    renderd_processed.graph_order req reqLow reqPrio dirty reqBulk dropped
+    renderd_processed.graph_order reqPrio req reqLow dirty reqBulk dropped
     renderd_processed.graph_category renderd
     renderd_processed.graph_info Displays the number of metatiles being rendered by renderd per ${graph_period}
     renderd_processed.req.sum <%= Chef::Munin.expand "%%name%%.openstreetmap:renderd_processed.req", @renderers %>
diff --git a/roles/tile.rb b/roles/tile.rb
index 44a067c7e..2ab8769ce 100644
--- a/roles/tile.rb
+++ b/roles/tile.rb
@@ -22,6 +22,19 @@ default_attributes(
       :max_requests_per_child => 100000
     }
   },
+  :munin => {
+    :plugins => {
+      :renderd_processed => {
+        :graph_order => "reqPrio req reqLow dirty reqBulk dropped"
+      },
+      :renderd_queue => {
+        :graph_order => "reqPrio req reqLow dirty reqBulk"
+      },
+      :renderd_queue_time => {
+        :graph_order => "reqPrio req reqLow dirty reqBulk"
+      }
+    }
+  },
   :postgresql => {
     :settings => {
       :defaults => {