sensu-plugins-pagerduty 0.0.6 → 0.0.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ea5c4984c1c8d761b3f4c244410b4a94879c9570
-  data.tar.gz: 8e70dbbe8d66ab5b012942ed0111b8458b92949f
+  metadata.gz: 2113087689f53feb5a4a2dc14ea9974e9929541b
+  data.tar.gz: 0bfa98c7fbc66bc98347df4201a29392d47112a5
 SHA512:
-  metadata.gz: bfd97aade48e4b8449846cf0004493bb20c79c8477f424e383f5cba689a719f9e21c87ebb28ee631857a373746fd9448e0b83c94355dd93a54e2d4edede64906
-  data.tar.gz: 1f1818e20cd9daaf460f8adf6b3dd130a000e69fc00d3b6772a8ffddae4e7bcacb710e3606f055da1ff66541d85350359fc2b5a8cd356ecebebcda69d39ddeb4
+  metadata.gz: 93d2459ce1896c0b01ed4e6fa18ee2f3c1a056130a4c2bbe2a05f01d24ee26f99d2a87f80506f8abe610c300745c7dca2be55d4defe6d3dc60d2b5c3b84023bc
+  data.tar.gz: 51735879fa43c59e7788a3c3f83de7489693de8f42ad3dc38a31eff9a1471f85b7bba49bb0694a5542a01fe4259e9de01c6435aac281cd6bf55b20b0d6b5ce4f

data/CHANGELOG.md

@@ -4,8 +4,23 @@ This project adheres to [Semantic Versioning](http://semver.org/).
 This CHANGELOG follows the format listed at [Keep A Changelog](http://keepachangelog.com/)
 
 ## Unreleased
+- nothing
+
+## [0.0.7] - 2015-10-29
+### Changed
+- handler-pagerduty: use json_config for incident key dedup_rules
+- adding override from client
+
+## [0.0.6] - 2015-07-31
+### Added
 - Added support for PagerDuty alert deduping.  See the Readme file for an example.
 
+### Changed
+- Updated rubocop to `0.32.1`
+
+### Fixed
+- fixed rubocop errors
+
 ## [0.0.5] - 2015-07-14
 ### Changed
 - updated sensu-plugin gem to 1.2.0

data/bin/handler-pagerduty.rb

@@ -8,6 +8,10 @@
 # Released under the same terms as Sensu (the MIT license); see LICENSE
 # for details.
 #
+# Note: The sensu api token could also be configured on a per client or per check basis.
+#       By defining the "pager_team" attribute in the client config file or the check config.
+#       The override order will be client > check > json_config
+#
 # Dependencies:
 #
 #   sensu-plugin >= 1.0.0
@@ -27,19 +31,22 @@ class Pagerduty < Sensu::Handler
          required: false,
          default: 'pagerduty'
 
-  def incident_key # rubocop:disable all
+  def incident_key
+    json_config = config[:json_config]
     source = @event['check']['source'] || @event['client']['name']
     incident_id = [source, @event['check']['name']].join('/')
-    dedup_rules = settings['pagerduty']['dedup_rules'] || {}
+    dedup_rules = settings[json_config]['dedup_rules'] || {}
     dedup_rules.each do |key, val|
       incident_id = incident_id.gsub(Regexp.new(key), val)
     end
     incident_id
   end
 
-  def handle # rubocop:disable all
+  def handle
     json_config = config[:json_config]
-    if @event['check']['pager_team']
+    if @event['client']['pager_team']
+      api_key = settings[json_config][@event['client']['pager_team']]['api_key']
+    elsif @event['check']['pager_team']
       api_key = settings[json_config][@event['check']['pager_team']]['api_key']
     else
       api_key = settings[json_config]['api_key']

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

@@ -2,7 +2,7 @@ module SensuPluginsPagerduty
   module Version
     MAJOR = 0
     MINOR = 0
-    PATCH = 6
+    PATCH = 7
 
     VER_STRING = [MAJOR, MINOR, PATCH].compact.join('.')
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: sensu-plugins-pagerduty
 version: !ruby/object:Gem::Version
-  version: 0.0.6
+  version: 0.0.7
 platform: ruby
 authors:
 - Sensu-Plugins and contributors
@@ -30,22 +30,8 @@ cert_chain:
   8sHuVruarogxxKPBzlL2is4EUb6oN/RdpGx2l4254+nyR+abg//Ed27Ym0PkB4lk
   HP0m8WSjZmFr109pE/sVsM5jtOCvogyujQOjNVGN4gz1wwPr
   -----END CERTIFICATE-----
-date: 2015-07-31 00:00:00.000000000 Z
+date: 2015-10-29 00:00:00.000000000 Z
 dependencies:
-- !ruby/object:Gem::Dependency
-  name: pagerduty
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - '='
-      - !ruby/object:Gem::Version
-        version: 2.0.1
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - '='
-      - !ruby/object:Gem::Version
-        version: 2.0.1
 - !ruby/object:Gem::Dependency
   name: redphone
   requirement: !ruby/object:Gem::Requirement
@@ -178,14 +164,14 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: '0.30'
+        version: 0.32.1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: '0.30'
+        version: 0.32.1
 - !ruby/object:Gem::Dependency
   name: yard
   requirement: !ruby/object:Gem::Requirement
@@ -239,7 +225,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.6
+rubygems_version: 2.4.8
 signing_key: 
 specification_version: 4
 summary: Sensu plugins for pagerduty