sensu-plugins-php-fpm 0.0.5 → 0.1.0

checksums.yaml

@@ -1,7 +1,15 @@
 ---
-SHA1:
-  metadata.gz: cadf044f7d84141c6c596ba19b1eec6b9f925800
-  data.tar.gz: 055947dba8c3ef1a9e8da27aaa833fe9d1271a89
+!binary "U0hBMQ==":
+  metadata.gz: !binary |-
+    NzYxZDVjZTQwYjJjMWIzOTgzOTE1Y2RlMGQ1Zjk0ZGFkMjIzYzcwNA==
+  data.tar.gz: !binary |-
+    Yzc0ZTFhOGNlNzFhMDFhNTVlMWQ4YTc4M2Q1NGIwMWJhNjA4NzNkYw==
 SHA512:
-  metadata.gz: 4a42d100f1d5ca248ffb3a5d82b3e83cb55495d87f1e1622434cd3e07dd784c186c34eee1930ebdc297909d5d1c05deb208a111194a892eb69523116e11bcc02
-  data.tar.gz: bc3752e50416d4fa0208553fa1a8fc039b858009cbbcf6982b0a2b0356183ff920abf16b795683804ffe9fe889207a05ca5051f7a11b5994f0473e5dc4791489
+  metadata.gz: !binary |-
+    ZmY0NjIzMzE5MDJiMGU3OTg0MDVlYjU2ZGZlM2RjOWVlNTBjMzMwMWRlYTQx
+    OGZiNjJjOTg2MTViYjRkZDEyYmUwZDA5YzZmMjI2NWUzYjVjNTUzNGQwOTUz
+    M2UzODkzZjU3MTQ3NmYwNjNmNmVmYTY1OTk2M2ZhOGU2M2QyNTI=
+  data.tar.gz: !binary |-
+    OTFiODFmZGZlMTY3OTc3MjQ3OGZkMmNlOWExNGUyOTk2NTZmMzhjYzk3MDE5
+    Zjc1NDc3ZGZjMTBlMjBhYmUyZTZmMTQ0MjQzYTg3NTQzZTU0YzAzYWI4Y2Jk
+    MzQ1ZDE5NTZhYTgzYzljMmM3NzAzYjE3ZDRjYTQyOTdkNDFjMGQ=

data/CHANGELOG.md

