sensu-plugins-mailer 0.1.5 → 0.2.0

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    NmUxNGI2ODE2OTRiOTE3ZTY2OWMxMTMyMGMzZWMyMjE3ODZmZDk3Ng==
+    MGYwZGU2YjMyODY1MTE5M2NmZTk0YWVmMTRjMmUwMTQyMGYwODU1Mg==
   data.tar.gz: !binary |-
-    ODE2MTcyOWUyMTIzNDNlMjg0ODE4Yjg2YmUzMDNhZGVjMWU4YjNkZQ==
+    YmE4NjllY2RkNDYyOTczOGJjNzc5NGIxZTY1ZWYxZWE1NGE0OWI4YQ==
 SHA512:
   metadata.gz: !binary |-
-    OTBiNDU4M2RjMDNhNDcwYmQ4NGMxNmRhZWMwMDEzNmM4MjIzNDkzNmIxODdj
-    ZDFkMTdhMmIxNTYyY2RiMGYxYjYxMjE0ODMzZjg1NTgwMzU3MzllMTg5M2Q1
-    MDQyNTdkMzIxODRjMGJiYTA5N2JkNTEyYTRkYTQ5ODE2Nzc1MTY=
+    MjFiYThkNTQxOTU5NzI1MjRiYzYwOGEzOTY0Yjg1NjRhZjBkN2Y0M2JiZDQw
+    NTgzYmI0ZWYzYmFhMWQzNDBiZWNiN2E1MGIxZTA5YzVkM2Y5ZTc5Y2EzYzhj
+    MmJlMGU2Y2FmZDg4ODBjOTM3YTZlYTI1MzhjOTc1OGIzZWYyYWU=
   data.tar.gz: !binary |-
-    Y2VhZWZlNTNmZDYzZTc0YjE1ZTllMWUzNWM5ZjEzZWVjNDIyNGE3OTk4OGRk
-    M2RhYzdjODcxNmUyNTEwZGQ3ZjNiMDgxZDIyYzA5N2RlNWFiOGQ2NTlmMDAz
-    ZWM3MzZmOGViZGNmNTVlYTRiYWYzMjIzYmUwYWZlZmI1MjZkMDk=
+    ZDk0N2QxZTM4NTc0NDdmOTVmM2M1M2FjZTYwNDliZmI0MDg2YjA2M2M2MmNl
+    M2MzYzQ4NWY3ZjA4ZmM0Yjk3NWFhMDEyMjUzZjdiZjUwZTBkZjhjYjg1YTcw
+    NzhjZDcyZDZhYjNlNDExNTZmMGFlZmVhZTg1OWNiNGM3MTYwYjY=

data/CHANGELOG.md

@@ -5,6 +5,13 @@ This CHANGELOG follows the format listed at [Keep A Changelog](http://keepachang
 
 ## [Unreleased]
 
+## [0.2.0] - 2016-03-17
+### Added
+- Support for prefixing the email subject
+
+### Fixed
+- handler-mailer.rb: Fix content type selection
+
 ## [0.1.5] - 2016-02-04
 ### Added
 - new certs
@@ -44,12 +51,12 @@ This CHANGELOG follows the format listed at [Keep A Changelog](http://keepachang
 - puts deps in alpha order in the gemspec and rakefile
 
 ## 0.0.1 - 2015-06-04
-
 ### Added
 - initial release
 
-[Unreleased]: https://github.com/sensu-plugins/sensu-plugins-mailer/compare/0.1.5...HEAD
-[0.1.5]: https://github.com/sensu-plugins/sensu-plugins-mailer/compare/0.1.4...0.1.5
+[Unreleased]: https://github.com/sensu-plugins/sensu-plugins-mailer/compare/0.2.0...HEAD
+[0.2.0]: https://github.com/sensu-plugins/sensu-plugins-mailer/compare/v0.1.5...0.2.0
+[0.1.5]: https://github.com/sensu-plugins/sensu-plugins-mailer/compare/0.1.4...v0.1.5
 [0.1.4]: https://github.com/sensu-plugins/sensu-plugins-mailer/compare/0.1.3...0.1.4
 [0.1.3]: https://github.com/sensu-plugins/sensu-plugins-mailer/compare/0.1.2...0.1.3
 [0.1.2]: https://github.com/sensu-plugins/sensu-plugins-mailer/compare/0.1.1...0.1.2

data/README.md

@@ -5,7 +5,6 @@
 [![Code Climate](https://codeclimate.com/github/sensu-plugins/sensu-plugins-mailer/badges/gpa.svg)](https://codeclimate.com/github/sensu-plugins/sensu-plugins-mailer)
 [![Test Coverage](https://codeclimate.com/github/sensu-plugins/sensu-plugins-mailer/badges/coverage.svg)](https://codeclimate.com/github/sensu-plugins/sensu-plugins-mailer)
 [![Dependency Status](https://gemnasium.com/sensu-plugins/sensu-plugins-mailer.svg)](https://gemnasium.com/sensu-plugins/sensu-plugins-mailer)
-[![Codeship Status for sensu-plugins/sensu-plugins-mailer](https://codeship.com/projects/558443b0-ea2d-0132-729c-4602e60b2e9f/status?branch=master)](https://codeship.com/projects/83060)
 
 ## Functionality
 

data/bin/handler-mailer-mailgun.rb

@@ -41,12 +41,21 @@ class Mailer < Sensu::Handler
     @event['action'].eql?('resolve') ? 'RESOLVED' : 'ALERT'
   end
 
+  def prefix_subject
+    if params[:subject_prefix]
+      params[:subject_prefix] + ' '
+    else
+      ''
+    end
+  end
+
   def handle
     params = {
       mail_to: settings['mailer-mailgun']['mail_to'],
       mail_from: settings['mailer-mailgun']['mail_from'],
       mg_apikey: settings['mailer-mailgun']['mg_apikey'],
-      mg_domain: settings['mailer-mailgun']['mg_domain']
+      mg_domain: settings['mailer-mailgun']['mg_domain'],
+      subject_prefix: settings['mailer-mailgun']['subject_prefix']
     }
 
     body = <<-BODY.gsub(/^ {14}/, '')
@@ -59,7 +68,7 @@ class Mailer < Sensu::Handler
             Status:  #{@event['check']['status']}
             Occurrences:  #{@event['occurrences']}
           BODY
-    subject = "#{action_to_string} - #{short_name}: #{@event['check']['notification']}"
+    subject = "#{prefix_subject}#{action_to_string} - #{short_name}: #{@event['check']['notification']}"
 
     mg_client = Mailgun::Client.new params[:mg_apikey]
 

data/bin/handler-mailer-ses.rb

@@ -24,13 +24,22 @@ class Mailer < Sensu::Handler
     @event['action'].eql?('resolve') ? 'RESOLVED' : 'ALERT'
   end
 
+  def prefix_subject
+    if params[:subject_prefix]
+      params[:subject_prefix] + ' '
+    else
+      ''
+    end
+  end
+
   def handle
     params = {
       mail_to: settings['mailer-ses']['mail_to'],
       mail_from: settings['mailer-ses']['mail_from'],
       aws_access_key: settings['mailer-ses']['aws_access_key'],
       aws_secret_key: settings['mailer-ses']['aws_secret_key'],
-      aws_ses_endpoint: settings['mailer-ses']['aws_ses_endpoint']
+      aws_ses_endpoint: settings['mailer-ses']['aws_ses_endpoint'],
+      subject_prefix: settings['mailer-ses']['subject_prefix']
     }
 
     body = <<-BODY.gsub(/^ {14}/, '')
@@ -43,7 +52,7 @@ class Mailer < Sensu::Handler
             Status:  #{@event['check']['status']}
             Occurrences:  #{@event['occurrences']}
           BODY
-    subject = "#{action_to_string} - #{short_name}: #{@event['check']['notification']}"
+    subject = "#{prefix_subject}#{action_to_string} - #{short_name}: #{@event['check']['notification']}"
 
     ses = AWS::SES::Base.new(
       access_key_id: params[:aws_access_key],

data/bin/handler-mailer.rb

@@ -52,6 +52,12 @@ class Mailer < Sensu::Handler
          long: '--content_type ContentType',
          required: false
 
+  option :subject_prefix,
+         description: 'Prefix message subjects with this string',
+         short: '-s prefix',
+         long: '--subject_prefix prefix',
+         required: false
+
   def short_name
     @event['client']['name'] + '/' + @event['check']['name']
   end
@@ -60,6 +66,16 @@ class Mailer < Sensu::Handler
     @event['action'].eql?('resolve') ? 'RESOLVED' : 'ALERT'
   end
 
+  def prefix_subject
+    if config[:subject_prefix]
+      config[:subject_prefix] + ' '
+    elsif settings[config[:json_config]]['subject_prefix']
+      settings[config[:json_config]]['subject_prefix'] + ' '
+    else
+      ''
+    end
+  end
+
   def status_to_string
     case @event['check']['status']
     when 0
@@ -84,7 +100,7 @@ class Mailer < Sensu::Handler
             'plain'
           end
 
-    if use.casecmp('html')
+    if use.casecmp('html') == 0
       'text/html; charset=UTF-8'
     else
       'text/plain; charset=ISO-8859-1'
@@ -169,9 +185,9 @@ class Mailer < Sensu::Handler
     }
 
     subject = if @event['check']['notification'].nil?
-                "#{action_to_string} - #{short_name}: #{status_to_string}"
+                "#{prefix_subject}#{action_to_string} - #{short_name}: #{status_to_string}"
               else
-                "#{action_to_string} - #{short_name}: #{@event['check']['notification']}"
+                "#{prefix_subject}#{action_to_string} - #{short_name}: #{@event['check']['notification']}"
               end
 
     Mail.defaults do

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

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

metadata

@@ -1,45 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sensu-plugins-mailer
 version: !ruby/object:Gem::Version
-  version: 0.1.5
+  version: 0.2.0
 platform: ruby
 authors:
 - Sensu-Plugins and contributors
 autorequire: 
 bindir: bin
-cert_chain:
-- !binary |-
-  LS0tLS1CRUdJTiBDRVJUSUZJQ0FURS0tLS0tCk1JSURuakNDQW9hZ0F3SUJB
-  Z0lCQVRBTkJna3Foa2lHOXcwQkFRVUZBREJLTVJVd0V3WURWUVFEREF4elpX
-  NXoKZFMxd2JIVm5hVzR4SFRBYkJnb0praWFKay9Jc1pBRVpGZzF6Wlc1emRT
-  MXdiSFZuYVc1ek1SSXdFQVlLQ1pJbQppWlB5TEdRQkdSWUNhVzh3SGhjTk1U
-  WXdNakEwTWpNeU1qRTNXaGNOTVRjd01qQXpNak15TWpFM1dqQktNUlV3CkV3
-  WURWUVFEREF4elpXNXpkUzF3YkhWbmFXNHhIVEFiQmdvSmtpYUprL0lzWkFF
-  WkZnMXpaVzV6ZFMxd2JIVm4KYVc1ek1SSXdFQVlLQ1pJbWlaUHlMR1FCR1JZ
-  Q2FXOHdnZ0VpTUEwR0NTcUdTSWIzRFFFQkFRVUFBNElCRHdBdwpnZ0VLQW9J
-  QkFRQy9VUzNmdEkyUmQrOWQzS3JIQUw0bERsOGxhN2s2ZHA3K1RPY210VHd3
-  YzRiMUwzV0NyeEFoClpDWms1Q3k2aUpvWUd4VHVoNittSDJZZ3ExbHZGRE4v
-  NTh5YVRHTVFINzNRYVJjZjVnak9IMkJSQTlkUWRzWUgKYTNZYnMrbGxwVlYv
-  ZC9kMklaYyt2RU9tc21rTFpVeEhzZFdQSTZsWTBuYXJwU2RxNHNML0lXWWZP
-  aW1ocFFTWgpTV0t5WHg5cjM4UFpZZ0Q3djIydjloNTZkcUpQZFFPY29OODhF
-  NkE4YTdQWTcvL1RweWdTREtuSldudkFwS1JxCjNCN0xMaFNkOTRQMHdRcGow
-  MS9sb05Nd0FCMytGQjRRQ0UrdG1QeFYxZ1Q2ZWE4VW1SNjQrcGZKTFN0NGl5
-  N0gKVGc5OTdCZFZqaURJdG5SYzhCSXNjVFl4S2JRai9wTEhBZ01CQUFHamdZ
-  NHdnWXN3Q1FZRFZSMFRCQUl3QURBTApCZ05WSFE4RUJBTUNCTEF3SFFZRFZS
-  ME9CQllFRk5McjBmZ1BmdnlWK0VneEVGRHhVcVFhU2xScE1DZ0dBMVVkCkVR
-  UWhNQitCSFhObGJuTjFMWEJzZFdkcGJrQnpaVzV6ZFMxd2JIVm5hVzV6TG1s
-  dk1DZ0dBMVVkRWdRaE1CK0IKSFhObGJuTjFMWEJzZFdkcGJrQnpaVzV6ZFMx
-  d2JIVm5hVzV6TG1sdk1BMEdDU3FHU0liM0RRRUJCUVVBQTRJQgpBUUNQZTZ0
-  RUJ0NS9uQzk1aFhvS2VLRmhrWVc5bTE2aU5YdWRKeEorZGRYcnpDc2tEMXk2
-  ajZjQXY0a1FlUDFmClBIbDE4aDVrOWtKeElQU1IrcUkrK2JJbDE3ZUVPU096
-  YXNMbXdzdGFNU25NN3U1UWZMcFdFWTJldVZXQkRzdGQKMmhrcG80VSswSzVT
-  d3ptZEphMFdLQXRmS3ZkdENROGk5MllJUCtIODNFdXZDU0xwZ29aaDYzRXJx
-  dVFVY25lbgphZmg1bHVUQkExaTFjcUJHNEFNSjBmTFdHeU9xSmFYOFA5WnN4
-  RERXUEVCbk5TaVd2WGIrSUttSkFWTzF1VzRrClFOODNielZXU1d1bFk4Qlk2
-  a1grSVFNd1lhelpBbEIvMTNkN2E4VTBoN0NyYjM2Sm5TUGF0aHVSemU0cUtY
-  RlEKM2YzVFVaV3d2UmZ0Y1N1K3Z0Y0JSa00wCi0tLS0tRU5EIENFUlRJRklD
-  QVRFLS0tLS0K
-date: 2016-02-05 00:00:00.000000000 Z
+cert_chain: []
+date: 2016-03-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: aws

checksums.yaml.gz.sig

@@ -1 +0,0 @@
-!Z�,)������Do�n���[��?�

data.tar.gz.sig

@@ -1,3 +0,0 @@
-y�bm��M��I���
-0�p
-�wH�%�4Ȃ��x��Jhѳ��Qy5��ZX>뷊D�Y����eU�}([�Ķ���渊�g�
���k����亊W�9j@zE 2C�U��orL8
����H��PN�3K��\�/�*����4v� </<����^��F���f�dT}�e��'�l���I���q)���uL�����s���}��4Lvؽlz�RoW�=\�����{`�絰�,�x-ߜ��w�-b+|k6�f9�Q�ƨ