Make replication delay monitoring more reliable

[chef.git] / cookbooks / munin / files / default / plugins / passenger_memory

diff --git a/cookbooks/munin/files/default/plugins/passenger_memory b/cookbooks/munin/files/default/plugins/passenger_memory
index 2ce1a305f3a4efc33b88b27c1a9fc70e52d62e04..dd0f663811f92de247bbdc72faf8f34bcc61920b 100755 (executable)
--- a/cookbooks/munin/files/default/plugins/passenger_memory
+++ b/cookbooks/munin/files/default/plugins/passenger_memory
@@ -3,25 +3,27 @@
 # 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
-graph_category passenger
-graph_title Passenger memory
+  puts <<~CONFIG
+    graph_args --base 1024 -l 0 --vertical-label bytes --upper-limit 4056231936
+    graph_category passenger
+    graph_title Passenger memory
 
-memory.label memory
-END
+    memory.label memory
+  CONFIG
   exit 0
 end
 
 def output_values
   status = `/usr/sbin/passenger-memory-stats | tail -1`
-  unless $?.success?
-    $stderr.puts "failed executing passenger-memory-stats"
+  unless $CHILD_STATUS.success?
+    warn "failed executing passenger-memory-stats"
     exit 1
   end
   status =~ /(\d+\.\d+)/
-  puts "memory.value #{($1.to_f * 1024 * 1024).round}"
+  puts "memory.value #{(Regexp.last_match[1].to_f * 1024 * 1024).round}"
 end
 
 if ARGV[0] == "config"