nine_one_one 1.0.0 → 2.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 78b082ffa0e24bc561db44377acf1355736dc129
-  data.tar.gz: f5fef5647e90a970b7a1eaf6affd592e3733a26d
+SHA256:
+  metadata.gz: 776940734a50ef162b69ae5fea1cf1bd0ae55c4a5362b3b2d4f683d5e69b716b
+  data.tar.gz: 4a92b63797a071cee321c0b498a6014e92b113743aa168a76101a4a96a269342
 SHA512:
-  metadata.gz: 88ba14725f3a147bddd56a90134d878a189d25704d60afa2d1ce5dc0868c809a27f105c053dcd0a93088f841cc5060a02bd262b8604af6bd0b29506e2d2b9041
-  data.tar.gz: ca7fed9b2ea62f3d16926e25742961d10108bb453ed9160281e73660b554a67dfc4977ddcacd367a087800dfe6b044c1978a832e4646fca6f7fe205369899173
+  metadata.gz: a14333562ab2149b86e28472eaf8674966cb0a7be6497bea159be2dfe6280b759a6fc4a948e8da968b99d5b620aa52df66024ad62ee6ee96fc0ee928ccf6a91e
+  data.tar.gz: 1baca0838a7c34b75b7155759cd262c94aac0dcc7c610a6279a70950217509c0262e2ee6b38df2240e2bd92309582ce3e133f7340c93a46a444805f651612181

data/.rubocop.yml

@@ -7,7 +7,7 @@ AllCops:
     - bin/**/*
     - db/**/*
     - vendor/**/*
-  TargetRubyVersion: 2.1
+  TargetRubyVersion: 2.2
 
 Style/MultilineOperationIndentation:
   EnforcedStyle: indented

data/.travis.yml

@@ -2,7 +2,6 @@ language: ruby
 cache: bundler
 before_install: gem update --remote bundler
 rvm:
-  - 2.1.5
   - 2.2.5
   - 2.3.1
 script: "bundle exec rake spec"

data/README.md

@@ -77,11 +77,14 @@ NineOneOne.notify('Something happened!')
 NineOneOne.notify({attachments: [{title: 'Something happened!', text: 'More info'}]})
 
 # Send pager or log emergency using logger depending on the `send_pagers` config parameter
-NineOneOne.emergency('Emergency message!', 'Error source info', { optional_hash: 'with details' })
+NineOneOne.emergency('Emergency message!', 'Error source info', details_hash: { optional_hash: 'with details' })
+
+# Send multiple pagers that will be grouped into one incident
+NineOneOne.emergency('Emergency message!', 'Error source info', dedup_key: 'Kinda unique key') 
 
 # same for custom configurations
 NineOneOne.use(:my_custom_configuration).notify('Something happened!')
