sensu-plugins-jenkins 1.1.0 → 1.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6adc14f4014cb596e96c71bfdebb2edc8b9d76a9
-  data.tar.gz: 26ef4af295d8f1469130434ecc662ed816ce275c
+  metadata.gz: 64b5b8a76d01460965176f93d822b9cdc785bd76
+  data.tar.gz: 79716dccf7d33ae4647d189650d2b58365633e15
 SHA512:
-  metadata.gz: b52c9b773289d91599ce545449378aa74fae13ed01e04152ef6b71d0370c5b13f688a4ac82d7522a1a498ac85a9825721c025cc42eaec038258052d8415efb3e
-  data.tar.gz: 94a0de3f435e75dc4533aa30ba2c098ba79ad1645a4bcad7e2477c742892d231d2fdc51a5aa2c4e1646280381af3c65b74ee70f57cfe2479c37bf7e9ccf67665
+  metadata.gz: 85ac99750ad5ca0763e2c6d5d2b406bf8d1a7f96b3abc6f70c3fa8c61d0991591481038d3a4f7d7dd0412db2345cbde4dd8c529c75d893cff3d00257aaab2b4f
+  data.tar.gz: e5d326f19100d1af096927a8bf422d1523d6129deb37a182eb706d35cf53391838f3fd1fd7b83b78f4c09ab60bce20204ea1211f6fcf06026d0d90de4db8dfc5

data/CHANGELOG.md

@@ -5,6 +5,11 @@ This CHANGELOG follows the format listed at [Keep A Changelog](http://keepachang
 
 ## [Unreleased]
 
+## [1.2.0] - 2016-11-11
+### Added
+- Additional information given on errors in check-jenkins-health.rb
+- Add configuration option for timeout in check-jenkins-health.rb
+
 ## [1.1.0] - 2016-10-06
 ### Added
 - Added authentication options to check-jenkins-build-time.rb and check-jenkins-job-status.rb
@@ -23,7 +28,7 @@ This CHANGELOG follows the format listed at [Keep A Changelog](http://keepachang
 
 ## [0.1.0] - 2015-12-14
 ### Added
-- Enhanced error messages in particular when the check configuration is wrong 
+- Enhanced error messages in particular when the check configuration is wrong
 - Update dependent jenkins-api version to 1.4.2
 - Changed check-jenkins-job-status.rb and check-jenkins-build-time.rb to use server_url to allow
   passing credentials
@@ -51,7 +56,8 @@ This CHANGELOG follows the format listed at [Keep A Changelog](http://keepachang
 ### Added
 - initial release
 
-[Unreleased]: https://github.com/sensu-plugins/sensu-plugins-jenkins/compare/1.1.0...HEAD
+[Unreleased]: https://github.com/sensu-plugins/sensu-plugins-jenkins/compare/1.2.0...HEAD
+[1.2.0]: https://github.com/sensu-plugins/sensu-plugins-jenkins/compare/1.1.0...1.2.0
 [1.1.0]: https://github.com/sensu-plugins/sensu-plugins-jenkins/compare/1.0.0...1.1.0
 [1.0.0]: https://github.com/sensu-plugins/sensu-plugins-jenkins/compare/0.1.0...1.0.0
 [0.1.0]: https://github.com/sensu-plugins/sensu-plugins-jenkins/compare/0.0.5...0.1.0

data/bin/check-jenkins-health.rb

@@ -61,23 +61,30 @@ class JenkinsMetricsHealthChecker < Sensu::Plugin::Check::CLI
          description: 'Enabling https connections',
          default: false
 
+  option :timeout,
+         short: '-t SECS',
+         long: '--timeout SECS',
+         description: 'Request timeout in seconds',
+         proc: proc(&:to_i),
+         default: 5
+
   def run
     https ||= config[:https] ? 'https' : 'http'
-    r = RestClient::Resource.new("#{https}://#{config[:server]}:#{config[:port]}#{config[:uri]}", timeout: 5).get
-    if r.code == 200
+    r = RestClient::Resource.new("#{https}://#{config[:server]}:#{config[:port]}#{config[:uri]}", timeout: config[:timeout]).get
+    if [200, 500].include? r.code
       healthchecks = JSON.parse(r)
-      healthchecks.each do |_, healthcheck_hash_value|
+      healthchecks.each do |healthcheck, healthcheck_hash_value|
         if healthcheck_hash_value['healthy'] != true
-          critical 'Jenkins Health Parameters not OK'
+          critical "Jenkins health check '#{healthcheck}' reported unhealthy state. Message: #{healthcheck_hash_value['message']}"
         end
       end
       ok 'Jenkins Health Parameters are OK'
     else
-      critical 'Jenkins Service is not responding'
+      critical "Jenkins Service is replying with status code #{r.code}. Body: #{r.body}"
     end
-  rescue Errno::ECONNREFUSED
-    critical 'Jenkins Service is not responding'
-  rescue RestClient::RequestTimeout
-    critical 'Jenkins Service Connection timed out'
+  rescue Errno::ECONNREFUSED => e
+    critical "Jenkins Service is not responding: #{e}"
+  rescue RestClient::RequestTimeout => e
+    critical "Jenkins Service Connection timed out after #{config[:timeout]} seconds: #{e}"
   end
 end

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

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sensu-plugins-jenkins
 version: !ruby/object:Gem::Version
-  version: 1.1.0
+  version: 1.2.0
 platform: ruby
 authors:
 - Sensu-Plugins and contributors
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-10-07 00:00:00.000000000 Z
+date: 2016-11-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sensu-plugin
@@ -244,7 +244,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.1
+rubygems_version: 2.4.8
 signing_key: 
 specification_version: 4
 summary: Sensu plugins for jenkins