passenger_datadog 1.0.0 → 1.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 8ebcdb70d77fe46e3f3976f75285406d71acec62
-  data.tar.gz: 5158eb6481792eaeaa9932958213fdffe406fe11
+SHA256:
+  metadata.gz: bcd2feda9565c77acdc7c00907f17e4d8ce0c72c3ccc98b82784fb74ab76034f
+  data.tar.gz: 547946b6569710669c3134452c2d572483d0fe147f705da37adc38803bff545d
 SHA512:
-  metadata.gz: 68e52f68e05cf76db97b2c45a0bd03e2c524e8daa093eebdbb551ed028ebab854a2d6571d8c4015ddedac8d4288a56e4cc4cec358fd407576ab9d9eafd7ead3e
-  data.tar.gz: ee12b91958a59e4c821c0195b586adde46152282db03b66324267e163aaf0e10bfc33d5c3382bb8f14933d25cddca51e9ee162db73276e1230e4e262e316105c
+  metadata.gz: 8f7458d200f7917a6d99b369a919d527134c96f31a5ad7ce4e37223203a172b6f49914c964e5d065a374e044f4ff6c1397dc963d359a9e1ccaded62e9e531320
+  data.tar.gz: 23a566e3c0819ee22d668b9dd251706d4d4fcb390d9996f0a44e60fc60253252ef08731d6ad9e581e600ddb60d6b0ebd0f72301c7d2a986d0d292ed6e2075213

data/{LICENSE → LICENSE.txt}

@@ -1,6 +1,6 @@
 The MIT License (MIT)
 
-Copyright (c) 2015 Ryan
+Copyright (c) 2015-2018 Ryan Rosenblum
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal
@@ -19,4 +19,3 @@ AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
 LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
 OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 SOFTWARE.
-

data/README.md

