sensu-plugins-sensu 1.0.0 → 1.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 04111b997fea6a2aa5d6a1659b03e99cb5d68bbf
-  data.tar.gz: 54f75cddacfeefb9bf10fb0e159c3f17e66766f0
+  metadata.gz: 0b1dc08f3738b0fd95acffec934884652663144b
+  data.tar.gz: ead7c198234a2b20ddfa6b8fb4e14e2cd7dc6cd2
 SHA512:
-  metadata.gz: acae33c98fbda17c612c842afba2916a320775d5815af897ecb5248a764fb0ea53328983a3b21db3b1f94848d4bbbbce55ade95d817924ff50b99e40b1475ece
-  data.tar.gz: 0c32247f9a2778ae88d98b1360fb67082c02a6def6c249f863b613579b406a47263fafc6fd1b4d42fa2dd3a4fdcbd5d08b94e6a7fc83961b08f944e034373ba8
+  metadata.gz: cb26f7773c55f9b0cab1d852808fcbbf46efd1d67c340b6aed77e8da58216e75c6836fcab56c998d20c80707465265abf92da5b1d868e7399281f9d8edaba968
+  data.tar.gz: 7ad272ad84cb4fd0f199c86f6e1a9ed2600dbaaad3e9c66ec8a4167aa32a95185e938f51280eb4034ec79feeb3b9245dbc1fb5d1462ef1e64d77119a81346d77

data/CHANGELOG.md

@@ -5,6 +5,13 @@ This CHANGELOG follows the format listed at [Keep A Changelog](http://keepachang
 
 ## [Unreleased]
 
+## [1.1.0] - 2017-06-25
+### Added
+- Add support for client invalidation on deregister handler (@Evesy)
+
+### Fixed
+- handler-sensu-deregister.rb: Fix undefined variable in case of API error. (@cyrilgdn)
+
 ## [1.0.0] - 2016-07-13
 ### Added
 - metrics-events.rb: new plugin to track number of warnings/critical overtime
@@ -40,7 +47,8 @@ This CHANGELOG follows the format listed at [Keep A Changelog](http://keepachang
 ### Added
 - initial release
 
-[Unreleased]: https://github.com/sensu-plugins/sensu-plugins-sensu/compare/1.0.0...HEAD
+[Unreleased]: https://github.com/sensu-plugins/sensu-plugins-sensu/compare/1.1.0...HEAD
+[1.1.0]: https://github.com/sensu-plugins/sensu-plugins-sensu/compare/1.0.0...1.1.0
 [1.0.0]: https://github.com/sensu-plugins/sensu-plugins-sensu/compare/0.1.0...1.0.0
 [0.1.0]: https://github.com/sensu-plugins/sensu-plugins-sensu/compare/0.0.2...0.1.0
 [0.0.2]: https://github.com/sensu-plugins/sensu-plugins-sensu/compare/0.0.1...0.0.2

data/bin/handler-sensu-deregister.rb

@@ -4,12 +4,30 @@ require 'rubygems'
 require 'sensu-handler'
 
 class Deregister < Sensu::Handler
+  option :invalidate,
+         description: 'Invalidate Client',
+         short: '-i',
+         long: '--invalidate',
+         default: false
+
+  option :invalidate_expire,
+         description: 'Invalidate Duration (seconds)',
+         short: '-d duration',
+         long: '--duration duration',
+         required: false
+
   def handle
     delete_sensu_client!
   end
 
   def delete_sensu_client!
-    response = api_request(:DELETE, '/clients/' + @event['client']['name']).code
+    if config[:invalidate] && config[:invalidate_expire]
+      response = api_request(:DELETE, '/clients/' + @event['client']['name'] + "?invalidate=#{config[:invalidate]}&#{config[:invalidate_expire]}").code
+    elsif config[:invalidate]
+      response = api_request(:DELETE, '/clients/' + @event['client']['name'] + "?invalidate=#{config[:invalidate]}").code
+    else
+      response = api_request(:DELETE, '/clients/' + @event['client']['name']).code
+    end
     deletion_status(response)
   end
 
@@ -22,7 +40,7 @@ class Deregister < Sensu::Handler
     when '500'
       puts "500: Miscellaneous error when deleting #{@event['client']['name']}"
     else
-      puts "#{res}: Completely unsure of what happened!"
+      puts "Completely unsure of what happened, status code: #{code}"
     end
   end
 

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

@@ -2,7 +2,7 @@ module SensuPluginsSensu
   # This defines the version of the gem
   module Version
     MAJOR = 1
-    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-sensu
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.1.0
 platform: ruby
 authors:
 - Sensu-Plugins and contributors
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-07-14 00:00:00.000000000 Z
+date: 2017-06-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sensu-plugin
@@ -227,9 +227,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.1
+rubygems_version: 2.4.5
 signing_key: 
 specification_version: 4
 summary: Sensu plugins for sensu
 test_files: []
-has_rdoc: