sensu-plugins-nginx 1.0.0 → 2.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4929bc899f1b85b16f1568ae7cf81524895b7ee6
-  data.tar.gz: 50943d1afac42702f95a50ac2751da88171c3f20
+  metadata.gz: 05d1419977c60acb91e63b663fcc053cf8e76649
+  data.tar.gz: 2b0476465460a7a844d5db59192f88af53590328
 SHA512:
-  metadata.gz: d0acdcb24b8fb792989353206aee966bece39b930c2e6133a9df6259e2813f544d710352773131fb60cb99073ade348e8bdaa76aa0cb4c60de2102c4360644db
-  data.tar.gz: 668fa7cccc1096cee779fadd1db308e3f4d7ff9913b4efe9c34f38242ff28ce5ce9e45d641d28439876b33e051ac0014f549762de99425dc485a41762feb25e8
+  metadata.gz: c35f35a6c7a717e6a41feab1ebfd51aea9e8700a9f22cfdc6ec66584a57420771462475a21af709838aa304f6a6251a479ab86b802e31cbd2f84d7c368bdcd74
+  data.tar.gz: 66050a2c8581f4806e9e539bd6057117d72d32d328e9a001fca7ed2faddc7e1dc138c9456b100d0e400d12637093aaf2d0178c2adf11d15f0edfe992a3b5ab02

data/CHANGELOG.md

