sensu-plugins-puppet 2.0.0 → 2.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9879f6c57ed7d35d98f72e91d0097135c9c49a747d5079afe1c0e0cd97037166
-  data.tar.gz: cd6273986683ad0d4680ba4a41775b550d8904842bc18f927f0db587e762624d
+  metadata.gz: c8286374fc3da962e98181bd2e6ff81a23893c6c9b4938d31acc6d8ce3f196a6
+  data.tar.gz: 4b436ad2912723b2635975e753af3e760f8f7571e8b0904ca3ee7ab46ae3c0eb
 SHA512:
-  metadata.gz: 9a4360d04a09e13426e631de71391bf6427ed27149937260b4de61b347ce3f4cc72d9358e2ba535737bc346a7df26696e2270de6fab8bc37ad7e5ce5be056f6e
-  data.tar.gz: 044d0be3d73691f2981c236ceef6661634c8df8f81d2d5816a99f786d654b67fa26eff04248c20524ccc2be15b597c6b9f9b13e613fd7758ca50c721851ff35d
+  metadata.gz: 1115da93aa51da224badd0d7008c178a03e51d8bef964198087c7c26017c9ca21e61888cfd127af52180033587a244ae4968ca27e365ffbbea95ec22c763d9ab
+  data.tar.gz: 8a922a3b04a7a16083308dbeaeca14ade7b72fa7c38c43a1f7e681b52107c656b84f5646407ef9b789bc88b582e3c57446719d33e733131b6a22e6b5daa8687d

data/CHANGELOG.md

@@ -1,10 +1,15 @@
-#Change Log
+# Change Log
 This project adheres to [Semantic Versioning](http://semver.org/).
 
 This CHANGELOG follows the format listed [here](https://github.com/sensu-plugins/community/blob/master/HOW_WE_CHANGELOG.md)
 
 ## [Unreleased]
 
+## [2.1.0] - 2018-02-16
+### Added
+- Added options to allow for different age limits when the agent is disabled
+- Added a switch to use the new limits so as not to impact current functionality
+
 ## [2.0.0] - 2018-01-31
 ### Security
 - updated `rubocop` dependency to `~> 0.51.0` per: https://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2017-8418. (@jaredledvina)
@@ -51,7 +56,8 @@ This CHANGELOG follows the format listed [here](https://github.com/sensu-plugins
 ### Added
 - initial release
 
-[Unreleased]: https://github.com/sensu-plugins/sensu-plugins-puppet/compare/2.0.0...HEAD
+[Unreleased]: https://github.com/sensu-plugins/sensu-plugins-puppet/compare/2.1.0...HEAD
+[2.1.0]: https://github.com/sensu-plugins/sensu-plugins-puppet/compare/2.0.0...2.1.0
 [2.0.0]: https://github.com/sensu-plugins/sensu-plugins-puppet/compare/1.3.0...2.0.0
 [1.3.0]: https://github.com/sensu-plugins/sensu-plugins-puppet/compare/1.2.0...1.3.0
 [1.2.0]: https://github.com/sensu-plugins/sensu-plugins-puppet/compare/1.1.0...1.2.0

data/bin/check-puppet-last-run.rb

@@ -59,6 +59,27 @@ class PuppetLastRun < Sensu::Plugin::Check::CLI
          default:     '/opt/puppetlabs/puppet/cache/state/agent_disabled.lock',
          description: 'Path to agent disabled lock file'
 
+  option :disabled_age_limits,
+         short:       '-d',
+         long:        '--disabled-age-limits',
+         boolean:     true,
+         default:     false,
+         description: 'Consider disabled age limits, otherwise use main limits'
+
+  option :warn_age_disabled,
+         short:       '-W N',
+         long:        '--warn-age-disabled SECONDS',
+         default:     3600,
+         proc:        proc(&:to_i),
+         description: 'Age in seconds to warn when agent is disabled'
+
+  option :crit_age_disabled,
+         short:       '-C N',
+         long:        '--crit-age-disabled SECONDS',
+         default:     7200,
+         proc:        proc(&:to_i),
+         description: 'Age in seconds to crit when agent is disabled'
+
   option :report_restart_failures,
          short:       '-r',
          long:        '--report-restart-failures',
@@ -122,6 +143,16 @@ class PuppetLastRun < Sensu::Plugin::Check::CLI
       @message += " with #{@restart_failures} restart failures"
     end
 
+    if config[:disabled_age_limits] && File.exist?(config[:agent_disabled_file])
+      if @now - @last_run > config[:crit_age_disabled]
+        critical @message
+      elsif @now - @last_run > config[:warn_age_disabled]
+        warning @message
+      else
+        ok @message
+      end
+    end
+
     if @now - @last_run > config[:crit_age] || @failures > 0 || @restart_failures > 0
       critical @message
     elsif @now - @last_run > config[:warn_age]

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

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sensu-plugins-puppet
 version: !ruby/object:Gem::Version
-  version: 2.0.0
+  version: 2.1.0
 platform: ruby
 authors:
 - Sensu-Plugins and contributors
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-01-31 00:00:00.000000000 Z
+date: 2018-02-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sensu-plugin
@@ -196,7 +196,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.7.4
+rubygems_version: 2.7.6
 signing_key: 
 specification_version: 4
 summary: Sensu plugins for puppet