sensu-plugins-chef 3.0.2 → 4.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b79f63eea985ea3025336cfba7c01d196f9bedb3
-  data.tar.gz: 89a2740d2124ce4320c2dbf76739bfd80c619a38
+  metadata.gz: 921c03d9102e7ba6eb3330438b783613bbb020a1
+  data.tar.gz: 495db0afca92ab3a4fcd2c8b28afc244988f1fcf
 SHA512:
-  metadata.gz: 5868f712c21270307502291d99480ca3f5f5cb21a971329567ed1b2ee997473c42579acce15a986d8fc2891ceca297cba040d57c4e5354dde59b85803c1ebbdd
-  data.tar.gz: 3dc6552f7f56373e3b63cacc1679b3d699bd01854506cdfc1f9a2cd8b282322ff16bc7b78764299b71a31aee474aa098df893c7958a2a9c959b4a95dbb44ee27
+  metadata.gz: 9018eb2a96f6f7b6dc76679554ec97583cf6ce76c14f1af5b5e7cc990d22366f0af7e0ebc531b850180327196509458c3d9245a0e4c76a363bc5852c9d604e69
+  data.tar.gz: 40f41e8eb1701604131be65eee08cafe2da795d002a5b3d375b3104579041667b88136fddd8505817b2e8f9ad311e7529938bc3ea6d4e55be158486c38d4a01b

data/CHANGELOG.md

@@ -4,6 +4,12 @@ This project adheres to [Semantic Versioning](http://semver.org/).
 This CHANGELOG follows the format listed at [Keep A Changelog](http://keepachangelog.com/)
 
 ## [Unreleased]
+## [4.0.0] - 2017-08-14
+### Breaking Change
+- check-chef-nodes.rb: added an option for a grace_period which allows exclusion of nodes until they have been online for a specified ammount of time. Defaulting to 300 seconds. (@majormoses)
+- check-chef-nodes.rb: when chef has not initially run we can not determine the time that it has been up for nor when it last converged as ohai will not have this information yet. Rather than assuming this is a failure we treat nodes that have no ohai data as not being able to be evaluated. If you are looking for something to catch nodes that fail initial bootstrap I would suggest something along the lines of [aws-watcher](https://github.com/majormoses/aws-watcher)  (@majormoses)
+
+
 ## [3.0.2] - 2017-05-28
 ## Fixed
 - updating runtime deps
@@ -78,7 +84,8 @@ This CHANGELOG follows the format listed at [Keep A Changelog](http://keepachang
 ### Added
 - initial release
 
-[Unreleased]: https://github.com/sensu-plugins/sensu-plugins-chef/compare/3.0.2...HEAD
+[Unreleased]: https://github.com/sensu-plugins/sensu-plugins-chef/compare/4.0.0...HEAD
+[4.0.0]: https://github.com/sensu-plugins/sensu-plugins-chef/compare/3.0.2...4.0.0
 [3.0.2]: https://github.com/sensu-plugins/sensu-plugins-chef/compare/3.0.2...3.0.1
 [3.0.1]: https://github.com/sensu-plugins/sensu-plugins-chef/compare/3.0.1...3.0.0
 [3.0.0]: https://github.com/sensu-plugins/sensu-plugins-chef/compare/3.0.0...2.0.1

data/bin/check-chef-nodes.rb

@@ -73,10 +73,18 @@ class ChefNodesStatusChecker < Sensu::Plugin::Check::CLI
          long: '--exclude-nodes EXCLUDE-NODES',
          default: '^$'
 
+  option :grace_period,
+         description: 'The ammount of time before a node should be evaluated for failed convergence',
+         long: '--grace-period SECONDS',
+         default: (60 * 5), # default 5 minutes, which seems like a good but not great default
+         proc: proc(&:to_i)
+
   option :ignore_ssl_verification,
          description: 'Ignore SSL certificate verification',
          short: '-i',
-         long: '--ignore-ssl'
+         long: '--ignore-ssl',
+         default: false,
+         boolean: true
 
   def connection
     @connection ||= chef_api_connection
@@ -85,21 +93,37 @@ class ChefNodesStatusChecker < Sensu::Plugin::Check::CLI
   def nodes_last_seen
     nodes = connection.node.all
     nodes.delete_if { |node| node.name =~ /#{config[:exclude_nodes]}/ }
-    nodes.map do |node|
+
+    checked_nodes = []
+    nodes.each do |node|
       node.reload
-      if node['automatic']['ohai_time']
-        { node.name => (Time.now - Time.at(node['automatic']['ohai_time'])) > config[:critical_timespan].to_i }
-      else
-        { node.name => true }
+      # no uptime: node might have not finished convergence -> won't check
+      unless node['automatic']['uptime_seconds']
+        checked_nodes << { node['name'] => false }
+        next
+      end
+
+      # won't check if node's uptime is still within grace period
+      unless node['automatic']['uptime_seconds'] > config[:grace_period]
+        checked_nodes << { node['name'] => false }
+        next
       end
+
+      # compute elapsed time since last convergence
+      checked_nodes << if node['automatic']['ohai_time']
+                         { node['name'] => (Time.now - Time.at(node['automatic']['ohai_time'])) > config[:critical_timespan].to_i }
+                       else
+                         { node['name'] => true }
+                       end
     end
+    checked_nodes
   end
 
   def run
     if any_node_stuck?
-      ok 'Chef Server API is ok, all nodes reporting'
-    else
       critical "The following nodes cannot be provisioned: #{failed_nodes_names}"
+    else
+      ok 'Chef Server API is ok, all nodes reporting'
     end
   end
 
@@ -117,12 +141,27 @@ class ChefNodesStatusChecker < Sensu::Plugin::Check::CLI
   end
 
   def any_node_stuck?
+    stuck = []
     @nodes_last_seen ||= nodes_last_seen
-    @nodes_last_seen.map(&:values).flatten.all? { |x| x == false }
+    @nodes_last_seen.flatten.each do |node|
+      node.each do |name, status|
+        stuck << name if status == true
+      end
+    end
+    if stuck.empty?
+      false
+    else
+      true
+    end
   end
 
   def failed_nodes_names
-    all_failed_tuples = @nodes_last_seen.select { |node_set| node_set.values.first == true }
-    all_failed_tuples.map(&:keys).flatten.join(', ')
+    failed_nodes = []
+    @nodes_last_seen.flatten.each do |node|
+      node.each do |name, status|
+        failed_nodes << name if status == true
+      end
+    end
+    failed_nodes
   end
 end

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

@@ -1,8 +1,8 @@
 module SensuPluginsChef
   module Version
-    MAJOR = 3
+    MAJOR = 4
     MINOR = 0
-    PATCH = 2
+    PATCH = 0
 
     VER_STRING = [MAJOR, MINOR, PATCH].compact.join('.')
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sensu-plugins-chef
 version: !ruby/object:Gem::Version
-  version: 3.0.2
+  version: 4.0.0
 platform: ruby
 authors:
 - Sensu Plugins and contributors
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-05-29 00:00:00.000000000 Z
+date: 2017-08-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: chef