sensu-plugins-php-fpm 0.1.0 → 1.0.1

checksums.yaml

@@ -1,15 +1,7 @@
 ---
-!binary "U0hBMQ==":
-  metadata.gz: !binary |-
-    NzYxZDVjZTQwYjJjMWIzOTgzOTE1Y2RlMGQ1Zjk0ZGFkMjIzYzcwNA==
-  data.tar.gz: !binary |-
-    Yzc0ZTFhOGNlNzFhMDFhNTVlMWQ4YTc4M2Q1NGIwMWJhNjA4NzNkYw==
+SHA1:
+  metadata.gz: 12d7a1692f062bf6908517130270e370080c9c3a
+  data.tar.gz: 20f34acda678989961e33e94d5e74ffc9b550e01
 SHA512:
-  metadata.gz: !binary |-
-    ZmY0NjIzMzE5MDJiMGU3OTg0MDVlYjU2ZGZlM2RjOWVlNTBjMzMwMWRlYTQx
-    OGZiNjJjOTg2MTViYjRkZDEyYmUwZDA5YzZmMjI2NWUzYjVjNTUzNGQwOTUz
-    M2UzODkzZjU3MTQ3NmYwNjNmNmVmYTY1OTk2M2ZhOGU2M2QyNTI=
-  data.tar.gz: !binary |-
-    OTFiODFmZGZlMTY3OTc3MjQ3OGZkMmNlOWExNGUyOTk2NTZmMzhjYzk3MDE5
-    Zjc1NDc3ZGZjMTBlMjBhYmUyZTZmMTQ0MjQzYTg3NTQzZTU0YzAzYWI4Y2Jk
-    MzQ1ZDE5NTZhYTgzYzljMmM3NzAzYjE3ZDRjYTQyOTdkNDFjMGQ=
+  metadata.gz: 44efc19b2c20936023cb51d7175a7f593126920a371c30485096b832276ccc1ffd18e9df25c16454121814c6edc0ed36ed919d8262c9f798f6a368c8871b2f60
+  data.tar.gz: edac9945dc598bf311aca1428e1d36dc02b0d4b8e75eec37361640068232159399822c1f7d2c40710671e269d5519285d363a6a7d4378d3f1b04d78b67690986

data/CHANGELOG.md

@@ -5,6 +5,21 @@ This CHANGELOG follows the format listed at [Keep A Changelog](http://keepachang
 
 ## [Unreleased]
 
+## [1.0.1] 2017-07-14
+### No-op
+- no real change (deployment issues)
+
+## [1.0.0] 2017-07-14
+### Added
+- ruby 2.3, 2.4 testing
+
+### Breaking Changes
+- removed < 2.0 ruby support
+
+### Changed
+- Removed Crack as a dependency of the metric script
+- Better feedback for missing/invalid URL in the metric script
+
 ## [0.1.0] - 2016-09-25
 ### Added
 - check-php-fpm.rb: added --pool option for mapping pools based on args in Nginx
@@ -36,7 +51,9 @@ This CHANGELOG follows the format listed at [Keep A Changelog](http://keepachang
 ### Added
 - initial release
 
-[Unreleased]: https://github.com/sensu-plugins/sensu-plugins-php-fpm/compare/0.1.0...HEAD
+[Unreleased]: https://github.com/sensu-plugins/sensu-plugins-php-fpm/compare/1.0.1...HEAD
+[1.0.1]: https://github.com/sensu-plugins/sensu-plugins-php-fpm/compare/1.0.0...1.0.1
+[1.0.0]: https://github.com/sensu-plugins/sensu-plugins-php-fpm/compare/0.1.0...1.0.0
 [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

data/bin/metrics-php-fpm.rb

@@ -3,8 +3,6 @@
 # Pull php-fpm metrics from php-fpm status page
 # ===
 #
-# Requires `crack` gem to parse xml.
-#
 # Copyright 2014 Ilari Makela ilari at i28.fi
 #
 # Released under the same terms as Sensu (the MIT license); see LICENSE
@@ -13,13 +11,13 @@
 require 'sensu-plugin/metric/cli'
 require 'net/https'
 require 'uri'
-require 'crack'
 
 class PhpfpmMetrics < Sensu::Plugin::Metric::CLI::Graphite
   option :url,
          short: '-u URL',
          long: '--url URL',
-         description: 'Full URL to php-fpm status page, example: http://yoursite.com/php-fpm-status'
+         description: 'Full URL to php-fpm status page, example: http://yoursite.com/php-fpm-status',
+         required: true
 
   option :scheme,
          description: 'Metric naming scheme, text to prepend to metric',
@@ -39,24 +37,26 @@ class PhpfpmMetrics < Sensu::Plugin::Metric::CLI::Graphite
     # #YELLOW
     until found || attempts >= 10
       attempts += 1
-      if config[:url]
-        uri = URI.parse(config[:url])
+      url = config[:url]
+      if url
+        uri = URI.parse(url)
         http = Net::HTTP.new(uri.host, uri.port)
         if uri.scheme == 'https'
           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].to_s)
+        request = Net::HTTP::Get.new(uri.request_uri, 'User-Agent' => config[:agent].to_s)
         response = http.request(request)
         if response.code == '200'
           found = true
         elsif !response.header['location'].nil?
-          config[:url] = response.header['location']
+          url = response.header['location']
         end
       end
     end # until
 
-    stats = Crack::XML.parse(response.body)
+    critical "Unable to load url #{config[:url]}" if response.nil? || response.code != '200'
+
     stat = %w(start_since
               accepted_conn
               listen_queue
@@ -68,8 +68,10 @@ class PhpfpmMetrics < Sensu::Plugin::Metric::CLI::Graphite
               max_active_processes
               max_children_reached
               slow_requests)
-    stat.each do |name|
-      output "#{config[:scheme]}.#{name}", stats['status'][name]
+    response.body.each_line do |line|
+      k, v = line.split(':').map(&:strip)
+      k.tr! ' ', '_'
+      output "#{config[:scheme]}.#{k}", v if stat.include? k
     end
     ok
   end

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

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

metadata

@@ -1,171 +1,157 @@
 --- !ruby/object:Gem::Specification
 name: sensu-plugins-php-fpm
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 1.0.1
 platform: ruby
 authors:
 - Sensu-Plugins and contributors
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-09-26 00:00:00.000000000 Z
+date: 2017-07-14 00:00:00.000000000 Z
 dependencies:
-- !ruby/object:Gem::Dependency
-  name: crack
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - '='
-      - !ruby/object:Gem::Version
-        version: 0.4.2
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - '='
-      - !ruby/object:Gem::Version
-        version: 0.4.2
 - !ruby/object:Gem::Dependency
   name: sensu-plugin
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         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.40.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         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:
 - check-php-fpm.rb
 - metrics-php-fpm.rb
@@ -183,7 +169,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'
@@ -195,12 +181,12 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
-      version: 1.9.3
+      version: 2.0.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []