Order renderd munin graphs consistently

diff --git a/cookbooks/munin/templates/default/munin.conf.erb b/cookbooks/munin/templates/default/munin.conf.erb
index a1c9aa263ca69ffbdfc13616bde8fab391be0eb3..3fed5baf2e3c3d3ddd16fba0b5ba23e90c0ff320 100644 (file)
--- 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 44a067c7e67e6075ea074aacfcac13740f2ed609..2ab8769cee3d1e7f796d88accff8e85f4435db60 100644 (file)
--- 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 => {