sensu-plugins-jenkins 1.3.0 → 1.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: a0ca38a46f4172586e2d186966e9e0f5966f18be
-  data.tar.gz: 58da9a11a763e44673a1c703177ffb016b678283
+SHA256:
+  metadata.gz: 808c6c898fd67ddbe4a946441a22aacee8927489c12c2f377f22ec7263068f8d
+  data.tar.gz: da62671dfa2c8fac2c7c78f27ac07f9aaa671fa0700ebe6eb534353dac524b07
 SHA512:
-  metadata.gz: e67ddbe8b75ecf76bcf9286cf9bfd950e48abf3472f8dd46b51d8295abcef8cd47051fbaf72e591dd96d979a2d24b83f3bf3aea665c7bcf05de27240fbab1203
-  data.tar.gz: e418d73135095b7b54d63cde12596bcd5bcfc08c78c9151ba984990307ab44578444a7d0d024495d3f22f84ac4265b31d23f3696728e9bfb1725ea46bf6386c8
+  metadata.gz: 8c88f5c1c5605bdd7d575c27f61814d86878de36a34fc2de083e6862972003cf110713eb1b09fb8d1ca4d7c50e51882bacfc13137b10cac5e96600c2c59624e7
+  data.tar.gz: 1534e1c13baa8ddf7938b3ceb4025749634655917d48f49d1b280551165ff1309606e0502e4f59a5e8d2fb23d3c493e77f79f89cd2431217627721ca63cf35de

data/CHANGELOG.md

@@ -1,9 +1,23 @@
-#Change Log
+# Change Log
 This project adheres to [Semantic Versioning](http://semver.org/).
 
-This CHANGELOG follows the format listed at [Keep A Changelog](http://keepachangelog.com/)
+This CHANGELOG follows the format listed at [Our CHANGELOG Guidelines](https://github.com/sensu-plugins/community/blob/master/HOW_WE_CHANGELOG.md).
+Which is based on [Keep A Changelog](http://keepachangelog.com/)
 
 ## [Unreleased]
+
+## [1.4.0] - 2017-11-15
+### Added
+- Add Ruby 2.4.1 testing
+- metrics-jenkins.rb: Add --timeout parameter + report of the request duration
+
+### Fixed
+- lock dependency on `rb-readline` to remove deprecation warnings about fixnum (@majormoses)
+- metrics-jenkins.rb: timeout not timing out properly
+
+### Changed
+- update changelog format location (@majormoses)
+
 ## [1.3.0] - 2017-05-04
 ### Added
 - Additional parameter -w to report unstable jobs as a Sensu warning
@@ -59,7 +73,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.3.0...HEAD
+[Unreleased]: https://github.com/sensu-plugins/sensu-plugins-jenkins/compare/1.4.0...HEAD
+[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
 [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

data/bin/metrics-jenkins.rb

@@ -71,10 +71,33 @@ class JenkinsMetrics < Sensu::Plugin::Metric::CLI::Graphite
          description: 'Enabling https connections',
          default: false
 
+  option :timeout,
+         short: '-t SECONDS',
+         long: '--timeout SECONDS',
+         description: 'Timeout for REST request',
+         proc: proc(&:to_i),
+         default: 10
+
+  option :report_request_duration,
+         long: '--[no-]report-request-duration',
+         boolean: true,
+         description: 'Report the duration of the REST request',
+         default: true
+
+  def report_request_duration
+    return unless config[:report_request_duration]
+    @stop ||= DateTime.now
+    ms = ((@stop - @start) * 1000 * 24 * 60 * 60).to_i
+    output("#{config[:scheme]}.request.duration", ms)
+  end
+
   def run
+    @start = DateTime.now
+    @stop = nil
     begin
       https ||= config[:https] ? 'https' : 'http'
-      r = RestClient::Resource.new("#{https}://#{config[:server]}:#{config[:port]}#{config[:uri]}", timeout: 5).get
+      r = RestClient::Resource.new("#{https}://#{config[:server]}:#{config[:port]}#{config[:uri]}", timeout: config[:timeout]).get
+      @stop = DateTime.now
       all_metrics = JSON.parse(r)
       metric_groups = all_metrics.keys - SKIP_ROOT_KEYS
       metric_groups.each do |metric_groups_key|
@@ -87,9 +110,13 @@ class JenkinsMetrics < Sensu::Plugin::Metric::CLI::Graphite
       end
       ok
     rescue Errno::ECONNREFUSED
-      critical 'Jenkins is not responding'
+      STDERR.write "Jenkins is not responding\n"
+      critical
     rescue RestClient::RequestTimeout
-      critical 'Jenkins Connection timed out'
+      STDERR.write "Jenkins Connection timed out\n"
+      critical
+    ensure
+      report_request_duration
     end
     ok
   end

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

@@ -1,7 +1,7 @@
 module SensuPluginsJenkins
   module Version
     MAJOR = 1
-    MINOR = 3
+    MINOR = 4
     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.3.0
+  version: 1.4.0
 platform: ruby
 authors:
 - Sensu-Plugins and contributors
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-05-05 00:00:00.000000000 Z
+date: 2017-11-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sensu-plugin
@@ -30,14 +30,14 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.8.0
+        version: 2.0.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.8.0
+        version: 2.0.2
 - !ruby/object:Gem::Dependency
   name: jenkins_api_client
   requirement: !ruby/object:Gem::Requirement
@@ -66,6 +66,26 @@ dependencies:
     - - '='
       - !ruby/object:Gem::Version
         version: 0.10.6
+- !ruby/object:Gem::Dependency
+  name: rb-readline
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.5.5
+    - - "<="
+      - !ruby/object:Gem::Version
+        version: '1.0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.5.5
+    - - "<="
+      - !ruby/object:Gem::Version
+        version: '1.0'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -244,7 +264,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.8
+rubygems_version: 2.7.2
 signing_key: 
 specification_version: 4
 summary: Sensu plugins for jenkins