Fixup passenger munin plugins

diff --git a/cookbooks/munin/files/default/plugins/passenger_memory b/cookbooks/munin/files/default/plugins/passenger_memory
index 7e6e36abc8da3b392f357e5b789594afc803ef8d..1aa9a77640fc6b7f1de49977bc0346aa379d67a0 100755 (executable)
--- a/cookbooks/munin/files/default/plugins/passenger_memory
+++ b/cookbooks/munin/files/default/plugins/passenger_memory
@@ -3,6 +3,8 @@
 # by Dan Manges, http://www.dcmanges.com/blog/rails-application-visualization-with-munin
 # NOTE: you might need to add munin to allow passwordless sudo for passenger-memory-stats
 
+require "English"
+
 def output_config
   puts <<-END
 graph_args --base 1024 -l 0 --vertical-label bytes --upper-limit 4056231936

diff --git a/cookbooks/munin/files/default/plugins/passenger_processes b/cookbooks/munin/files/default/plugins/passenger_processes
index 59f9cdaa86932e921fb53ba10d2b37a67a7b71c9..39842a04f7585ae1185bfd23ac3fab97d9cba313 100755 (executable)
--- a/cookbooks/munin/files/default/plugins/passenger_processes
+++ b/cookbooks/munin/files/default/plugins/passenger_processes
@@ -1,5 +1,7 @@
 #!/usr/bin/env ruby
 
+require "English"
+
 def output_config
   puts <<-END
 graph_category passenger

diff --git a/cookbooks/munin/files/default/plugins/passenger_queues b/cookbooks/munin/files/default/plugins/passenger_queues
index a7060fd665c9c5ed9159e2ddcd8bdd57dbddb2a2..60be63389f957160cc38ae9646ed7bf75e787b21 100755 (executable)
--- a/cookbooks/munin/files/default/plugins/passenger_queues
+++ b/cookbooks/munin/files/default/plugins/passenger_queues
@@ -1,5 +1,7 @@
 #!/usr/bin/env ruby
 
+require "English"
+
 def output_config
   puts <<-END
 graph_category passenger
@@ -17,7 +19,7 @@ def output_values
     $stderr.puts "failed executing passenger-status"
     exit 1
   end
-  status =~ /Waiting on global queue:\s+(\d+)/
+  status =~ /Requests in top-level queue :\s+(\d+)/
   puts "global.value #{Regexp.last_match[1]}"
 end
 

diff --git a/cookbooks/munin/files/default/plugins/passenger_requests b/cookbooks/munin/files/default/plugins/passenger_requests
index 39c87c82177a7983282dc366e1a5d10dd217f652..1e34fc70f946c1e1d2218fd23a961c6f84661f12 100755 (executable)
--- a/cookbooks/munin/files/default/plugins/passenger_requests
+++ b/cookbooks/munin/files/default/plugins/passenger_requests
@@ -1,5 +1,7 @@
 #!/usr/bin/env ruby
 
+require "English"
+
 def output_config
   puts <<-END
 graph_args --base 1000