munin_passenger 1.0.0 → 1.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: cd4851916ebee9fa861409169457d111a73ffd2ba8601f94baac9656be2df3d5
-  data.tar.gz: 5d65009a959ae947020602d57a84d97e7464f604cc0be371285a99177f357dd1
+  metadata.gz: 1e199f4682f3a32c4c4dc201db8bfee7bdf35c95265b404bcb6795649350f5f8
+  data.tar.gz: 9a9416d20a210a07462ac2bf9ceef5a83c30937245aba39d7ec025cddfd7b8d1
 SHA512:
-  metadata.gz: 699faab7cf106fbd9243e0ab513ba43a7f78479f3dfcdedefab1f88364aa863eb360eaeb2d0dbc6f12d5521178a4463b6113c61642919e6af2941146cc7334fb
-  data.tar.gz: 6467c039f53a061b6d4324c2b79b09eac0a32c8678f0933d31a05c130690bb9ede1852d90b3011a8f28e2c7e2b3ab1d62df4ef778041c07044b983a6e165704c
+  metadata.gz: 8a7678599187c76596d5fdad01a9595600bae3fdfdee7e9ac57ace8e9c88673e7401bf984945e2c05639190d6a65fadf5c381776ca23e7cd0b3d189521cdccb9
+  data.tar.gz: 1c70eaaa7f5ae9b8a4986b8bf924f21168c476274433c653da5c127ea017050675eff48e1a17643645e14508a57b643add5ebb3058d71a94fbd63a7adeeeae4f

data/Vagrantfile

@@ -129,7 +129,7 @@ server {
 }
 EOF
 sudo rm -f /etc/nginx/sites-enabled/default
-sudo ln -s /etc/nginx/sites-available/rails /etc/nginx/sites-enabled/
+sudo ln -sf /etc/nginx/sites-available/rails /etc/nginx/sites-enabled/
 
 # munin
 sudo add-apt-repository -y ppa:hawq/munin
@@ -141,7 +141,7 @@ server {
   root /var/cache/munin/www;
 }
 EOF
-sudo ln -s /etc/nginx/sites-available/munin /etc/nginx/sites-enabled/
+sudo ln -sf /etc/nginx/sites-available/munin /etc/nginx/sites-enabled/
 
 # postgres
 sudo apt-get install -y postgresql postgresql-contrib

data/lib/munin_passenger/collect.rb

@@ -1,9 +1,43 @@
+require 'json'
 require 'nokogiri'
 require 'ostruct'
 
 module MuninPassenger
   module Collect
 
+    def self.default_state_file
+      {
+        'pses' => []
+      }
+    end
+
+    def self.read_state_file
+      filename = ENV['MUNIN_STATEFILE']
+      if filename and File.exist?(filename)
+        begin
+          JSON.parse(File.open(filename, 'r') {|f| f.read})
+        rescue
+          $stderr.puts "WARN: Couldn't open munin statefile at #{filename}: #{$!.message}"
+          default_state_file
+        end
+      else
+        default_state_file
+      end
+    end
+
+    def self.write_state_file(state)
+      filename = ENV['MUNIN_STATEFILE']
+      if filename
+        begin
+          File.open(filename, 'w') do |f|
+            f.write state.to_json
+          end
+        rescue
+          $stderr.puts "WARN: Error writing to statefile at #{filename}: #{$!.message}"
+        end
+      end
+    end
+
     def self.parse_stats(f)
       Nokogiri::XML(f) do |config|
         config.strict.
@@ -26,23 +60,74 @@ module MuninPassenger
     end
 
     def self.get_ps_stats(doc)
-      ret = []
+      state = read_state_file
+      slots_by_pid = {}
+      state['pses'].each_with_index do |pid, i|
+        slots_by_pid[pid] = i if pid
+      end
+      ret = [nil] * state['pses'].size  # Need at least as many workers as the most we've seen.
+      curr_pses = []
       now = Time.now
       doc.xpath('//info/supergroups/supergroup').each do |x_supergroup|
         x_supergroup.xpath('./group').each do |x_group|
           x_group.xpath('./processes/process').each do |x_ps|