@@ -3,9 +3,17 @@ This project adheres to [Semantic Versioning](http://semver.org/).
 
 This CHANGELOG follows the format listed at [Keep A Changelog](http://keepachangelog.com/)
 
-## Unreleased
+## [Unreleased]
 
-[1.0.0] - 2015-12-03
+## [2.0.0] - 2016-05-24
+### Changed
+- remove support for rubies < 2.0
+- update to rubocop 0.40 and cleanup
+
+### Added
+- ability to specify custom host header values
+
+## [1.0.0] - 2015-12-03
 ### Added
 - metrics-nginx.rb: Added default hostname of 'localhost'
 - metrics-nginx.rb: Added usage
@@ -28,7 +36,6 @@ This CHANGELOG follows the format listed at [Keep A Changelog](http://keepachang
 - updated sensu-plugin gem to 1.2.0
 
 ## [0.0.3] - 2015-06-10 **YANKED**
-
 ### Changed
 - changed the name of nginx-metrics.rb to metrics-nginx.rb to conform to std naming
 - nginx-metrics.rb is now depericiated and will be removed in a future release
@@ -46,5 +53,14 @@ This CHANGELOG follows the format listed at [Keep A Changelog](http://keepachang
 ### Changed
 - removed cruft from /lib
 
-## [0.0.1] - 2015-02-11 **YANKED**
+## 0.0.1 - 2015-02-11 **YANKED**
 - initial stable release
+
+[Unreleased]: https://github.com/sensu-plugins/sensu-plugins-nginx/compare/2.0.0...HEAD
+[2.0.0]: https://github.com/sensu-plugins/sensu-plugins-nginx/compare/1.0.0...2.0.0
+[1.0.0]: https://github.com/sensu-plugins/sensu-plugins-nginx/compare/0.0.6...1.0.0
+[0.0.6]: https://github.com/sensu-plugins/sensu-plugins-nginx/compare/0.0.5...0.0.6
+[0.0.5]: https://github.com/sensu-plugins/sensu-plugins-nginx/compare/0.0.4...0.0.5
+[0.0.4]: https://github.com/sensu-plugins/sensu-plugins-nginx/compare/0.0.3...0.0.4
+[0.0.3]: https://github.com/sensu-plugins/sensu-plugins-nginx/compare/0.0.2...0.0.3
+[0.0.2]: https://github.com/sensu-plugins/sensu-plugins-nginx/compare/0.0.1...0.0.2

data/README.md

@@ -5,7 +5,6 @@
 [![Code Climate](https://codeclimate.com/github/sensu-plugins/sensu-plugins-nginx/badges/gpa.svg)](https://codeclimate.com/github/sensu-plugins/sensu-plugins-nginx)
 [![Test Coverage](https://codeclimate.com/github/sensu-plugins/sensu-plugins-nginx/badges/coverage.svg)](https://codeclimate.com/github/sensu-plugins/sensu-plugins-nginx)
 [![Dependency Status](https://gemnasium.com/sensu-plugins/sensu-plugins-nginx.svg)](https://gemnasium.com/sensu-plugins/sensu-plugins-nginx)
-[![Codeship Status for sensu-plugins/sensu-plugins-nginx](https://codeship.com/projects/cb4b6810-cb1c-0132-b746-0ab4e5d2e01d/status?branch=master)](https://codeship.com/projects/75658)
 
 ## Functionality
 

data/bin/metrics-nginx.rb

@@ -58,6 +58,10 @@ class NginxMetrics < Sensu::Plugin::Metric::CLI::Graphite
          description: 'Path to your stub status module',
          default: 'nginx_status'
 
+  option :hostheader,
+         long: '--hostheader HOSTHEADER',
+         description: 'Set the Host header to this string'
+
   option :scheme,
          description: 'Metric naming scheme, text to prepend to metric',
          short: '-s SCHEME',
@@ -79,6 +83,9 @@ class NginxMetrics < Sensu::Plugin::Metric::CLI::Graphite
           http.verify_mode = OpenSSL::SSL::VERIFY_NONE
         end
         request = Net::HTTP::Get.new(uri.request_uri)
+        if config[:hostheader]
+          request['Host'] = config[:hostheader]
+        end
         response = http.request(request)
         if response.code == '200'
           found = true
@@ -95,17 +102,17 @@ class NginxMetrics < Sensu::Plugin::Metric::CLI::Graphite
 
     # #YELLOW
     response.body.split(/\r?\n/).each do |line|
-      if line.match(/^Active connections:\s+(\d+)/)
+      if line =~ /^Active connections:\s+(\d+)/
         connections = line.match(/^Active connections:\s+(\d+)/).to_a
         output "#{config[:scheme]}.active_connections", connections[1]
       end
-      if line.match(/^\s+(\d+)\s+(\d+)\s+(\d+)/)
+      if line =~ /^\s+(\d+)\s+(\d+)\s+(\d+)/
         requests = line.match(/^\s+(\d+)\s+(\d+)\s+(\d+)/).to_a
         output "#{config[:scheme]}.accepts", requests[1]
         output "#{config[:scheme]}.handled", requests[2]
         output "#{config[:scheme]}.requests", requests[3]
       end
-      if line.match(/^Reading:\s+(\d+).*Writing:\s+(\d+).*Waiting:\s+(\d+)/)
+      if line =~ /^Reading:\s+(\d+).*Writing:\s+(\d+).*Waiting:\s+(\d+)/
         queue = line.match(/^Reading:\s+(\d+).*Writing:\s+(\d+).*Waiting:\s+(\d+)/).to_a
         output "#{config[:scheme]}.reading", queue[1]
         output "#{config[:scheme]}.writing", queue[2]

data/lib/sensu-plugins-nginx/version.rb

@@ -1,6 +1,6 @@
 module SensuPluginsNginx
   module Version
-    MAJOR = 1
+    MAJOR = 2
     MINOR = 0
     PATCH = 0
 

metadata

@@ -1,51 +1,29 @@
 --- !ruby/object:Gem::Specification
 name: sensu-plugins-nginx
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 2.0.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: 2015-12-03 00:00:00.000000000 Z
+cert_chain: []
+date: 2016-05-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   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
@@ -148,16 +126,16 @@ dependencies:
   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: yard
   requirement: !ruby/object:Gem::Requirement
@@ -205,7 +183,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 1.9.3
+      version: '2.1'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
@@ -213,8 +191,9 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.8
+rubygems_version: 2.5.1
 signing_key: 
 specification_version: 4
 summary: Sensu plugins for the NGINX server
 test_files: []
+has_rdoc: