sensu-plugins-jenkins 1.6.0 → 1.6.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 39fd5b3937fe6713372b5d63c8e92169d887685b139d45c30a24377fedc67361
-  data.tar.gz: fa97643c9506f34e80050a32771aee13d57fb85c4c5be1e4474c06a2f07f45b7
+  metadata.gz: a1d9455eef0d25ddd14e51eb5209f2744654e1efb0a01fbd401092969d58d1b2
+  data.tar.gz: 4c0556da90432d42b4acf3f3ea19d8ea80daf5e27e069d06a9c1f4ce8ad5aedc
 SHA512:
-  metadata.gz: d5c34ddffef6b175f89184ad1b98016e2f7952f22a48490f387d78a3608290428aa99da3711e22c1ffdcc4f6ec41aac2bfeb6798c42839405ec31554231477dc
-  data.tar.gz: cb4e619432b734dc2d4ed385d3dc1d0d5e05d67f4d9d8daaf829244cbd20e35623c42e99b99500d466137a1f9309ffd09604146181cfc926f21a4cda9e768526
+  metadata.gz: 081c258532dcf13405f594854c949e7d54e5777f0d5cc6489ca7c0ba48247aaa92ffdedb747e9f0e4c1ebfb1f702d351abc622e74476e362b4dbafa7b5d7b3b5
+  data.tar.gz: f80ca63be1d2a744e366f8d762276eb9a7987170dcfc0d6414a21eb0208841985757a305d68828f50d0bfcf6152fea3ca432f77e73bcad1473be9698b8ead1d0

data/CHANGELOG.md

@@ -5,6 +5,14 @@ This CHANGELOG follows the format listed at [Our CHANGELOG Guidelines](https://g
 Which is based on [Keep A Changelog](http://keepachangelog.com/)
 
 ## [Unreleased]
+
+## [1.6.1] - 2018-03-01
+### Fixed
+- check-jenkins-health.rb: added various rescues to prevent from bricking (@mdzidic) (@majormoses)
+
+### Added
+- check-jenkins-health.rb: added `--verbose` option to allow user to control the output returned when you have an error (@majormoses)
+
 ## [1.6.0] - 2018-02-21
 ### Added
 - check-jenkins.rb: Add --insecure parameter to allow self signed ssl certs
@@ -81,7 +89,8 @@ Which is based on [Keep A Changelog](http://keepachangelog.com/)
 ### Added
 - initial release
 
-[Unreleased]: https://github.com/sensu-plugins/sensu-plugins-jenkins/compare/1.6.0...HEAD
+[Unreleased]: https://github.com/sensu-plugins/sensu-plugins-jenkins/compare/1.6.1...HEAD
+[1.6.1]: https://github.com/sensu-plugins/sensu-plugins-jenkins/compare/1.6.0...1.6.1
 [1.6.0]: https://github.com/sensu-plugins/sensu-plugins-jenkins/compare/1.5.0...1.6.0
 [1.5.0]: https://github.com/sensu-plugins/sensu-plugins-jenkins/compare/1.4.0...1.5.0
 [1.4.0]: https://github.com/sensu-plugins/sensu-plugins-jenkins/compare/1.3.0...1.4.0

data/bin/check-jenkins-health.rb

@@ -75,19 +75,42 @@ class JenkinsMetricsHealthChecker < Sensu::Plugin::Check::CLI
          proc: proc(&:to_i),
          default: 5
 
+  option :verbose,
+         short: '-v',
+         long: '--verbose',
+         boolean: true,
+         description: 'Return more verbose errors',
+         default: false
+
   def run
     https ||= config[:https] ? 'https' : 'http'
     testurl = "#{https}://#{config[:server]}:#{config[:port]}#{config[:uri]}"
 
-    r = if config[:https] && config[:insecure]
-          RestClient::Resource.new(testurl, timeout: config[:timeout], verify_ssl: false).get
-        elsif config[:https]
-          RestClient::Resource.new(testurl, timeout: config[:timeout], verify_ssl: true).get
-        else
-          RestClient::Resource.new(testurl, timeout: config[:timeout]).get
-        end
-
-    if [200, 500].include? r.code
+    begin
+      r = if config[:https] && config[:insecure]
+            RestClient::Resource.new(testurl, timeout: config[:timeout], verify_ssl: false)
+          elsif config[:https]
+            RestClient::Resource.new(testurl, timeout: config[:timeout], verify_ssl: true)
+          else
+            RestClient::Resource.new(testurl, timeout: config[:timeout])
+          end
+      if config[:verbose]
+        r.get
+      else
+        r.get { |response| response }
+      end
+    rescue RestClient::SSLCertificateNotVerified => e
+      critical "ssl verification failed: #{e.response}"
+    rescue RestClient::ServerBrokeConnection
+      critical "server broke the connection: #{e}"
+    rescue RestClient::RequestFailed => e
+      critical "request failed: #{e.response}"
+    rescue RestClient::ExceptionWithResponse => e
+      critical "failed to #{e.response}"
+    end
+    # if you have a 500 it will only reach here if you are not specifying `--verbose`
+    # as it will be caught by the rescue above
+    if [200, 500].include?(r.code)
       healthchecks = JSON.parse(r)
       healthchecks.each do |healthcheck, healthcheck_hash_value|
         if healthcheck_hash_value['healthy'] != true

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

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sensu-plugins-jenkins
 version: !ruby/object:Gem::Version
-  version: 1.6.0
+  version: 1.6.1
 platform: ruby
 authors:
 - Sensu-Plugins and contributors
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-02-22 00:00:00.000000000 Z
+date: 2018-03-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sensu-plugin