sensu-plugins-jenkins 1.5.0 → 1.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 34bf4bc9191288a0e8ed07eb0d39fab42fc4d631
-  data.tar.gz: 4c8d3f81b7d26dcef616388f4e2d56f9791a882d
+SHA256:
+  metadata.gz: 39fd5b3937fe6713372b5d63c8e92169d887685b139d45c30a24377fedc67361
+  data.tar.gz: fa97643c9506f34e80050a32771aee13d57fb85c4c5be1e4474c06a2f07f45b7
 SHA512:
-  metadata.gz: 0b3144cec8d2e81bf6aa79c2406e8a61b5ab3b407c96b7280ab1167b18fed45748190aec2884250bec2cfd1967abf4f23ae5e27672d4c6f2d381a39b63b32f61
-  data.tar.gz: 4d4f02dffbaeb3dee37a32b003d1c01ccdee0ac3bad5a9c2ae3ff035792bf098a7ddc732b0e1609873092731101f75bd47ce866e4a0f0477eb7f719bc3b065f5
+  metadata.gz: d5c34ddffef6b175f89184ad1b98016e2f7952f22a48490f387d78a3608290428aa99da3711e22c1ffdcc4f6ec41aac2bfeb6798c42839405ec31554231477dc
+  data.tar.gz: cb4e619432b734dc2d4ed385d3dc1d0d5e05d67f4d9d8daaf829244cbd20e35623c42e99b99500d466137a1f9309ffd09604146181cfc926f21a4cda9e768526

data/CHANGELOG.md

@@ -5,6 +5,10 @@ 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.0] - 2018-02-21
+### Added
+- check-jenkins.rb: Add --insecure parameter to allow self signed ssl certs
+- metrics-jenkins.rb: Add --insecure parameter to allow self signed ssl certs
 
 ## [1.5.0] - 2018-02-17
 ### Added
@@ -77,7 +81,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.5.0...HEAD
+[Unreleased]: https://github.com/sensu-plugins/sensu-plugins-jenkins/compare/1.6.0...HEAD
+[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
 [1.3.0]: https://github.com/sensu-plugins/sensu-plugins-jenkins/compare/1.2.0...1.3.0

data/bin/check-jenkins-health.rb

@@ -81,8 +81,8 @@ class JenkinsMetricsHealthChecker < Sensu::Plugin::Check::CLI
 
     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
+        elsif config[:https]
+          RestClient::Resource.new(testurl, timeout: config[:timeout], verify_ssl: true).get
         else
           RestClient::Resource.new(testurl, timeout: config[:timeout]).get
         end

data/bin/check-jenkins.rb

@@ -58,10 +58,25 @@ class JenkinsMetricsPingPongChecker < Sensu::Plugin::Check::CLI
          description: 'Enabling https connections',
          default: false
 
+  option :insecure,
+         short: '-k',
+         long: '--insecure',
+         boolean: true,
+         description: 'Perform "insecure" SSL connections and transfers.',
+         default: false
+
   def run
     https ||= config[:https] ? 'https' : 'http'
     testurl = "#{https}://#{config[:server]}:#{config[:port]}#{config[:uri]}"
-    r = RestClient::Resource.new(testurl, timeout: 5).get
+
+    r = if config[:https] && config[:insecure]
+          RestClient::Resource.new(testurl, timeout: 5, verify_ssl: false).get
+        elsif config[:https]
+          RestClient::Resource.new(testurl, timeout: 5, verify_ssl: true).get
+        else
+          RestClient::Resource.new(testurl, timeout: 5).get
+        end
+
     if r.code == 200 && r.body.include?('pong')
       ok 'Jenkins Service is up'
     else

data/bin/metrics-jenkins.rb

@@ -71,6 +71,13 @@ class JenkinsMetrics < Sensu::Plugin::Metric::CLI::Graphite
          description: 'Enabling https connections',
          default: false
 
+  option :insecure,
+         short: '-k',
+         long: '--insecure',
+         boolean: true,
+         description: 'Perform "insecure" SSL connections and transfers.',
+         default: false
+
   option :timeout,
          short: '-t SECONDS',
          long: '--timeout SECONDS',
@@ -96,7 +103,16 @@ class JenkinsMetrics < Sensu::Plugin::Metric::CLI::Graphite
     @stop = nil
     begin
       https ||= config[:https] ? 'https' : 'http'
-      r = RestClient::Resource.new("#{https}://#{config[:server]}:#{config[:port]}#{config[:uri]}", timeout: config[:timeout]).get
+      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
+
       @stop = DateTime.now
       all_metrics = JSON.parse(r)
       metric_groups = all_metrics.keys - SKIP_ROOT_KEYS

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

@@ -1,7 +1,7 @@
 module SensuPluginsJenkins
   module Version
     MAJOR = 1
-    MINOR = 5
+    MINOR = 6
     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.5.0
+  version: 1.6.0
 platform: ruby
 authors:
 - Sensu-Plugins and contributors
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-02-17 00:00:00.000000000 Z
+date: 2018-02-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sensu-plugin
@@ -218,12 +218,12 @@ description: |-
                                 health, job status, metrics via `JQS`, and others
 email: "<sensu-users@googlegroups.com>"
 executables:
-- metrics-jenkins-jqs.rb
-- check-jenkins-job-status.rb
-- check-jenkins-health.rb
 - check-jenkins-build-time.rb
-- metrics-jenkins.rb
+- check-jenkins-health.rb
+- check-jenkins-job-status.rb
 - check-jenkins.rb
+- metrics-jenkins-jqs.rb
+- metrics-jenkins.rb
 extensions: []
 extra_rdoc_files: []
 files:
@@ -264,7 +264,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.2.1
+rubygems_version: 2.7.6
 signing_key: 
 specification_version: 4
 summary: Sensu plugins for jenkins