@@ -3,7 +3,15 @@ This project adheres to [Semantic Versioning](http://semver.org/).
 
 This CHANGELOG follows the format listed at [Keep A Changelog](http://keepachangelog.com/)
 
-## Unreleased
+## [Unreleased]
+
+## [0.1.0] - 2016-09-25
+### Added
+- check-php-fpm.rb: added --pool option for mapping pools based on args in Nginx
+
+### Changed
+- Changed dependency on sensu-plugin from strict (= 1.2.0) to pessimistic (~> 1.2)
+- Updated Nginx configuration examples in README
 
 ## [0.0.5] - 2016-01-06
 ### Fixed
@@ -18,7 +26,6 @@ This CHANGELOG follows the format listed at [Keep A Changelog](http://keepachang
 - updated sensu-plugin gem to 1.2.0
 
 ## [0.0.2] - 2015-06-03
-
 ### Fixed
 - added binstubs
 
@@ -26,11 +33,12 @@ This CHANGELOG follows the format listed at [Keep A Changelog](http://keepachang
 - removed cruft from /lib
 
 ## 0.0.1 - 2015-05-21
-
 ### Added
 - initial release
 
-[unreleased]: https://github.com/sensu-plugins/sensu-plugins-php-fpm/compare/0.0.4...HEAD
+[Unreleased]: https://github.com/sensu-plugins/sensu-plugins-php-fpm/compare/0.1.0...HEAD
+[0.1.0]: https://github.com/sensu-plugins/sensu-plugins-php-fpm/compare/0.0.5...0.1.0
+[0.0.5]: https://github.com/sensu-plugins/sensu-plugins-php-fpm/compare/0.0.4...0.0.5
 [0.0.4]: https://github.com/sensu-plugins/sensu-plugins-php-fpm/compare/0.0.3...0.0.4
 [0.0.3]: https://github.com/sensu-plugins/sensu-plugins-php-fpm/compare/0.0.2...0.0.3
 [0.0.2]: https://github.com/sensu-plugins/sensu-plugins-php-fpm/compare/0.0.1...0.0.2

data/README.md

@@ -5,7 +5,6 @@
 [![Code Climate](https://codeclimate.com/github/sensu-plugins/sensu-plugins-php-fpm/badges/gpa.svg)](https://codeclimate.com/github/sensu-plugins/sensu-plugins-php-fpm)
 [![Test Coverage](https://codeclimate.com/github/sensu-plugins/sensu-plugins-php-fpm/badges/coverage.svg)](https://codeclimate.com/github/sensu-plugins/sensu-plugins-php-fpm)
 [![Dependency Status](https://gemnasium.com/sensu-plugins/sensu-plugins-php-fpm.svg)](https://gemnasium.com/sensu-plugins/sensu-plugins-php-fpm)
-[![Codeship Status for sensu-plugins/sensu-plugins-php-fpm](https://codeship.com/projects/427ed6d0-dc04-0132-8e5a-1e3fe125131b/status?branch=master)](https://codeship.com/projects/79856)
 
 ## Functionality
 
@@ -15,16 +14,29 @@
 
 ## Usage
 
-This check use a nginx config in default vhost like :
+Make sure you adjust the `fastcgi_pass` socket to whatever you are using:
 
 ```
-set $pool "www-data";
+location ~ "/fpm-(status|ping)" {
+  include       /etc/nginx/fastcgi_params;
+  fastcgi_pass  unix:/var/run/php5-fpm.sock;
+  fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name;
+  access_log off;
+  allow 127.0.0.1;
+  deny all;
+}
+```
+
+Alternatively, but keep in mind that "ifs are evil":
+
+```
+set $pool "php5-fpm";
 if ($arg_pool) {
   set $pool $arg_pool;
 }
 location ~ "/fpm-(status|ping)" {
   include       /etc/nginx/fastcgi_params;
-  fastcgi_pass  unix:/var/run/php-$pool.sock;
+  fastcgi_pass  unix:/var/run/$pool.sock;
   fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name;
   access_log off;
   allow 127.0.0.1;

data/bin/check-php-fpm.rb

@@ -33,12 +33,6 @@ require 'uri'
 require 'socket'
 
 class CheckPHPFpm < Sensu::Plugin::Check::CLI
-  option :pool,
-         short: '-p POOL',
-         long: '--pool POOL',
-         description: 'Full POOL name to fpm ping page, example: https://yoursite.com/fpm-ping?pool=POOL',
-         default: 'www-data'
-
   option :hostname,
          short: '-h HOSTNAME',
          long: '--host HOSTNAME',
@@ -46,25 +40,30 @@ class CheckPHPFpm < Sensu::Plugin::Check::CLI
          default: 'localhost'
 
   option :port,
-         short: '-P PORT',
+         short: '-p PORT',
          long: '--port PORT',
          description: 'Nginx  port',
          default: '80'
 
   option :path,
          short: '-q PATH',
-         long: '--statspath PATH',
+         long: '--path PATH',
          description: 'Path to your fpm ping',
-         default: 'fpm-ping?pool='
+         default: 'fpm-ping'
+
+  option :pool,
+         short: '-P ?pool=POOL',
+         long: '--pool ?pool=POOL',
+         description: 'Name of your pool, if you are dynamically mapping pools based on args in Nginx'
 
   option :scheme,
-         description: 'Metric naming scheme, text to prepend to metric',
+         description: 'Request scheme to use',
          short: '-s SCHEME',
          long: '--scheme SCHEME',
          default: 'http://'
 
   option :response,
-         description: 'Reponse of ping',
+         description: 'Expected response',
          short: '-r RESPONSE',
          long: '--response RESPONSE',
          default: 'pong'
@@ -84,7 +83,11 @@ class CheckPHPFpm < Sensu::Plugin::Check::CLI
          default: false
 
   def run
-    config[:url] = config[:scheme] + config[:hostname].to_s + ':' + config[:port].to_s + '/' + config[:path].to_s + config[:pool].to_s
+    if config[:pool]
+      config[:path] = config[:path] + config[:pool]
+    end
+
+    config[:url] = config[:scheme] + config[:hostname].to_s + ':' + config[:port].to_s + '/' + config[:path].to_s
     config[:fqdn] = Socket.gethostname
     uri = URI.parse(config[:url])
 
@@ -100,7 +103,7 @@ class CheckPHPFpm < Sensu::Plugin::Check::CLI
 
     if response.code == '200'
       if response.body == config[:response]
-        ok "#{config[:response]}"
+        ok config[:response].to_s
       else
         critical "#{response.body} instead of #{config[:response]}"
       end

data/bin/metrics-php-fpm.rb

@@ -46,7 +46,7 @@ class PhpfpmMetrics < Sensu::Plugin::Metric::CLI::Graphite
           http.use_ssl = true
           http.verify_mode = OpenSSL::SSL::VERIFY_NONE
         end
-        request = Net::HTTP::Get.new(uri.request_uri + '?xml', 'User-Agent' => "#{config[:agent]}")
+        request = Net::HTTP::Get.new(uri.request_uri + '?xml', 'User-Agent' => config[:agent].to_s)
         response = http.request(request)
         if response.code == '200'
           found = true

data/lib/sensu-plugins-php-fpm/version.rb

@@ -1,8 +1,8 @@
 module SensuPluginsPhpFpm
   module Version
     MAJOR = 0
-    MINOR = 0
-    PATCH = 5
+    MINOR = 1
+    PATCH = 0
 
     VER_STRING = [MAJOR, MINOR, PATCH].compact.join('.')
   end

metadata

@@ -1,36 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sensu-plugins-php-fpm
 version: !ruby/object:Gem::Version
-  version: 0.0.5
+  version: 0.1.0
 platform: ruby
 authors:
 - Sensu-Plugins and contributors
 autorequire: 
 bindir: bin
-cert_chain:
-- |
-  -----BEGIN CERTIFICATE-----
-  MIIDgDCCAmigAwIBAgIBATANBgkqhkiG9w0BAQUFADBDMRIwEAYDVQQDDAltYXR0
-  am9uZXMxGDAWBgoJkiaJk/IsZAEZFgh5aWVsZGJvdDETMBEGCgmSJomT8ixkARkW
-  A2NvbTAeFw0xNTAxMjgyMTAyNTFaFw0xNjAxMjgyMTAyNTFaMEMxEjAQBgNVBAMM
-  CW1hdHRqb25lczEYMBYGCgmSJomT8ixkARkWCHlpZWxkYm90MRMwEQYKCZImiZPy
-  LGQBGRYDY29tMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAyTSzVYnO
-  CLgyrIyT1mBQakArQyW8xhi6MlDqyzXHJGeERT790U6EgoBVeS4XoK0ptFZNR8Tf
-  zko0w+Nv47TarSCgkPOaxY+mxWnAVR10dOmfeLr7huiMyps+YD56/EF2FqQ3jf/+
-  qohENfKD91qy1ieEy+Fn7Pf74ltbNKUdkb9a9eFXQ0DQ4ip5vik7DzjQkUTj4lca
-  k6ArwnmHX4YDhZoYtrQJ8jVktN0/+NtA40M5qkCYHNe5tUW25b/tKVYuioxG6b2Z
-  oIzaZxRLxf6HVAWpCVRT/F5+/yjigkX4u++eYacfLGleXQzoK7BL65vHGMJygWEE
-  0TKGqFOrl/L0AQIDAQABo38wfTAJBgNVHRMEAjAAMAsGA1UdDwQEAwIEsDAdBgNV
-  HQ4EFgQUEf6a8Td7MrSZc8ImbLFZAENPbz0wIQYDVR0RBBowGIEWbWF0dGpvbmVz
-  QHlpZWxkYm90LmNvbTAhBgNVHRIEGjAYgRZtYXR0am9uZXNAeWllbGRib3QuY29t
-  MA0GCSqGSIb3DQEBBQUAA4IBAQBbzXAYA3BVGw8DZ0YYoY1VHPNEcH5qPIApmHO8
-  rvSmuUT0yMEi7u00H/5uHRFf4LleGT/+sTdyXKsNPGT9kdRuQEgwi+vf7Zfvd8aX
-  UF/+4VkEYf/8rV8Ere6u2QaWPgApdMV6JjKr1fAwCTd8AuGXNaWItiPPMseSQzLJ
-  JKP4hVvbc1d+oS925B1lcBiqn2aYvElbyNAVmQPywNNqkWmvtlqj9ZVJfV5HQLdu
-  8sHuVruarogxxKPBzlL2is4EUb6oN/RdpGx2l4254+nyR+abg//Ed27Ym0PkB4lk
-  HP0m8WSjZmFr109pE/sVsM5jtOCvogyujQOjNVGN4gz1wwPr
-  -----END CERTIFICATE-----
-date: 2016-01-06 00:00:00.000000000 Z
+cert_chain: []
+date: 2016-09-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: crack
@@ -50,147 +28,147 @@ dependencies:
   name: sensu-plugin
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: 1.2.0
+        version: '1.2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: 1.2.0
+        version: '1.2'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '1.7'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '1.7'
 - !ruby/object:Gem::Dependency
   name: codeclimate-test-reporter
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '0.4'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '0.4'
 - !ruby/object:Gem::Dependency
   name: github-markup
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '1.3'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '1.3'
 - !ruby/object:Gem::Dependency
   name: pry
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '0.10'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '0.10'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '10.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '10.0'
 - !ruby/object:Gem::Dependency
   name: redcarpet
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '3.2'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '3.2'
 - !ruby/object:Gem::Dependency
   name: rubocop
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: 0.32.1
+        version: 0.40.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: 0.32.1
+        version: 0.40.0
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '3.1'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '3.1'
 - !ruby/object:Gem::Dependency
   name: yard
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '0.8'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '0.8'
 description: Sensu plugins for php-fpm
-email: "<sensu-users@googlegroups.com>"
+email: <sensu-users@googlegroups.com>
 executables:
-- metrics-php-fpm.rb
 - check-php-fpm.rb
+- metrics-php-fpm.rb
 extensions: []
 extra_rdoc_files: []
 files:
@@ -205,7 +183,7 @@ homepage: https://github.com/sensu-plugins/sensu-plugins-php-fpm
 licenses:
 - MIT
 metadata:
-  maintainer: "@tas50"
+  maintainer: ! '@tas50'
   development_status: active
   production_status: unstable - testing recommended
   release_draft: 'false'
@@ -217,17 +195,17 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - ! '>='
     - !ruby/object:Gem::Version
       version: 1.9.3
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.8
+rubygems_version: 2.4.5
 signing_key: 
 specification_version: 4
 summary: Sensu plugins for php-fpm