+            pid = x_ps.xpath('pid').first.text
             ps = OpenStruct.new
-            ps.pid         = x_ps.xpath('pid').first.text
+            ps.active      = true
+            ps.pid         = pid
             ps.sessions    = x_ps.xpath('sessions').first.text.to_i
             ps.last_used   = (now - Time.at(x_ps.xpath('last_used').first.text.to_i / 1000 / 1000).to_i).to_i # in seconds
             ps.ram         = x_ps.xpath('real_memory').first.text.to_i   # in KB
             ps.cpu         = x_ps.xpath('cpu').first.text.to_i           # in %
             ps.uptime      = (now - Time.at(x_ps.xpath('spawn_start_time').first.text.to_i / 1000 / 1000).to_i).to_i # in seconds
             ps.processed   = x_ps.xpath('processed').first.text.to_i     # in requests
-            ret << ps
+            ps.last_seen   = now.to_i
+            curr_pses << ps
           end
         end
       end
+      # This is all a little tricky,
+      # but if we name each metric after the pid,
+      # munin will throw away the history when passenger is restarted and the pids change.
+      # So instead we have "worker1", "worker2", etc.,
+      # and we show the current pid in parentheses.
+      # Each time we collect info, we keep a pid in the same slot as before.
+      # If a pid goes away, we free that slot.
+      # If it's the first we've seen a pid,
+      # we give it the first free slot.
+      new_pses = []
+      curr_pses.each do |ps|
+        i = slots_by_pid[ps.pid]
+        if i
+          ret[i] = ps
+        else
+          new_pses << ps
+        end
+      end
+      new_pses.each do |ps|
+        i = ret.index{|x| x == nil}
+        if i
+          ret[i] = ps
+        else
+          ret << ps
+        end
+      end
+      state['pses'] = ret.map do |ps|
+        if ps
+          {
+            'pid'       => ps.pid,
+            'last_seen' => ps.last_seen,
+          }
+        else
+          nil
+        end
+      end
+      write_state_file(state)
+      # Now if there are still nils,
+      # it means we are running than fewer workers than before.
+      # Preserve those slots,
+      # but the graphing code will have to watch out
+      # and note that they have no process currently.
       ret
     end
 

data/lib/munin_passenger/graphs.rb

@@ -30,9 +30,10 @@ graph_vlabel Requests
 _group_#{escape_group(g.name)}_queue.label #{g.name}
         EOF
       end
-      pses.each do |ps|
+      pses.each_with_index do |ps, i|
+        pidstr = ps ? "(PID #{ps.pid})" : "(no PID)"
         ret += <<-EOF
-_pid_#{ps.pid}_sessions.label PID #{ps.pid}
+_worker_#{i + 1}_sessions.label Worker #{i + 1} #{pidstr}
         EOF
       end
       ret
@@ -46,9 +47,10 @@ _pid_#{ps.pid}_sessions.label PID #{ps.pid}
 _group_#{escape_group(g.name)}_queue.value #{g.queue}
     EOF
       end
-      pses.each do |ps|
+      pses.each_with_index do |ps, i|
+        next unless ps
         ret += <<-EOF
-_pid_#{ps.pid}_sessions.value #{ps.sessions}
+_worker_#{i + 1}_sessions.value #{ps.sessions}
         EOF
       end
       ret
@@ -66,9 +68,10 @@ graph_category passenger
 graph_title Passenger memory usage
 graph_vlabel Bytes
       EOF
-      pses.each do |ps|
+      pses.each_with_index do |ps, i|
+        pidstr = ps ? "(PID #{ps.pid})" : "(no PID)"
         ret += <<-EOF
-_pid_#{ps.pid}_ram.label PID #{ps.pid}
+_worker_#{i + 1}_ram.label Worker #{i + 1} #{pidstr}
         EOF
       end
       ret
@@ -77,9 +80,10 @@ _pid_#{ps.pid}_ram.label PID #{ps.pid}
     def self.ram_values
       groups, pses = get_stats
       ret = ''
