bipbip 0.2.3 → 0.2.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e4f44ff5a912f62505175131fc84b775583b58f1
-  data.tar.gz: 944a75282d428af5e347fc08a3cc8812a8db2ef9
+  metadata.gz: cee90e52bfde1b07ded79385252ea3fb7140f1ec
+  data.tar.gz: b233c2c91114e51704a4f5b15bdf2f8516973c64
 SHA512:
-  metadata.gz: 21e998fc4160e95dbc1222b50bfdcd337f7041dfcf37ad651f25ce6de3633902c894d88c3d55be23dfb47c69729d3c5b22f1eeb94a44baaf350d7ec292988896
-  data.tar.gz: 2dd70820ae7dcb8b2760ee33c2a6762031ed1a7a912f8ca5c8a49c33dd70aa215d8c9bb50c6a9a948903aa82e7dc8a65f47f0ca1aba1809e62349aec3c46b7e9
+  metadata.gz: 83c2fd818b0ac61e02d1ded9f77fc23d1fc5a5b6d19cbb2e68d628d61cb9f830c1cc55bb262b8a3f1130304d8e940f704ecbd649e05f7915676694e00b62b68b
+  data.tar.gz: da78b4ca96df1a3a78b645b576ec355faeaa99d9db51c249625fb298613c202f8e7f4ebbe66823765c9664dad5a94d630ef4d78c2cbbaeaa3e0971efc9c062f0

data/README.md

@@ -54,16 +54,21 @@ services:
   -
     plugin: nginx
     url: http://localhost:80/server-status
-  -
-    plugin: php-fpm
-    host: localhost
-    port: 9000
-    path: /fpm-status
   -
     plugin: network
   -
     plugin: php-apc
     url: http://localhost:80/apc-status
+  -
+    plugin: fastcgi-php-fpm
+    host: localhost
+    port: 9000
+    path: /fpm-status
+  -
+    plugin: fastcgi-php-apc
+    host: localhost
+    port: 9000
+    path: /usr/local/bin/apc-status.php
 ```
 
 Include configuration
@@ -83,9 +88,25 @@ port: 11211
 
 Plugins
 ----------------------------
-#### php-fpm
+#### fastcgi-php-fpm
+Requires the `cgi-fcgi` program (debian package: `libfcgi0ldbl`).
+
+#### fastcgi-php-apc
 Requires the `cgi-fcgi` program (debian package: `libfcgi0ldbl`).
 
+Create file `/usr/local/bin/apc-status.php` with content:
+```php
+<?php
+
+$infoOpcode = @apc_cache_info('opcode', true);
+$infoUser = @apc_cache_info('user', true);
+
+echo json_encode(array(
+  'opcode_mem_size' => (int) $infoOpcode['mem_size'],
+  'user_mem_size'   => (int) $infoUser['mem_size'],
+));
+```
+
 #### php-apc
 To collect `APC` stats of your apache process, please install the following script.
 

data/lib/bipbip/plugin/fastcgi_php_apc.rb

@@ -0,0 +1,30 @@
+module Bipbip
+
+  class Plugin::FastcgiPhpApc < Plugin
+
+    def metrics_schema
+      [
+          {:name => 'opcode_mem_size', :type => 'gauge', :unit => 'b'},
+          {:name => 'user_mem_size', :type => 'gauge', :unit => 'b'},
+      ]
+    end
+
+    def monitor
+      authority = config['host'].to_s + ':' + config['port'].to_s
+      path = config['path'].to_s
+
+      env_backup = ENV.to_hash
+      ENV['REQUEST_METHOD'] = 'GET'
+      ENV['SCRIPT_NAME'] = File.basename(path)
+      ENV['SCRIPT_FILENAME'] = path
+      response = `cgi-fcgi -bind -connect #{authority.shellescape} 2>&1`
+      ENV.replace(env_backup)
+
+      body = response.split(/\r?\n\r?\n/)[1]
+      raise "FastCGI response has no body: #{response}" unless body
+      stats = JSON.parse(body)
+
+      {:opcode_mem_size => stats['opcode_mem_size'].to_i, :user_mem_size => stats['user_mem_size'].to_i}
+    end
+  end
+end

data/lib/bipbip/plugin/{php_fpm.rb → fastcgi_php_fpm.rb}

@@ -1,6 +1,6 @@
 module Bipbip
 
-  class Plugin::PhpFpm < Plugin
+  class Plugin::FastcgiPhpFpm < Plugin
 
     def metrics_schema
       [

data/lib/bipbip/version.rb

@@ -1,3 +1,3 @@
 module Bipbip
-  VERSION = '0.2.3'
+  VERSION = '0.2.4'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: bipbip
 version: !ruby/object:Gem::Version
-  version: 0.2.3
+  version: 0.2.4
 platform: ruby
 authors:
 - Cargo Media
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-12-18 00:00:00.000000000 Z
+date: 2013-12-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: copperegg
@@ -121,13 +121,14 @@ files:
 - lib/bipbip/agent.rb
 - lib/bipbip/helper.rb
 - lib/bipbip/plugin/apache2.rb
+- lib/bipbip/plugin/fastcgi_php_apc.rb
+- lib/bipbip/plugin/fastcgi_php_fpm.rb
 - lib/bipbip/plugin/gearman.rb
 - lib/bipbip/plugin/memcached.rb
 - lib/bipbip/plugin/mysql.rb
 - lib/bipbip/plugin/network.rb
 - lib/bipbip/plugin/nginx.rb
 - lib/bipbip/plugin/php_apc.rb
-- lib/bipbip/plugin/php_fpm.rb
 - lib/bipbip/plugin/redis.rb
 - lib/bipbip/plugin.rb
 - lib/bipbip/storage/copperegg.rb