sensu-plugins-http 2.0.2 → 2.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a2688318fd63b4bc7b3776c42e97babce536897c
-  data.tar.gz: e6168f39d78aabe8c5592ded921124798ff01e33
+  metadata.gz: 2a80fe427bc654ad938c9ef9dd0aac9485778a35
+  data.tar.gz: caf691caa222f28a009329a82a437dd44077d8e0
 SHA512:
-  metadata.gz: 9d7c6302e36e1703eb97508f6793f6ffc204ca55a3ad50654f4257e5d1baaf41e484aa38a4aea529f481830ce44f3364608caee395b42035e1f53a7276e38ec2
-  data.tar.gz: 0213ef5075fe92db8d4348dba3fc511fd0fbc0fac9bde4612d112c364d4e918df9709bd63aa96a4f2d4814052f185611908fd061ddd61184d0a8f43b655a7e4a
+  metadata.gz: 67c642ac68ae94fa2e5a322ba53c02f5bc6989fac0dfbfc912ebb587729a193665366270a5437afb059b4728e26c1b06b4e5a98018b0bca0b110cc8c65192f84
+  data.tar.gz: 09446024c1bfaeb932b4c79a72c46fffc6a11af39cb62b99e8f3d7167190c6f42623edab6ad98e2b042a3aee468cd01bc9192482dbbe59e7f887a8bf317f4be5

data/CHANGELOG.md

@@ -4,6 +4,13 @@ This project adheres to [Semantic Versioning](http://semver.org/).
 This CHANGELOG follows the format listed at [Keep A Changelog](http://keepachangelog.com/)
 
 ## [Unreleased]
+## [2.1.0]
+### Fixed
+- `check-http-json`: fix error when check fails and --whole-response is enabled (@ushis)
+
+### Added
+- `check-http`: add checksum check
+- documentation on ssl issues (@majormoses @pgporada)
 
 ## [2.0.2] - 2017-03-13
 ### Fixed
@@ -117,7 +124,8 @@ This CHANGELOG follows the format listed at [Keep A Changelog](http://keepachang
 ### Added
 - Initial release
 
-[Unreleased]: https://github.com/sensu-plugins/sensu-plugins-http/compare/2.0.2...HEAD
+[Unreleased]: https://github.com/sensu-plugins/sensu-plugins-http/compare/2.1.0...HEAD
+[2.1.0]: https://github.com/sensu-plugins/sensu-plugins-http/compare/2.0.2...2.1.0
 [2.0.2]: https://github.com/sensu-plugins/sensu-plugins-http/compare/2.0.1...2.0.2
 [2.0.1]: https://github.com/sensu-plugins/sensu-plugins-http/compare/2.0.0...2.0.1
 [2.0.0]: https://github.com/sensu-plugins/sensu-plugins-http/compare/1.0.0...2.0.0

data/README.md

@@ -30,3 +30,6 @@ This is helpful if you do not want to configure connection information as an arg
 [Installation and Setup](http://sensu-plugins.io/docs/installation_instructions.html)
 
 ## Notes
+
+### check-http.rb and check-https-cert.rb
+This check is not really geared to check all of the complexities of ssl which is why there is a separate repo and set of checks for that: https://github.com/sensu-plugins/sensu-plugins-ssl. If you are trying to say verify cert exipiration you will notice that in some cases it does not do what you always expect it to do. For example it might appear that when using using `-k` option you see different expiration times. This is due to the fact that when using `-k` it does not check expiration of all of the certs in the chain. Rather than duplicate this behavior in this check use the other repo where we handle those more complicated ssl checks better. For more information see: https://github.com/sensu-plugins/sensu-plugins-http/issues/67

data/bin/check-http-json.rb

@@ -164,7 +164,7 @@ class CheckJson < Sensu::Plugin::Check::CLI
     res = http.request(req)
 
     unless res.code =~ /^2/
-      critacal "http code: #{res.code}: body: #{res.body}" if config[:whole_response]
+      critical "http code: #{res.code}: body: #{res.body}" if config[:whole_response]
       critical res.code
     end
     critical 'invalid JSON from request' unless json_valid?(res.body)

data/bin/check-http.rb

@@ -42,6 +42,7 @@
 require 'sensu-plugin/check/cli'
 require 'net/http'
 require 'net/https'
+require 'digest'
 
 #
 # Check HTTP
@@ -139,6 +140,11 @@ class CheckHttp < Sensu::Plugin::Check::CLI
          long: '--negquery PAT',
          description: 'Query for a specific pattern that must be absent'
 
+  option :sha256checksum,
+         short: '-S CHECKSUM',
+         long: '--checksum CHECKSUM',
+         description: 'SHA-256 checksum'
+
   option :timeout,
          short: '-t SECS',
          long: '--timeout SECS',
@@ -320,6 +326,12 @@ class CheckHttp < Sensu::Plugin::Check::CLI
         else
           ok "#{res.code}, did not find /#{config[:negpattern]}/ in #{size} bytes" + body
         end
+      elsif config[:sha256checksum]
+        if Digest::SHA256.hexdigest(res.body).eql? config[:sha256checksum]
+          ok "#{res.code}, checksum match #{config[:sha256checksum]} in #{size} bytes" + body
+        else
+          critical "#{res.code}, checksum did not match #{config[:sha256checksum]} in #{size} bytes: #{res.body[0...200]}..."
+        end
       else
         ok("#{res.code}, #{size} bytes" + body) unless config[:response_code]
       end

data/bin/check-https-cert.rb

@@ -3,8 +3,9 @@
 #   check-https-cert
 #
 # DESCRIPTION:
-#    Checks the expiration date of a URL SSL Certificate
-#    and notifies if it is before the expiry parameter.
+#    Checks the expiration date of a URL's TLS/SSL Certificate
+#    and notifies if it is before the expiry parameter. Throws
+#    a critical if the date is at or past the expiry date.
 #
 # OUTPUT:
 #   plain text
@@ -17,12 +18,17 @@
 #   gem: net-https
 #
 # USAGE:
-#   #YELLOW
+#   Check that will warn 1 week prior and critical 3 days prior
+#      ./check-https-cert.rb -u https://my.site.com -w 7 -c 3
+#
+#   Check an insecure certificate that will warn 1 week prior and critical 3 days prior
+#      ./check-https-cert.rb -u https://my.site.com -k -w 7 -c 3
 #
 # NOTES:
 #
 # LICENSE:
 #   Copyright 2014 Rhommel Lamas <roml@rhommell.com>
+#   Updated by Phil Porada 2017 to provide more clear documentation and messages
 #   Released under the same terms as Sensu (the MIT license); see LICENSE
 #   for details.
 #
@@ -38,7 +44,7 @@ class CheckHttpCert < Sensu::Plugin::Check::CLI
          short: '-u URL',
          long: '--url URL',
          proc: proc(&:to_s),
-         description: 'A URL to connect to'
+         description: 'The URL to connect to'
 
   option :warning,
          short: '-w',
@@ -76,15 +82,14 @@ class CheckHttpCert < Sensu::Plugin::Check::CLI
     days_until = ((@cert.not_after - Time.now) / (60 * 60 * 24)).to_i
 
     if days_until <= 0
-      critical "Expired #{days_until.abs} days ago."
+      critical "TLS/SSL certificate expired #{days_until.abs} days ago."
     elsif days_until < config[:critical].to_i
-      critical "SSL expires on #{@cert.not_after} - #{days_until} days left."
+      critical "TLS/SSL certificate expires on #{@cert.not_after} - #{days_until} days left."
     elsif days_until < config[:warning].to_i
-      warning "SSL expires on #{@cert.not_after} - #{days_until} days left."
+      warning "TLS/SSL certificate expires on #{@cert.not_after} - #{days_until} days left."
     else
-      ok "SSL expires on #{@cert.not_after} - #{days_until} days left."
+      ok "TLS/SSL certificate expires on #{@cert.not_after} - #{days_until} days left."
     end
-
   rescue
     critical "Could not connect to #{config[:url]}"
   end

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

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sensu-plugins-http
 version: !ruby/object:Gem::Version
-  version: 2.0.2
+  version: 2.1.0
 platform: ruby
 authors:
 - Sensu-Plugins and contributors
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-03-14 00:00:00.000000000 Z
+date: 2017-05-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sensu-plugin