nine_one_one 2.0.4 → 2.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ba4ec764772f241f23b6377c0fe39a1de964bbfa
-  data.tar.gz: 2b907c93c2ea597ddd46c2f677e077db4c2d2117
+  metadata.gz: e7369af9b16de21e2f270ff4df0b611fcf2e0dc7
+  data.tar.gz: 31abafe8fd9f34161d5ea6a2f13af5ec0a667712
 SHA512:
-  metadata.gz: 5f89b54ead1e9a4bc6cb7420fdd50d30579a4584d65c4ff410f8e2d0a11c55776accc2f3cadddfb7418687154b5af1fd0e69bad4035b25f17fb603ab954be8b0
-  data.tar.gz: 82cda078425b07e0526a270c1e8ee1175d2efad7f49caac7bd1f67bf784e50a7ddf8a122bdbd04b91cfdcfd728655d816d2a0707e2f5c6737b1b476548ada6e3
+  metadata.gz: ff1db99849019ae185dcf10c82651c41ffaab4cc029744485273a5c9b7645343c544f3dd8116ded309321c9c39d9b1be5f129612990511255f52474a5f51d9bc
+  data.tar.gz: '087a879cbfed16b73df5d6864addd4557149ac529af7187bacfe0ab19ca88e421dee51bb28885761a9efa35ca2a1099caa6341ae98d0889c0fb64f0bee70eb72'

data/lib/nine_one_one.rb

@@ -33,6 +33,10 @@ module NineOneOne
                                          details_hash: details_hash)
   end
 
+  def self.resolve_emergency(dedup_key)
+    use(:default).resolve_emergency(dedup_key)
+  end
+
   def self.notify(message)
     use(:default).notify(message)
   end

data/lib/nine_one_one/log_service.rb

@@ -8,6 +8,8 @@ module NineOneOne
       logger.error("TRIGGERED INCIDENT: #{description} (#{details_hash})")
     end
 
+    def resolve_event(_dedup_key); end
+
     def notify(message)
       logger.info(message)
     end

data/lib/nine_one_one/notifier.rb

@@ -10,6 +10,10 @@ module NineOneOne
                                                    details_hash: details_hash)
     end
 
+    def resolve_emergency(dedup_key)
+      emergency_service.resolve_event(dedup_key)
+    end
+
     def notify(message)
       notification_service.notify(message)
     end

data/lib/nine_one_one/pager_duty_service.rb

@@ -14,25 +14,33 @@ module NineOneOne
 
     def trigger_event(description, source: Socket.gethostname, dedup_key: nil, severity: HIGH_URGENCY_ERROR,
                       details_hash: nil)
+      make_request(request_body('trigger', dedup_key, description, source, severity, details_hash))
+    end
+
+    def resolve_event(dedup_key)
+      make_request(request_body('resolve', dedup_key))
+    end
+
+    private
+
+    attr_reader :api_integration_key, :http
+
+    def make_request(request_body)
+      headers = {'Content-Type' => 'application/json'}
       response = nil
 
       retry_on(THROTTLE_HTTP_STATUS, THROTTLE_RETRIES) do
-        body = request_body(description, source, dedup_key, severity, details_hash)
-        response = make_request(body)
+        response = http.post(EVENTS_API_V2_ENDPOINT, request_body, headers)
         response.code.to_i
       end
 
       # rubocop:disable Style/GuardClause
       unless response.is_a?(Net::HTTPSuccess)
-        raise IncidentReportingError, "Failed to create PagerDuty event: #{response.body}"
+        raise IncidentReportingError, "Failed to send an event to PagerDuty: #{response.body} #{request_body}"
       end
       # rubocop:enable Style/GuardClause
     end
 
-    private
-
-    attr_reader :api_integration_key, :http
-
     def retry_on(value, retries_number)
       retry_number = 0
 
@@ -42,16 +50,10 @@ module NineOneOne
       end
     end
 
-    def make_request(body)
-      headers = {'Content-Type' => 'application/json'}
-
-      http.post(EVENTS_API_V2_ENDPOINT, body, headers)
-    end
-
-    def request_body(description, source, dedup_key, severity, details_hash)
-      body = {
+    def request_body(event_action, dedup_key, description = nil, source = nil, severity = nil, details_hash = nil)
+      {
         routing_key: api_integration_key,
-        event_action: 'trigger',
+        event_action: event_action,
         dedup_key: dedup_key,
         payload: {
           summary: description,
@@ -59,9 +61,7 @@ module NineOneOne
           severity: severity,
           custom_details: details_hash
         }.reject { |_, v| v.nil? }
-      }.reject { |_, v| v.nil? }
-
-      body.to_json
+      }.reject { |_, v| v.nil? || v.empty? }.to_json
     end
   end
 end

data/lib/nine_one_one/version.rb

@@ -1,3 +1,3 @@
 module NineOneOne
-  VERSION = '2.0.4'.freeze
+  VERSION = '2.1.0'.freeze
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: nine_one_one
 version: !ruby/object:Gem::Version
-  version: 2.0.4
+  version: 2.1.0
 platform: ruby
 authors:
 - Kacper Madej
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-08-08 00:00:00.000000000 Z
+date: 2019-10-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -214,7 +214,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.11
+rubygems_version: 2.6.14.1
 signing_key: 
 specification_version: 4
 summary: Alerts and notifications via PagerDuty and Slack for Ruby apps