sensu-plugins-chef 2.0.1 → 3.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 64e900ca4c05e0ade6b23a68681d3dc75790f363
-  data.tar.gz: 13a83f5184299dcc868b45eb5790dba31d811032
+  metadata.gz: 4ee3769260a4f868c839f257d2cf741b51774822
+  data.tar.gz: 03b9b504eda3305aeb9d879feff205b2a65b0667
 SHA512:
-  metadata.gz: 428455e3c3fc28e5c1ccc0b6f727b5b84b68679dd320066b5431332f78d963cb5e4a9b7db88eea7a137abcd83ab1935d8a61dca32e2a0d859e680fa2a707735e
-  data.tar.gz: 21d455319a2943255fd3869a432393c72e5272dc2a158cf7b11c1f20941feb9f15b645659068e6d5bc877ac57003f356cd2ee605e38557081e09522e3519a613
+  metadata.gz: 39d7e2cdd912841c2c86c1cd9e7cd982a69f117bbe9dd47ff95ab09be68994254ec3d79773fea6027e3cfc5e9f6206fba3b559d7e3244a2712244b985519ce8c
+  data.tar.gz: 9094ac0ad6a1239249d1c85058ac73710c93149dfa1a6d95381a7999807f09e2a23198c5456911bbac7ad13e491deafa35a75c4c8c6d471ebce03c1b98e2b323

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]
+## [3.0.0]
+### Breaking Change
+- re-wrote all checks to use latest ridley. As ridley 5.x requires buff-extension 2.x which requires >= ruby 2.2 and sensu has never shipped with ruby 2.1 the decision was made to drop this support. If you are not using an embedded ruby and are using 2.1 this will break for you. To avoid this you can either switch to embedded ruby or upgrade your ruby to at least 2.2
+
+# Added
+- testing for ruby 2.4
 
 ## [2.0.1] - 2017-04-28
 ### Fixed

data/bin/check-chef-node.rb

@@ -27,7 +27,7 @@
 #
 
 require 'sensu-plugin/check/cli'
-require 'chef/rest'
+require 'ridley'
 
 class ChefNodeChecker < Sensu::Plugin::Check::CLI
   option :node_name,
@@ -50,13 +50,18 @@ class ChefNodeChecker < Sensu::Plugin::Check::CLI
          short: '-K CLIENT-KEY',
          long: '--keys CLIENT-KEY'
 
+  option :ignore_ssl_verification,
+         description: 'Ignore SSL certificate verification',
+         short: '-i',
+         long: '--ignore-ssl'
+
   def connection
     @connection ||= chef_api_connection
   end
 
   def run
-    node = connection.get_rest("/nodes/#{config[:node_name]}")
-    if node['ohai_time']
+    node = connection.node.find(config[:node_name])
+    if node['automatic']['ohai_time']
       ok "Node #{config[:node_name]} found"
     else
       warning "Node #{config[:node_name]} does not contain 'ohai_time' attribute"
@@ -71,6 +76,10 @@ class ChefNodeChecker < Sensu::Plugin::Check::CLI
     chef_server_url      = config[:chef_server_url]
     client_name          = config[:client_name]
     signing_key_filename = config[:key]
-    Chef::REST.new(chef_server_url, client_name, signing_key_filename)
+    ignore_ssl = config[:ignore_ssl_verification]
+    verify_ssl = ignore_ssl.nil?
+
+    Celluloid.boot
+    Ridley.new(server_url: chef_server_url, client_name: client_name, client_key: signing_key_filename, ssl: { verify: verify_ssl })
   end
 end

data/bin/check-chef-nodes.rb

@@ -32,7 +32,7 @@
 #
 
 require 'sensu-plugin/check/cli'
-require 'chef/rest'
+require 'ridley'
 
 #
 # Chef Nodes Status Checker
@@ -68,19 +68,24 @@ class ChefNodesStatusChecker < Sensu::Plugin::Check::CLI
          long: '--exclude-nodes EXCLUDE-NODES',
          default: '^$'
 
+  option :ignore_ssl_verification,
+         description: 'Ignore SSL certificate verification',
+         short: '-i',
+         long: '--ignore-ssl'
+
   def connection
     @connection ||= chef_api_connection
   end
 
   def nodes_last_seen
-    nodes = connection.get_rest('/nodes')
-    nodes.delete_if { |node_name| node_name =~ /#{config[:exclude_nodes]}/ }
-    nodes.keys.map do |node_name|
-      node = connection.get_rest("/nodes/#{node_name}")
-      if node['ohai_time']
-        { node_name => (Time.now - Time.at(node['ohai_time'])) > config[:critical_timespan].to_i }
+    nodes = connection.node.all
+    nodes.delete_if { |node| node.name =~ /#{config[:exclude_nodes]}/ }
+    nodes.map 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 }
+        { node.name => true }
       end
     end
   end
@@ -99,7 +104,11 @@ class ChefNodesStatusChecker < Sensu::Plugin::Check::CLI
     chef_server_url      = config[:chef_server_url]
     client_name          = config[:client_name]
     signing_key_filename = config[:key]
-    Chef::REST.new(chef_server_url, client_name, signing_key_filename)
+    ignore_ssl = config[:ignore_ssl_verification]
+    verify_ssl = ignore_ssl.nil?
+
+    Celluloid.boot
+    Ridley.new(server_url: chef_server_url, client_name: client_name, client_key: signing_key_filename, ssl: { verify: verify_ssl })
   end
 
   def any_node_stuck?

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

@@ -1,8 +1,8 @@
 module SensuPluginsChef
   module Version
-    MAJOR = 2
+    MAJOR = 3
     MINOR = 0
-    PATCH = 1
+    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: 2.0.1
+  version: 3.0.0
 platform: ruby
 authors:
 - Sensu Plugins and contributors
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-04-28 00:00:00.000000000 Z
+date: 2017-05-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: chef
@@ -30,14 +30,14 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 4.1.2
+        version: 5.1.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 4.1.2
+        version: 5.1.0
 - !ruby/object:Gem::Dependency
   name: sensu-plugin
   requirement: !ruby/object:Gem::Requirement
@@ -58,14 +58,14 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.4.1
+        version: '0.6'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.4.1
+        version: '0.6'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement