sensu-plugins-jenkins 1.2.0 → 1.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 64b5b8a76d01460965176f93d822b9cdc785bd76
-  data.tar.gz: 79716dccf7d33ae4647d189650d2b58365633e15
+  metadata.gz: a0ca38a46f4172586e2d186966e9e0f5966f18be
+  data.tar.gz: 58da9a11a763e44673a1c703177ffb016b678283
 SHA512:
-  metadata.gz: 85ac99750ad5ca0763e2c6d5d2b406bf8d1a7f96b3abc6f70c3fa8c61d0991591481038d3a4f7d7dd0412db2345cbde4dd8c529c75d893cff3d00257aaab2b4f
-  data.tar.gz: e5d326f19100d1af096927a8bf422d1523d6129deb37a182eb706d35cf53391838f3fd1fd7b83b78f4c09ab60bce20204ea1211f6fcf06026d0d90de4db8dfc5
+  metadata.gz: e67ddbe8b75ecf76bcf9286cf9bfd950e48abf3472f8dd46b51d8295abcef8cd47051fbaf72e591dd96d979a2d24b83f3bf3aea665c7bcf05de27240fbab1203
+  data.tar.gz: e418d73135095b7b54d63cde12596bcd5bcfc08c78c9151ba984990307ab44578444a7d0d024495d3f22f84ac4265b31d23f3696728e9bfb1725ea46bf6386c8

data/CHANGELOG.md

@@ -4,6 +4,9 @@ This project adheres to [Semantic Versioning](http://semver.org/).
 This CHANGELOG follows the format listed at [Keep A Changelog](http://keepachangelog.com/)
 
 ## [Unreleased]
+## [1.3.0] - 2017-05-04
+### Added
+- Additional parameter -w to report unstable jobs as a Sensu warning
 
 ## [1.2.0] - 2016-11-11
 ### Added
@@ -56,7 +59,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.2.0...HEAD
+[Unreleased]: https://github.com/sensu-plugins/sensu-plugins-jenkins/compare/1.3.0...HEAD
+[1.3.0]: https://github.com/sensu-plugins/sensu-plugins-jenkins/compare/1.2.0...1.3.0
 [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

data/bin/check-jenkins-job-status.rb

@@ -66,11 +66,21 @@ class JenkinsJobChecker < Sensu::Plugin::Check::CLI
          required: false,
          default: ENV['JENKINS_PASS']
 
+  option :include_warnings,
+         description: 'whether to report unstable jobs as a warning',
+         short: '-w',
+         long: '--include-warnings',
+         boolean: true,
+         required: false,
+         default: false
+
   def run
     if failed_jobs.any?
-      critical "Jobs reporting failure: #{failed_jobs_names}"
+      critical "Jobs reporting failure: #{failed_job_names}, jobs reported as unstable: #{unstable_job_names}"
+    elsif unstable_jobs.any? && config[:include_warnings]
+      warning "Jobs reported as unstable: #{unstable_job_names}"
     else
-      ok 'All queried jobs reports success'
+      ok 'All queried jobs report success'
     end
   end
 
@@ -85,15 +95,15 @@ class JenkinsJobChecker < Sensu::Plugin::Check::CLI
   end
 
   def jobs_statuses
-    if config[:job_list] =~ /\^/
-      # #YELLOW
-      jenkins_api_client.job.list(config[:job_list]).reduce({}) do |listing, job_name| # rubocop:disable Style/EachWithObject
-        listing[job_name] = job_status(job_name)
-        listing
+    @job_listing ||=
+      if config[:job_list] =~ /\^/
+        jenkins_api_client.job.list(config[:job_list]).reduce({}) do |listing, job_name| # rubocop:disable Style/EachWithObject
+          listing[job_name] = job_status(job_name)
+          listing
+        end
+      else
+        { config[:job_list] => job_status(config[:job_list]) }
       end
-    else
-      { config[:job_list] => job_status(config[:job_list]) }
-    end
   end
 
   def job_status(job_name)
@@ -109,11 +119,19 @@ class JenkinsJobChecker < Sensu::Plugin::Check::CLI
     critical "Error looking up Jenkins job: #{job_name}"
   end
 
+  def unstable_jobs
+    jobs_statuses.select { |_job_name, status| status == 'unstable' }
+  end
+
   def failed_jobs
     jobs_statuses.select { |_job_name, status| status == 'failure' }
   end
 
-  def failed_jobs_names
+  def unstable_job_names
+    unstable_jobs.keys.join(', ')
+  end
+
+  def failed_job_names
     failed_jobs.keys.join(', ')
   end
 end

data/bin/check-jenkins.rb

@@ -60,7 +60,8 @@ class JenkinsMetricsPingPongChecker < Sensu::Plugin::Check::CLI
 
   def run
     https ||= config[:https] ? 'https' : 'http'
-    r = RestClient::Resource.new("#{https}://#{config[:server]}:#{config[:port]}#{config[:uri]}", timeout: 5).get
+    testurl = "#{https}://#{config[:server]}:#{config[:port]}#{config[:uri]}"
+    r = RestClient::Resource.new(testurl, timeout: 5).get
     if r.code == 200 && r.body.include?('pong')
       ok 'Jenkins Service is up'
     else

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

@@ -1,7 +1,7 @@
 module SensuPluginsJenkins
   module Version
     MAJOR = 1
-    MINOR = 2
+    MINOR = 3
     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.2.0
+  version: 1.3.0
 platform: ruby
 authors:
 - Sensu-Plugins and contributors
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-11-12 00:00:00.000000000 Z
+date: 2017-05-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sensu-plugin