@@ -24,6 +24,7 @@ $ gem install passenger_datadog
 ```
 ## Support
 1.x Ruby >= 2.2
+
 0.x Ruby < 2.2
 
 ## Usage

data/bin/passenger-datadog

@@ -7,7 +7,7 @@ require 'passenger_datadog'
 
 Daemons.run_proc('passenger-datadog', dir_mode: :system) do
   loop do
-    PassengerDatadog.run
+    PassengerDatadog.new.run
     sleep(30)
   end
 end

data/lib/parsers/base.rb

@@ -0,0 +1,31 @@
+module Parsers
+  class Base
+    PREFIX = 'passenger'.freeze
+
+    attr_reader :batch, :xml, :prefix, :tags
+
+    def initialize(batch, xml, prefix: nil, tags: nil)
+      @batch = batch
+      @xml = xml
+      @prefix = prefix
+      @tags = tags
+    end
+
+    protected
+
+    def gauge(xml_key, key)
+      value = xml.xpath(xml_key).text
+      return if value.empty?
+
+      if tags
+        batch.gauge(key_for(key), value, tags: tags)
+      else
+        batch.gauge(key_for(key), value)
+      end
+    end
+
+    def key_for(key)
+      [PREFIX, prefix, key].compact.join('.')
+    end
+  end
+end

data/lib/parsers/group.rb

@@ -0,0 +1,19 @@
+module Parsers
+  class Group < Base
+    STATS = %w[
+      capacity_used
+      get_wait_list_size
+      disable_wait_list_size
+      processes_being_spawned
+      enabled_process_count
+      disabling_process_count
+      disabled_process_count
+    ].freeze
+
+    def run
+      STATS.each do |key|
+        gauge(key, key)
+      end
+    end
+  end
+end

data/lib/parsers/process.rb

@@ -0,0 +1,23 @@
+module Parsers
+  class Process < Base
+    STATS = %w[
+      processed
+      sessions
+      busyness
+      concurrency
+      cpu
+      rss
+      private_dirty
+      pss
+      swap
+      real_memory
+      vmsize
+    ].freeze
+
+    def run
+      STATS.each do |key|
+        gauge(key, key)
+      end
+    end
+  end
+end

data/lib/parsers/root.rb

@@ -0,0 +1,15 @@
+module Parsers
+  class Root < Base
+    STATS = {
+      'process_count' => 'pool.used',
+      'max' => 'pool.max',
+      'get_wait_list_size' => 'request_queue'
+    }.freeze
+
+    def run
+      STATS.each do |xml_key, key|
+        gauge(xml_key, key)
+      end
+    end
+  end
+end

data/lib/passenger_datadog.rb

@@ -3,49 +3,44 @@
 require 'nokogiri'
 require 'datadog/statsd'
 
+require 'parsers/base'
+require 'parsers/root'
+require 'parsers/group'
+require 'parsers/process'
+
 class PassengerDatadog
-  GROUP_STATS = %w[capacity_used processes_being_spawned enabled_process_count
-                   disabling_process_count disabled_process_count].freeze
-  PROCESS_STATS = %w[processed sessions busyness concurrency cpu rss
-                     private_dirty pss swap real_memory vmsize].freeze
-
-  class << self
-    def run
-      status = `passenger-status --show=xml`
-      return if status.empty?
-
-      statsd = Datadog::Statsd.new
-
-      statsd.batch do |s|
-        # Good job Passenger 4.0.10. Return non xml in your xml output.
-        status = status.split("\n")[3..-1].join("\n") unless status.start_with?('<?xml')
-        parsed = Nokogiri::XML(status)
-
-        pool_used = parsed.xpath('//process_count').text
-        s.gauge('passenger.pool.used', pool_used)
-
-        pool_max = parsed.xpath('//max').text
-        s.gauge('passenger.pool.max', pool_max)
-
-        request_queue = parsed.xpath('//supergroups/supergroup/group/get_wait_list_size').text
-        s.gauge('passenger.request_queue', request_queue)
-
-        parsed.xpath('//supergroups/supergroup/group').each do |group|
-          GROUP_STATS.each do |stat|
-            value = group.xpath(stat).text
-            next if value.empty?
-            s.gauge("passenger.#{stat}", value)
-          end
-        end
-
-        parsed.xpath('//supergroups/supergroup/group/processes/process').each_with_index do |process, index|
-          PROCESS_STATS.each do |stat|
-            value = process.xpath(stat).text
-            next if value.empty?
-            s.gauge("passenger.#{stat}", value, tags: ["passenger-process:#{index}"])
-          end
-        end
+  def run
+    status = `passenger-status --show=xml`
+    return if status.empty?
+
+    # Good job Passenger 4.0.10. Return non xml in your xml output.
+    status = status.split("\n")[3..-1].join("\n") unless status.start_with?('<?xml')
+
+    statsd = Datadog::Statsd.new
+    parsed = Nokogiri::XML(status)
+
+    statsd.batch do |batch|
+      run_in_batch(batch, parsed)
+    end
+  end
+
+  private
+
+  def run_in_batch(batch, parsed)
+    Parsers::Root.new(batch, parsed.xpath('//info')).run
+
+    multiple_supergroups = parsed.xpath('//supergroups/supergroup').count > 1
+    parsed.xpath('//supergroups/supergroup').each do |supergroup|
+      prefix = multiple_supergroups ? normalize_prefix(supergroup.xpath('name').text) : nil
+      Parsers::Group.new(batch, supergroup.xpath('group'), prefix: prefix).run
+
+      supergroup.xpath('group/processes/process').each_with_index do |process, index|
+        Parsers::Process.new(batch, process, prefix: prefix, tags: ["passenger-process:#{index}"]).run
       end
     end
   end
+
+  def normalize_prefix(prefix)
+    prefix.gsub(/(-|\s)/, '_').gsub(/(\W|\d)/i, '')
+  end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: passenger_datadog
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.1.0
 platform: ruby
 authors:
 - Ryan Rosenblum
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-01-17 00:00:00.000000000 Z
+date: 2018-04-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: daemons
@@ -84,14 +84,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '10.1'
+        version: '12.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '10.1'
+        version: '12.0'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
@@ -112,26 +112,30 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.52.0
+        version: 0.55.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.52.0
+        version: 0.55.0
 description: "    A tool for sending Passenger stats to Datadog.\n"
 email: passenger_datadog@manheim.com
 executables:
 - passenger-datadog
 extensions: []
 extra_rdoc_files:
-- LICENSE
+- LICENSE.txt
 - README.md
 files:
-- LICENSE
+- LICENSE.txt
 - README.md
 - bin/passenger-datadog
+- lib/parsers/base.rb
+- lib/parsers/group.rb
+- lib/parsers/process.rb
+- lib/parsers/root.rb
 - lib/passenger_datadog.rb
 homepage: https://github.com/manheim/passenger-datadog
 licenses:
@@ -153,7 +157,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.13
+rubygems_version: 2.7.6
 signing_key: 
 specification_version: 4
 summary: A tool for sending Passenger stats to Datadog