-      pses.each do |ps|
+      pses.each_with_index do |ps, i|
+        next unless ps
         ret += <<-EOF
-_pid_#{ps.pid}_ram.value #{ps.ram * 1024}
+_worker_#{i + 1}_ram.value #{ps.ram * 1024}
         EOF
       end
       ret
@@ -97,9 +101,10 @@ graph_category passenger
 graph_title Passenger CPU
 graph_vlabel %
       EOF
-      pses.each do |ps|
+      pses.each_with_index do |ps, i|
+        pidstr = ps ? "(PID #{ps.pid})" : "(no PID)"
         ret += <<-EOF
-_pid_#{ps.pid}_cpu.label PID #{ps.pid}
+_worker_#{i + 1}_cpu.label Worker #{i + 1} #{pidstr}
         EOF
       end
       ret
@@ -108,9 +113,10 @@ _pid_#{ps.pid}_cpu.label PID #{ps.pid}
     def self.cpu_values
       groups, pses = get_stats
       ret = ''
-      pses.each do |ps|
+      pses.each_with_index do |ps, i|
+        next unless ps
         ret += <<-EOF
-_pid_#{ps.pid}_cpu.value #{ps.cpu}
+_worker_#{i + 1}_cpu.value #{ps.cpu}
         EOF
       end
       ret
@@ -128,9 +134,10 @@ graph_category passenger
 graph_title Requests processed
 graph_vlabel Requests
       EOF
-      pses.each do |ps|
+      pses.each_with_index do |ps, i|
+        pidstr = ps ? "(PID #{ps.pid})" : "(no PID)"
         ret += <<-EOF
-_pid_#{ps.pid}_processed.label PID #{ps.pid}
+_worker_#{i + 1}_processed.label Worker #{i + 1} #{pidstr}
         EOF
       end
       ret
@@ -139,9 +146,10 @@ _pid_#{ps.pid}_processed.label PID #{ps.pid}
     def self.processed_values
       groups, pses = get_stats
       ret = ''
-      pses.each do |ps|
+      pses.each_with_index do |ps, i|
+        next unless ps
         ret += <<-EOF
-_pid_#{ps.pid}_processed.value #{ps.processed}
+_worker_#{i + 1}_processed.value #{ps.processed}
         EOF
       end
       ret
@@ -159,9 +167,10 @@ graph_category passenger
 graph_title Uptime
 graph_vlabel Hours
       EOF
-      pses.each do |ps|
+      pses.each_with_index do |ps, i|
+        pidstr = ps ? "(PID #{ps.pid})" : "(no PID)"
         ret += <<-EOF
-_pid_#{ps.pid}_uptime.label PID #{ps.pid}
+_worker_#{i + 1}_uptime.label Worker #{i + 1} #{pidstr}
         EOF
       end
       ret
@@ -170,9 +179,10 @@ _pid_#{ps.pid}_uptime.label PID #{ps.pid}
     def self.uptime_values
       groups, pses = get_stats
       ret = ''
-      pses.each do |ps|
+      pses.each_with_index do |ps, i|
+        next unless ps
         ret += <<-EOF
-_pid_#{ps.pid}_uptime.value #{ps.uptime.to_f / 60 / 60}
+_worker_#{i + 1}_uptime.value #{ps.uptime.to_f / 60 / 60}
         EOF
       end
       ret
@@ -190,9 +200,10 @@ graph_category passenger
 graph_title Last used
 graph_vlabel Seconds
       EOF
-      pses.each do |ps|
+      pses.each_with_index do |ps, i|
+        pidstr = ps ? "(PID #{ps.pid})" : "(no PID)"
         ret += <<-EOF
-_pid_#{ps.pid}_last_used.label PID #{ps.pid}
+_worker_#{i + 1}_last_used.label Worker #{i + 1} #{pidstr}
         EOF
       end
       ret
@@ -201,9 +212,10 @@ _pid_#{ps.pid}_last_used.label PID #{ps.pid}
     def self.last_used_values
       groups, pses = get_stats
       ret = ''
