bipbip 0.7.15 → 0.7.16

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 41b558704dccb9db809d7dafb2c3c60442d8f93e
-  data.tar.gz: 9a87d0fdbe5aac87286d2aa7bfa3224a0c31c085
+  metadata.gz: 11450808d6b1bd8277819a4b49c329d70f6d3516
+  data.tar.gz: bdfcec2e7e5f07b98a37993e6d3c89694c3dfd4a
 SHA512:
-  metadata.gz: 1ece6820ae355f00eb8b92afb0eb79ed9151233125aa50c1e7364b84a505343850dfa8bfd654cf4b17c070fef8d0fab90d5e8ffd29cd836d3425c75081b1c007
-  data.tar.gz: 80c461c40878d23aa4621adcf804fc94685e6c66cbe23566842ab40c80277c898515d022a78adbedce35cdcdbe1dbbd075e80942c9a098260a7f69f731397a39
+  metadata.gz: 09602e7d5b87f22b4eec2da2e816f3a02b54e4310ed6236550d4521db2436f2843649f489627888cb9d54f6abef381cfc2464dcb704d0db1d5d8de84407e0e36
+  data.tar.gz: d68255814a6f4185f35fa560f96038c6983da3fc5bfdd9eb78c2fb27088c9f7a79f77edf8878a8be0702241c7debfe8273e94c700ca412b9924b9fdd2c18ba71

data/data/apc-status.php

@@ -2,8 +2,17 @@
 
 $infoOpcode = @apc_cache_info('opcode', true);
 $infoUser = @apc_cache_info('user', true);
+$infoAlloc = @apc_sma_info(true);
+
+// see https://github.com/krakjoe/apcu/blob/master/apc.php#L754
+$total_mem_size = (int) $infoAlloc['num_seg'] * (int) $infoAlloc['seg_size'];
+$avail_mem_size = (int) $infoAlloc['avail_mem'];
+$used_mem_size = $total_mem_size - $avail_mem_size;
 
 echo json_encode(array(
-  'opcode_mem_size' => (int) $infoOpcode['mem_size'],
-  'user_mem_size'   => (int) $infoUser['mem_size'],
+    'opcode_mem_size' => (int) $infoOpcode['mem_size'],
+    'user_mem_size'   => (int) $infoUser['mem_size'],
+    'total_mem_size'  => $total_mem_size,
+    'avail_mem_size'  => $avail_mem_size,
+    'used_mem_size'   => $used_mem_size,
 ));

data/lib/bipbip/plugin/fastcgi_php_apc.rb

@@ -3,11 +3,14 @@ module Bipbip
     def metrics_schema
       [
         { name: 'opcode_mem_size', type: 'gauge', unit: 'b' },
-        { name: 'user_mem_size', type: 'gauge', unit: 'b' }
+        { name: 'user_mem_size', type: 'gauge', unit: 'b' },
+        { name: 'used_mem_size', type: 'gauge', unit: 'b' },
+        { name: 'used_mem_percentage', type: 'gauge', unit: '%' }
       ]
     end
 
-    def monitor
+    # @return [Hash]
+    def _fetch_apc_stats
       authority = config['host'].to_s + ':' + config['port'].to_s
       path = File.join(Bipbip::Helper.data_path, 'apc-status.php')
 
@@ -20,9 +23,17 @@ module Bipbip
 
       body = response.split(/\r?\n\r?\n/)[1]
       raise "FastCGI response has no body: #{response}" unless body
-      stats = JSON.parse(body)
+      JSON.parse(body)
+    end
 
-      { opcode_mem_size: stats['opcode_mem_size'].to_i, user_mem_size: stats['user_mem_size'].to_i }
+    def monitor
+      stats = _fetch_apc_stats
+      {
+        opcode_mem_size: stats['opcode_mem_size'].to_i,
+        user_mem_size: stats['user_mem_size'].to_i,
+        used_mem_size: stats['used_mem_size'].to_i,
+        used_mem_percentage: (stats['used_mem_size'].to_f / stats['total_mem_size'].to_f) * 100
+      }
     end
   end
 end

data/lib/bipbip/version.rb

@@ -1,3 +1,3 @@
 module Bipbip
-  VERSION = '0.7.15'.freeze
+  VERSION = '0.7.16'.freeze
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: bipbip
 version: !ruby/object:Gem::Version
-  version: 0.7.15
+  version: 0.7.16
 platform: ruby
 authors:
 - Cargo Media
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-04-19 00:00:00.000000000 Z
+date: 2017-05-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: copperegg-revealmetrics
@@ -60,14 +60,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.2.1
+        version: 3.3.3
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.2.1
+        version: 3.3.3
 - !ruby/object:Gem::Dependency
   name: gearman-ruby
   requirement: !ruby/object:Gem::Requirement
@@ -222,6 +222,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 0.1.6
+- !ruby/object:Gem::Dependency
+  name: net-telnet
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.1.1
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.1.1
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -256,14 +270,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.21'
+        version: 3.0.1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.21'
+        version: 3.0.1
 - !ruby/object:Gem::Dependency
   name: rubocop
   requirement: !ruby/object:Gem::Requirement