sensu-plugins-puppet 1.2.0 → 1.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 1b9a2e165b330e9a41397469f45e8e021e33b309
-  data.tar.gz: 54853b54ec8e00454b56e6b61a89349fbb0d735f
+SHA256:
+  metadata.gz: 913fac88835f5b35c47e2035cee725d00d5037bd8d214590053f786093250017
+  data.tar.gz: a4742868bd46a9ab584121cb5d63d6c0f97b5ccdb2e04246fc4ba011cecd71bb
 SHA512:
-  metadata.gz: e2cb9889c112bb06f47e45c4d139ece3d28add0412a103b7beb3de85254550edd647eeba76ce224a4cb89895c3414c3d3c1e9db207ed5a8f4440f6388377a8a5
-  data.tar.gz: 597bcbcec10b60a1d291c52f050477cf8581bdb34ed2370f95c5c13196f513f05722a0cc4c9d99da8bf85e93e5792281cb98d979417874e1854a5b4d1b4eb39d
+  metadata.gz: 0fb46a74c25a5139fc80ce46fd003f521ceca14993cd8fda9f51fe090d4966536c4cae7f0716fee223707cb393c2f5824e20d5a091b251d61d23ee8b276566fc
+  data.tar.gz: cd5920e72c9bbf79ff0bf82c118402741c9683b86f3d20b68f44b336cc641d24bdf2dfe93ce9d1c3782a2f1c4e56569b841eab9865a8465250ef2648aa3cfc18

data/CHANGELOG.md

@@ -4,6 +4,13 @@ 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-11-09
+### Added
+- Testing for Ruby 2.4.1
+- `check-puppet-errors.rb`: Added check for Puppet failures (@grem11n)
+- `check-puppet-last-run.rb`: Added option for ignoring Puppet failure (@grem11n)
+
 ## [1.2.0] - 2017-05-30
 ### Added
 - `check-puppet-last-run.rb`: Added option for reporting failed restarts (@antonidabek)
