bipbip 0.6.5 → 0.6.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6383136be35e4594707a538dea208cc740920e40
-  data.tar.gz: 501f4cfaefba119254433093fe81854d76eb4ad6
+  metadata.gz: 8615ee93456416705bad1b09adc7bfb8368b7bd6
+  data.tar.gz: b1effdd60eb893891010b2e2deedd2a32a933a92
 SHA512:
-  metadata.gz: 647b5b6d9342433cff972803f234a8258bcf0de68cf110a48b2717493b804e92a7bed0166d9816334cf451a495e40363b995c13b3dc85e9c63473da3d3b30169
-  data.tar.gz: 9bc94e204b204775184ed9a11ca3f6ceeaf14cc0068e6120ab761b7812c6b79335eabf0049bcad08f30d5ca16c89147e638f3e146be5a63dfad58327343f170f
+  metadata.gz: 7f023ced080ea09a708f2ff807784d4961449a1ae9f297a38b830d1998ae2fd03877414395a173eea6ba947aea0b58000a8a441721e6c3e9424b495464090e0d
+  data.tar.gz: f8322e10204735a71a92e2263570b95cf71eee1c93ec189a3a077437b09449db459ddfe50c89524f71a8a3a1721f51c84499d167e20bfc6f0992a7d18b8e9026

data/lib/bipbip/plugin/monit.rb

@@ -4,9 +4,10 @@ module Bipbip
 
   class Plugin::Monit < Plugin
 
-    #See https://bitbucket.org/tildeslash/monit/src/d60968cf7972cc902e5b6e2961d44456e1d9b736/src/monit.h?at=master#cl-135
-    #    https://bitbucket.org/tildeslash/monit/src/d60968cf7972cc902e5b6e2961d44456e1d9b736/src/monit.h?at=master#cl-146
+    # See https://bitbucket.org/tildeslash/monit/src/d60968cf7972cc902e5b6e2961d44456e1d9b736/src/monit.h?at=master#monit.h-145
     STATE_FAILED = '1'
+
+    # See https://bitbucket.org/tildeslash/monit/src/d60968cf7972cc902e5b6e2961d44456e1d9b736/src/monit.h?at=master#monit.h-135
     MONITOR_NOT = '0'
 
     def metrics_schema

data/lib/bipbip/plugin/nginx.rb

@@ -4,7 +4,14 @@ module Bipbip
 
     def metrics_schema
       [
-          {:name => 'connections_requested', :type => 'counter', :unit => 'Requests'},
+        {:name => 'connections_accepts', :type => 'counter', :unit => 'Connections'},
+        {:name => 'connections_handled', :type => 'counter', :unit => 'Connections'},
+        {:name => 'connections_dropped', :type => 'counter', :unit => 'Connections'},
+        {:name => 'connections_requests', :type => 'counter', :unit => 'Requests'},
+        {:name => 'active_total', :type => 'gauge', :unit => 'Connections'},
+        {:name => 'active_reading', :type => 'gauge', :unit => 'Connections'},
+        {:name => 'active_writing', :type => 'gauge', :unit => 'Connections'},
+        {:name => 'active_waiting', :type => 'gauge', :unit => 'Connections'},
       ]
     end
 
@@ -14,10 +21,36 @@ module Bipbip
 
       raise "Invalid response from server at #{config['url']}" unless response.code == "200"
 
-      nstats = response.body.split(/\r*\n/)
-      connections_requested = nstats[2].lstrip.split(/\s+/)[2].to_i
+      lines = response.body.split(/\r*\n/)
+      lines.map { |line| line.strip! }
 
-      {:connections_requested => connections_requested}
+      data = {}
+
+      stats_connections = match_or_fail(lines[2], /^(\d+) (\d+) (\d+)$/)
+      data[:connections_accepts] = stats_connections[1].to_i
+      data[:connections_handled] = stats_connections[2].to_i
+      data[:connections_dropped] = data[:connections_accepts] - data[:connections_handled]
+      data[:connections_requests] = stats_connections[3].to_i
+
+      stats_active_total = match_or_fail(lines[0], /^Active connections: (\d+)$/)
+      data[:active_total] = stats_active_total[1].to_i
+
+      stats_active = match_or_fail(lines[3], /^Reading: (\d+) Writing: (\d+) Waiting: (\d+)$/)
+      data[:active_reading] = stats_active[1].to_i
+      data[:active_writing] = stats_active[2].to_i
+      data[:active_waiting] = stats_active[3].to_i
+
+      data
+    end
+
+    # @param [String] string
+    # @param [Regexp] regexp
+    def match_or_fail(string, regexp)
+      match_data = regexp.match(string)
+      if match_data.nil?
+        raise "Data `#{string}` doesn't match pattern `#{regexp}`."
+      end
+      match_data
     end
   end
 end

data/lib/bipbip/version.rb

@@ -1,3 +1,3 @@
 module Bipbip
-  VERSION = '0.6.5'
+  VERSION = '0.6.6'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: bipbip
 version: !ruby/object:Gem::Version
-  version: 0.6.5
+  version: 0.6.6
 platform: ruby
 authors:
 - Cargo Media
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-07-20 00:00:00.000000000 Z
+date: 2015-07-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: copperegg-revealmetrics
@@ -194,6 +194,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '2.0'
+- !ruby/object:Gem::Dependency
+  name: webmock
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.21'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.21'
 description: Agent to collect data for common server programs and push them to CopperEgg
 email: hello@cargomedia.ch
 executables: