sensu-plugins-mailer 1.1.0 → 1.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 914ffd464cbc0cca8d351da9a48c9d09fb81e061
-  data.tar.gz: 93f37933624d9923666492a9084c9a3f270d9868
+  metadata.gz: e9aa2a9997cccbcdd4266654fbd3882bd2002678
+  data.tar.gz: 35e033dc524dfebf003249436810f67a4a0c4c27
 SHA512:
-  metadata.gz: 3e03b487e6b264cab942d39b78b989908430ab3ff724b1cee7a6925cb43fe55ec8eb93896e14278c8e7e3a3dea21de26ec1c0bafaee1bec4e1c56a2115d464df
-  data.tar.gz: 32021357210d7be11fee1348f7fba666119379535595dd4b9eca90d3b7267428e9b6c1c06adba1ae9e59d1677f3d18e6d200374a5418b7642a0116ca044cfc19
+  metadata.gz: f3369051b649641a7cf308f683847b14928f07a570980a301ad7c06e6094ede2ef4ff63074e721ef970611c2d4b79c23a48c5d3536c43064e7fbe7288005e761
+  data.tar.gz: 80574d190775484e384e342923eb97bc2b8d3632744890f58991aef3edff573aa852efb6c87882cecbc152670440f9aca4153a7fefcc334a528c96a9c2eccc1f

data/CHANGELOG.md

@@ -4,6 +4,11 @@ This project adheres to [Semantic Versioning](http://semver.org/).
 This CHANGELOG follows the format listed at [Keep A Changelog](http://keepachangelog.com/)
 
 ## [Unreleased]
+
+## [1.2.0] - 2017-06-24
+### Added
+- handler-mailer.rb: add contact routing like Sensu Enterprise works (@stevenviola)
+
 ## [1.1.0] - 2017-06-01
 ### Fixed
 - handler-mailer.rb - revert the commit which makes email go to wrong addresses
@@ -84,7 +89,8 @@ This CHANGELOG follows the format listed at [Keep A Changelog](http://keepachang
 ### Added
 - initial release
 
-[Unreleased]: https://github.com/sensu-plugins/sensu-plugins-mailer/compare/1.1.0...HEAD
+[Unreleased]: https://github.com/sensu-plugins/sensu-plugins-mailer/compare/1.2.0...HEAD
+[1.2.0]: https://github.com/sensu-plugins/sensu-plugins-mailer/compare/1.1.0...1.2.0
 [1.1.0]: https://github.com/sensu-plugins/sensu-plugins-mailer/compare/1.0.0...1.1.0
 [1.0.0]: https://github.com/sensu-plugins/sensu-plugins-mailer/compare/0.3.1...1.0.0
 [0.3.1]: https://github.com/sensu-plugins/sensu-plugins-mailer/compare/0.3.0...0.3.1

data/README.md

@@ -85,6 +85,40 @@ client config called "template", the mailer handler config, default.
 ```
 By default, the handler will use `plain` as the SMTP authentication type, but you may also specify `"smtp_authentication": "ntlm"` for compatible servers, e.g. Microsoft Exchange.
 
+### Contact Based Routing
+
+Optionally, this handler can use the same syntax as [Sensu Enterprise contact routing](https://sensuapp.org/docs/0.26/enterprise/contact-routing.html) for sending e-mails for particular checks or clients, in addition to the previous configuration. This is configured by declaring contacts:
+
+**support.json**
+```
+{
+  "contacts": {
+    "support": {
+      "email": {
+        "to": "support@sensuapp.com"
+      }
+    }
+  }
+} 
+```
+
+Then, in a check definition, you can specify a contact or an array of contacts which should be notified by e-mail:
+
+**example_check.json**
+```
+{
+  "checks": {
+    "example_check": {
+      "command": "do_something.rb",
+      "handler": "mailer",
+      "contact": "support"
+    }
+  }
+}
+```
+
+Additionally, a client definition can specify a contact or an array of contacts to be notified of any check which alerts to the mailer handler. This is configured by specifying a contact value, or contacts array in the client.json configuration.
+
 ## Installation
 
 [Installation and Setup](http://sensu-plugins.io/docs/installation_instructions.html)

data/bin/handler-mailer.rb

@@ -145,6 +145,22 @@ class Mailer < Sensu::Handler
         end
       end
     end
+    if settings.key?('contacts')
+      all_contacts = []
+      %w(check client).each do |field|
+        if @event[field].key?('contact')
+          all_contacts << @event[field]['contact']
+        end
+        if @event[field].key?('contacts')
+          all_contacts += @event[field]['contacts']
+        end
+      end
+      all_contacts.each do |sub|
+        if settings['contacts'].key?(sub)
+          mail_to.add(settings['contacts'][sub]['email']['to'].to_s)
+        end
+      end
+    end
     mail_to.to_a.join(', ')
   end
 

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

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sensu-plugins-mailer
 version: !ruby/object:Gem::Version
-  version: 1.1.0
+  version: 1.2.0
 platform: ruby
 authors:
 - Sensu-Plugins and contributors
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-06-01 00:00:00.000000000 Z
+date: 2017-06-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: aws-ses