@@ -34,7 +41,8 @@ This CHANGELOG follows the format listed at [Keep A Changelog](http://keepachang
 ### Added
 - initial release
 
-[Unreleased]: https://github.com/sensu-plugins/sensu-plugins-puppet/compare/1.2.0...HEAD
+[Unreleased]: https://github.com/sensu-plugins/sensu-plugins-puppet/compare/1.3.0...HEAD
+[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
 [1.1.0]: https://github.com/sensu-plugins/sensu-plugins-puppet/compare/1.0.0...1.1.0
 [1.0.0]: https://github.com/sensu-plugins/sensu-plugins-puppet/compare/0.0.2...1.0.0

data/README.md

@@ -8,12 +8,17 @@
 
 ## Functionality
 
-**check-puppet-last-run.rb**
+### check-puppet-last-run.rb
+Validates Puppet last run. Alerts if last Puppet run was later than threshold or it has errors
+
+### check-puppet-errors.rb
+Validates only Puppet run errors regardless of the execution time
 
 ## Files
 
 * /bin/checkpuppet-last-run.rb
 * /bin/metrics-puppet-run.rb
+* /bin/check-puppet-errors.rb
 
 ## Installation
 

data/bin/check-puppet-errors.rb

@@ -0,0 +1,83 @@
+#! /usr/bin/env ruby
+#
+# check-puppet-errors
+#
+# DESCRIPTION:
+#   Check if Puppet ran with errors
+#
+# OUTPUT:
+#   plain-text
+#
+# PLATFORMS:
+#   Linux
+#
+# DEPENDENCIES:
+#   gem: sensu-plugin
+#
+# USAGE:
+#   Critical if last run had errors
+#
+#   check-puppet-errors --summary-file /opt/puppetlabs/puppet/cache/state/last_run_summary.yaml
+#
+# NOTES:
+#
+# LICENSE:
+#   Copyright 2014 Sonian, Inc. and contributors. <support@sensuapp.org>
+#   Released under the same terms as Sensu (the MIT license); see LICENSE
+#   for details.
+#
+
+require 'sensu-plugin/check/cli'
+require 'yaml'
+require 'json'
+require 'time'
+
+class PuppetErrors < Sensu::Plugin::Check::CLI
+  option :summary_file,
+         short:       '-s PATH',
+         long:        '--summary-file PATH',
+         default:     '/opt/puppetlabs/puppet/cache/state/last_run_summary.yaml',
+         description: 'Location of last_run_summary.yaml file'
+
+  option :agent_disabled_file,
+         short:       '-a PATH',
+         long:        '--agent-disabled-file PATH',
+         default:     '/opt/puppetlabs/puppet/cache/state/agent_disabled.lock',
+         description: 'Path to agent disabled lock file'
+
+  def run
+    unless File.exist?(config[:summary_file])
+      unknown "File #{config[:summary_file]} not found"
+    end
+
+    begin
+      summary = YAML.load_file(config[:summary_file])
+      if summary['events']
+        @failures = summary['events']['failure'].to_i
+      else
+        critical "#{config[:summary_file]} is missing information about the events"
+      end
+    rescue
+      unknown "Could not process #{config[:summary_file]}"
+    end
+
+    @message = 'Puppet run'
+
+    if File.exist?(config[:agent_disabled_file])
+      begin
+        disabled_message = JSON.parse(File.read(config[:agent_disabled_file]))['disabled_message']
+        @message += " (disabled reason: #{disabled_message})"
+      rescue => e
+        unknown "Could not get disabled message. Reason: #{e.message}"
+      end
+    end
+
+    if @failures > 0
+      @message += " had #{@failures} failures"
+      critical @message
+    else
+      @message += ' was successful'
+      ok @message
+    end
+  end
+end

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

@@ -66,6 +66,13 @@ class PuppetLastRun < Sensu::Plugin::Check::CLI
          default:     false,
          description: 'Raise alerts if restart failures have happened'
 
+  option :ignore_failures,
+         short:       '-i',
+         long:        '--ignore-failures',
+         boolean:     true,
+         default:     false,
+         description: 'Ignore Puppet failures'
+
   def run
     unless File.exist?(config[:summary_file])
       unknown "File #{config[:summary_file]} not found"
@@ -80,27 +87,31 @@ class PuppetLastRun < Sensu::Plugin::Check::CLI
       else
         critical "#{config[:summary_file]} is missing information about the last run timestamp"
       end
-      if summary['events']
-        @failures = summary['events']['failure'].to_i
-      else
-        critical "#{config[:summary_file]} is missing information about the events"
+      unless config[:ignore_failures]
+        if summary['events']
+          @failures = summary['events']['failure'].to_i
+        else
+          critical "#{config[:summary_file]} is missing information about the events"
+        end
+        @restart_failures = if config[:report_restart_failures] && summary['resources']
+                              summary['resources']['failed_to_restart'].to_i
+                            else
+                              0
+                            end
       end
-      @restart_failures = if config[:report_restart_failures] && summary['resources']
-                            summary['resources']['failed_to_restart'].to_i
-                          else
-                            0
-                          end
     rescue
       unknown "Could not process #{config[:summary_file]}"
     end
 
     @message = "Puppet last run #{formatted_duration(@now - @last_run)} ago"
 
-    begin
-      disabled_message = JSON.parse(File.read(config[:agent_disabled_file]))['disabled_message']
-      @message += " (disabled reason: #{disabled_message})"
-    rescue # rubocop:disable HandleExceptions
-      # fail silently
+    if File.exist?(config[:agent_disabled_file])
+      begin
+        disabled_message = JSON.parse(File.read(config[:agent_disabled_file]))['disabled_message']
+        @message += " (disabled reason: #{disabled_message})"
+      rescue => e
+        unknown "Could not get disabled message. Reason: #{e.message}"
+      end
     end
 
     if @failures > 0

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

@@ -3,7 +3,7 @@ module SensuPluginsPuppet
   # This defines the version of the gem
   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-puppet
 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: 2017-05-31 00:00:00.000000000 Z
+date: 2017-11-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sensu-plugin
@@ -156,6 +156,7 @@ description: |-
                                 Puppet run.
 email: "<sensu-users@googlegroups.com>"
 executables:
+- check-puppet-errors.rb
 - check-puppet-last-run.rb
 - metrics-puppet-run.rb
 extensions: []
@@ -164,6 +165,7 @@ files:
 - CHANGELOG.md
 - LICENSE
 - README.md
+- bin/check-puppet-errors.rb
 - bin/check-puppet-last-run.rb
 - bin/metrics-puppet-run.rb
 - lib/sensu-plugins-puppet.rb
@@ -194,7 +196,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5
+rubygems_version: 2.7.2
 signing_key: 
 specification_version: 4
 summary: Sensu plugins for puppet