-NineOneOne.use(:my_custom_configuration).emergency('INCIDENT_KEY', 'Emergency message!', { optional_hash: 'with details' })
+NineOneOne.use(:my_custom_configuration).emergency('Emergency message!', 'Error source info', details_hash: { optional_hash: 'with details' })
 ```
 
 ## Development
@@ -90,6 +93,8 @@ After checking out the repo, run `bin/setup` to install dependencies. Then, run
 
 # Changelog
 
+2.0.0 Change the interface to have default parameters. Introduce dedup_key. It's backwards incompatible again.
+
 1.0.0 Migrate to Pager Duty Events API V2 (backwards incompatible!) and add support for slack hash message.
 
 0.3.0 Allow to have multiple configurations for notifications 

data/lib/nine_one_one.rb

@@ -27,8 +27,11 @@ module NineOneOne
     @configs ||= {}
   end
 
-  def self.emergency(description, source, details_hash = nil, severity = PagerDutyService::HIGH_URGENCY_ERROR)
-    use(:default).emergency(description, source, details_hash, severity)
+  def self.emergency(description, source: Socket.gethostname, dedup_key: nil,
+                     severity: PagerDutyService::HIGH_URGENCY_ERROR, details_hash: nil)
+    use(:default).emergency(description, source: source, dedup_key: dedup_key, severity: severity,
+                                 details_hash: details_hash)
+
   end
 
   def self.notify(message)

data/lib/nine_one_one/notifier.rb

@@ -4,8 +4,10 @@ module NineOneOne
       @config = config
     end
 
-    def emergency(description, source, details_hash, severity)
-      emergency_service.trigger_event(description, source, details_hash, severity)
+    def emergency(description, source, dedup_key: nil, severity: PagerDutyService::HIGH_URGENCY_ERROR,
+                  details_hash: nil)
+      emergency_service.trigger_event(description, source, dedup_key: dedup_key, severity: severity,
+                                      details_hash: details_hash)
     end
 
     def notify(message)
@@ -23,7 +25,7 @@ module NineOneOne
     def notification_service
       if config.slack_enabled
         SlackService.new(config.slack_webhook_url, username: config.slack_username,
-                                                   channel: config.slack_channel)
+                         channel: config.slack_channel)
       else
         LogService.new(config.logger)
       end

data/lib/nine_one_one/pager_duty_service.rb

@@ -5,17 +5,19 @@ module NineOneOne
     THROTTLE_HTTP_STATUS = 403
     THROTTLE_RETRIES = 2
     HIGH_URGENCY_ERROR = 'error'.freeze
+    LOW_URGENCY_ERROR = 'warning'.freeze
 
     def initialize(api_integration_key)
       @api_integration_key = api_integration_key
       @http = Http.new(BASE_HOST)
     end
 
-    def trigger_event(description, source, details_hash, severity)
+    def trigger_event(description, source: Socket.gethostname, dedup_key: nil, severity: HIGH_URGENCY_ERROR,
+                      details_hash: nil)
       response = nil
 
       retry_on(THROTTLE_HTTP_STATUS, THROTTLE_RETRIES) do
-        body = request_body(description, severity, source, details_hash)
+        body = request_body(description, source, dedup_key, severity, details_hash)
         response = make_request(body)
         response.code.to_i
       end
@@ -46,17 +48,18 @@ module NineOneOne
       http.post(EVENTS_API_V2_ENDPOINT, body, headers)
     end
 
-    def request_body(description, severity, source, details_hash)
+    def request_body(description, source, dedup_key, severity, details_hash)
       body = {
         routing_key: api_integration_key,
         event_action: 'trigger',
+        dedup_key: dedup_key,
         payload: {
           summary: description,
-          severity: severity,
           source: source,
+          severity: severity,
           custom_details: details_hash
-        }
-      }
+        }.reject { |_, v| v.nil? }
+      }.reject { |_, v| v.nil? }
 
       body.to_json
     end

data/lib/nine_one_one/slack_service.rb

@@ -3,15 +3,15 @@ module NineOneOne
     def initialize(webhook_url, opts = {})
       uri = URI(webhook_url)
 
-      @channel  = opts[:channel]
-      @http     = opts[:http] || Http.new(uri.host, uri.scheme)
-      @path     = uri.path
+      @channel = opts[:channel]
+      @http = opts[:http] || Http.new(uri.host, uri.scheme)
+      @path = uri.path
       @username = opts[:username]
     end
 
     def notify(message)
       body = request_body(message)
-      headers = { 'Content-Type' => 'application/json' }
+      headers = {'Content-Type' => 'application/json'}
       http.post(path, body, headers)
     end
 
@@ -20,8 +20,8 @@ module NineOneOne
     attr_reader :channel, :http, :path, :username
 
     def request_body(message)
-      body = message.is_a?(Hash) ? message : { text: message }
-      body[:channel]  = channel  unless channel.nil?
+      body = message.is_a?(Hash) ? message : {text: message}
+      body[:channel] = channel unless channel.nil?
       body[:username] = username unless username.nil?
 
       body.to_json

data/lib/nine_one_one/version.rb

@@ -1,3 +1,3 @@
 module NineOneOne
-  VERSION = '1.0.0'.freeze
+  VERSION = '2.0.1'.freeze
 end

data/nine_one_one.gemspec

@@ -19,8 +19,8 @@ Gem::Specification.new do |spec|
   spec.bindir        = 'exe'
   spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
   spec.require_paths = ['lib']
-  spec.required_ruby_version = '>= 2.1'
-  spec.post_install_message = 'From Ver 1.0.0 emergency method call is not backwards compatible!'
+  spec.required_ruby_version = '>= 2.2'
+  spec.post_install_message = 'From Ver 2.0.0 emergency method call is not backwards compatible!'
 
   spec.add_development_dependency 'bundler', '~> 1.13'
   spec.add_development_dependency 'codeclimate-test-reporter', '~> 1.0'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: nine_one_one
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 2.0.1
 platform: ruby
 authors:
 - Kacper Madej
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-03-09 00:00:00.000000000 Z
+date: 2018-07-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -198,7 +198,7 @@ homepage: https://github.com/u2i/nine_one_one
 licenses:
 - MIT
 metadata: {}
-post_install_message: From Ver 1.0.0 emergency method call is not backwards compatible!
+post_install_message: From Ver 2.0.0 emergency method call is not backwards compatible!
 rdoc_options: []
 require_paths:
 - lib
@@ -206,7 +206,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '2.1'
+      version: '2.2'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
@@ -214,7 +214,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.13
+rubygems_version: 2.7.6
 signing_key: 
 specification_version: 4
 summary: Alerts and notifications via PagerDuty and Slack for Ruby apps