sensu-plugins-opsgenie 4.0.0 → 4.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a7c68086d6d2427671f4bf1a39b0d2dedb9a1d8adda561ffbfb09bac40546f49
-  data.tar.gz: 7596c75b8e84ec63cf11a91bb0f87cb6ba09649117f6f17bdd3a9d1353c83619
+  metadata.gz: 2bd3826a3acb4f4fb2321c7a82774d9e9bb2f0da41b4f0ae7ba3bccb0c6c5946
+  data.tar.gz: a393ec78de3a7c46f97754da70e3a5bb0e11c203a77175e87ce6982835f13819
 SHA512:
-  metadata.gz: f1e9730c216ceb87fac547254e2f38e08e1f3bd0244aaaaf2277fb271568ac16c6a64d4cb9a3059ded87a94a8cc04946f9efa754613f2da270094f3b04c0f9d0
-  data.tar.gz: 0d60469d2f3029001459e763ede55732fd34b04fba6a2f2980b8ab722f6e3be7429e5b969141ea77447e7d0e9e2e961f3ed8873527c7d0798a2e28cb32266851
+  metadata.gz: 632312ea4f30eaeb5158fd2d5ba993b3413decf572e22d6afa15c41c0bf8f0d991c610e0239fa42132b8a4039731ebda15779b47dbd6d774968060f0e2e18206
+  data.tar.gz: 3a7806f26770a42e7fe833e3188b97c6560d287ea00037db7cee96a8b1acdad258658e79aa34563b29f3d23d99a98a184171c2b665d81e0165770ff94f9e6c30

data/CHANGELOG.md

@@ -5,6 +5,10 @@ This CHANGELOG follows the format listed at [Keep A Changelog](http://keepachang
 
 ## [Unreleased]
 
+## [4.0.1] - 2018-01-06
+### Fixed
+- Use Alert v2 API, as the Alert v1 API is deprecated (@Castaglia)
+
 ## [4.0.0] - 2017-12-22
 ### Fixed
 - Use Heartbeat v2 API, as the Heartbeat v1 API is no longer available (@Castaglia)
@@ -74,7 +78,8 @@ This CHANGELOG follows the format listed at [Keep A Changelog](http://keepachang
 - initial release
 - Fixed json configuration load
 
-[Unreleased]: https://github.com/sensu-plugins/sensu-plugins-opsgenie/compare/4.0.0...HEAD
+[Unreleased]: https://github.com/sensu-plugins/sensu-plugins-opsgenie/compare/4.0.1...HEAD
+[4.0.1]: https://github.com/sensu-plugins/sensu-plugins-opsgenie/compare/4.0.0...4.0.1
 [4.0.0]: https://github.com/sensu-plugins/sensu-plugins-opsgenie/compare/3.1.0...4.0.0
 [3.1.0]: https://github.com/sensu-plugins/sensu-plugins-opsgenie/compare/3.0.0...3.1.0
 [3.0.0]: https://github.com/sensu-plugins/sensu-plugins-opsgenie/compare/2.0.1...3.0.0

data/bin/handler-opsgenie.rb

@@ -13,7 +13,7 @@ require 'erb'
 class Opsgenie < Sensu::Handler
   attr_reader :json_config, :message_template
 
-  OPSGENIE_URL = 'https://api.opsgenie.com/v1/json/alert'.freeze
+  OPSGENIE_URL = 'https://api.opsgenie.com/v2/alerts'.freeze
 
   option :json_config,
          description: 'Configuration name',
@@ -50,10 +50,16 @@ class Opsgenie < Sensu::Handler
                  when 'resolve'
                    close_alert
                  end
-      if response['code'] == 200
+      case response.code.to_s
+      when '200', '202'
         puts 'opsgenie -- ' + @event['action'].capitalize + 'd incident -- ' + event_id
+      when '401'
+        puts 'opsgenie -- failed to ' + @event['action'] + ' incident -- not authorized'
+      when '404'
+        puts 'opsgenie -- failed to ' + @event['action'] + ' incident -- ' + event_id + ' not found'
       else
         puts 'opsgenie -- failed to ' + @event['action'] + ' incident -- ' + event_id
+        puts "HTTP #{response.code} #{response.message}: #{response.body}"
       end
     end
   rescue Timeout::Error
@@ -77,7 +83,10 @@ class Opsgenie < Sensu::Handler
   end
 
   def event_id
-    @event['client']['name'] + '/' + @event['check']['name']
+    # Do not use slashes in the event ID, as this alias becomes part of the URI
+    # in the RESTful interactions with OpsGenie; use characters which can be
+    # easily embedded into a URI.
+    @event['client']['name'] + ':' + @event['check']['name']
   end
 
   def event_status
@@ -102,7 +111,7 @@ class Opsgenie < Sensu::Handler
                      message:     message,
                      description: json_config['description'],
                      entity:      client_name,
-                     tags:        tags.join(','),
+                     tags:        tags,
                      recipients:  json_config['recipients'],
                      teams:       json_config['teams'])
   end
@@ -119,19 +128,17 @@ class Opsgenie < Sensu::Handler
   end
 
   def post_to_opsgenie(action = :create, params = {})
-    params['customerKey'] = json_config['customerKey']
-
     # override source if specified, default is ip
     params['source'] = json_config['source'] if json_config['source']
 
-    uripath = (action == :create) ? '' : 'close'
+    encoded_alias = URI.escape(params[:alias])
+    uripath = (action == :create) ? '' : "#{encoded_alias}/close?identifierType=alias"
     uri = URI.parse("#{OPSGENIE_URL}/#{uripath}")
     http = Net::HTTP.new(uri.host, uri.port)
     http.use_ssl = true
     http.verify_mode = OpenSSL::SSL::VERIFY_NONE
-    request = Net::HTTP::Post.new(uri.request_uri, 'Content-Type' => 'application/json')
+    request = Net::HTTP::Post.new(uri.request_uri, 'Authorization' => "GenieKey #{json_config['customerKey']}", 'Content-Type' => 'application/json')
     request.body = params.to_json
-    response = http.request(request)
-    JSON.parse(response.body)
+    http.request(request)
   end
 end

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

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sensu-plugins-opsgenie
 version: !ruby/object:Gem::Version
-  version: 4.0.0
+  version: 4.0.1
 platform: ruby
 authors:
 - Sensu-Plugins and contributors
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-12-22 00:00:00.000000000 Z
+date: 2018-01-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sensu-plugin
@@ -267,7 +267,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.7.3
+rubygems_version: 2.7.4
 signing_key: 
 specification_version: 4
 summary: Sensu plugins for working with opsgenie