-      pses.each do |ps|
+      pses.each_with_index do |ps, i|
+        next unless ps
         ret += <<-EOF
-_pid_#{ps.pid}_last_used.value #{ps.last_used}
+_worker_#{i + 1}_last_used.value #{ps.last_used}
         EOF
       end
       ret

data/lib/munin_passenger/version.rb

@@ -1,3 +1,3 @@
 module MuninPassenger
-  VERSION = '1.0.0'
+  VERSION = '1.1.0'
 end

data/munin_passenger.gemspec

@@ -30,5 +30,6 @@ Gem::Specification.new do |s|
   s.add_development_dependency 'rubocop'
 
   s.add_dependency 'nokogiri'
+  s.add_dependency 'json'
 end
 

data/spec/munin_passenger_spec.rb

@@ -10,20 +10,20 @@ graph_category passenger
 graph_title Passenger queue
 graph_vlabel Requests
 _group__vagrant_example__production__queue.label /vagrant/example (production)
-_pid_4510_sessions.label PID 4510
-_pid_4529_sessions.label PID 4529
-_pid_4548_sessions.label PID 4548
-_pid_4567_sessions.label PID 4567
+_worker_1_sessions.label Worker 1 (PID 4510)
+_worker_2_sessions.label Worker 2 (PID 4529)
+_worker_3_sessions.label Worker 3 (PID 4548)
+_worker_4_sessions.label Worker 4 (PID 4567)
     EOF
   end
 
   it "gives the queue values" do
     expect(MuninPassenger::Graphs.queue_values).to eq <<-EOF
 _group__vagrant_example__production__queue.value 4
-_pid_4510_sessions.value 1
-_pid_4529_sessions.value 1
-_pid_4548_sessions.value 1
-_pid_4567_sessions.value 1
+_worker_1_sessions.value 1
+_worker_2_sessions.value 1
+_worker_3_sessions.value 1
+_worker_4_sessions.value 1
     EOF
   end
 
@@ -32,19 +32,19 @@ _pid_4567_sessions.value 1
 graph_category passenger
 graph_title Passenger memory usage
 graph_vlabel Bytes
-_pid_4510_ram.label PID 4510
-_pid_4529_ram.label PID 4529
-_pid_4548_ram.label PID 4548
-_pid_4567_ram.label PID 4567
+_worker_1_ram.label Worker 1 (PID 4510)
+_worker_2_ram.label Worker 2 (PID 4529)
+_worker_3_ram.label Worker 3 (PID 4548)
+_worker_4_ram.label Worker 4 (PID 4567)
     EOF
   end
 
   it "gives the ram values" do
     expect(MuninPassenger::Graphs.ram_values).to eq <<-EOF
-_pid_4510_ram.value #{40400 * 1024}
-_pid_4529_ram.value #{24396 * 1024}
-_pid_4548_ram.value #{24268 * 1024}
-_pid_4567_ram.value #{23872 * 1024}
+_worker_1_ram.value #{40400 * 1024}
+_worker_2_ram.value #{24396 * 1024}
+_worker_3_ram.value #{24268 * 1024}
+_worker_4_ram.value #{23872 * 1024}
     EOF
   end
 
@@ -53,19 +53,19 @@ _pid_4567_ram.value #{23872 * 1024}
 graph_category passenger
 graph_title Passenger CPU
 graph_vlabel %
-_pid_4510_cpu.label PID 4510
-_pid_4529_cpu.label PID 4529
-_pid_4548_cpu.label PID 4548
-_pid_4567_cpu.label PID 4567
+_worker_1_cpu.label Worker 1 (PID 4510)
+_worker_2_cpu.label Worker 2 (PID 4529)
+_worker_3_cpu.label Worker 3 (PID 4548)
+_worker_4_cpu.label Worker 4 (PID 4567)
     EOF
   end
 
   it "gives the cpu values" do
     expect(MuninPassenger::Graphs.cpu_values).to eq <<-EOF
-_pid_4510_cpu.value 2
-_pid_4529_cpu.value 3
-_pid_4548_cpu.value 2
-_pid_4567_cpu.value 2
+_worker_1_cpu.value 2
+_worker_2_cpu.value 3
+_worker_3_cpu.value 2
+_worker_4_cpu.value 2
     EOF
   end
 
@@ -74,19 +74,19 @@ _pid_4567_cpu.value 2
 graph_category passenger
 graph_title Requests processed
 graph_vlabel Requests
-_pid_4510_processed.label PID 4510
-_pid_4529_processed.label PID 4529
-_pid_4548_processed.label PID 4548
-_pid_4567_processed.label PID 4567
+_worker_1_processed.label Worker 1 (PID 4510)
+_worker_2_processed.label Worker 2 (PID 4529)
+_worker_3_processed.label Worker 3 (PID 4548)
+_worker_4_processed.label Worker 4 (PID 4567)
     EOF
   end
 
   it "gives the processed values" do
     expect(MuninPassenger::Graphs.processed_values).to eq <<-EOF
-_pid_4510_processed.value 139
-_pid_4529_processed.value 138
-_pid_4548_processed.value 138
-_pid_4567_processed.value 138
+_worker_1_processed.value 139
+_worker_2_processed.value 138
+_worker_3_processed.value 138
+_worker_4_processed.value 138
     EOF
   end
 
@@ -95,20 +95,20 @@ _pid_4567_processed.value 138
 graph_category passenger
 graph_title Uptime
 graph_vlabel Hours
-_pid_4510_uptime.label PID 4510
-_pid_4529_uptime.label PID 4529
-_pid_4548_uptime.label PID 4548
-_pid_4567_uptime.label PID 4567
+_worker_1_uptime.label Worker 1 (PID 4510)
+_worker_2_uptime.label Worker 2 (PID 4529)
+_worker_3_uptime.label Worker 3 (PID 4548)
+_worker_4_uptime.label Worker 4 (PID 4567)
     EOF
   end
 
   it "gives the uptime values" do
     Timecop.travel('Thu Sep 13 20:36:38 PDT 2018') do
       expect(MuninPassenger::Graphs.uptime_values).to eq <<-EOF
-_pid_4510_uptime.value 9.369166666666667
-_pid_4529_uptime.value 9.368888888888888
-_pid_4548_uptime.value 9.368888888888888
-_pid_4567_uptime.value 9.368888888888888
+_worker_1_uptime.value 9.369166666666667
+_worker_2_uptime.value 9.368888888888888
+_worker_3_uptime.value 9.368888888888888
+_worker_4_uptime.value 9.368888888888888
       EOF
     end
   end
@@ -118,20 +118,20 @@ _pid_4567_uptime.value 9.368888888888888
 graph_category passenger
 graph_title Last used
 graph_vlabel Seconds
-_pid_4510_last_used.label PID 4510
-_pid_4529_last_used.label PID 4529
-_pid_4548_last_used.label PID 4548
-_pid_4567_last_used.label PID 4567
+_worker_1_last_used.label Worker 1 (PID 4510)
+_worker_2_last_used.label Worker 2 (PID 4529)
+_worker_3_last_used.label Worker 3 (PID 4548)
+_worker_4_last_used.label Worker 4 (PID 4567)
     EOF
   end
 
   it "gives the last_used values" do
     Timecop.travel('Thu Sep 13 20:36:38 PDT 2018') do
       expect(MuninPassenger::Graphs.last_used_values).to eq <<-EOF
-_pid_4510_last_used.value 33697
-_pid_4529_last_used.value 33697
-_pid_4548_last_used.value 33697
-_pid_4567_last_used.value 33697
+_worker_1_last_used.value 33697
+_worker_2_last_used.value 33697
+_worker_3_last_used.value 33697
+_worker_4_last_used.value 33697
       EOF
     end
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: munin_passenger
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.1.0
 platform: ruby
 authors:
 - Paul A. Jungwirth
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-09-19 00:00:00.000000000 Z
+date: 2018-10-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -108,6 +108,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: json
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 description: Runs passenger-status to graph CPU, RAM, queue size, requests served,
   etc.
 email: pj@illuminatedcomputing.com