alerty-plugin-amazon_sns 0.0.5 → 0.0.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 32c4497d480d72360d5e2a067c84aad969ee380b
-  data.tar.gz: 8b06a6b6281e2320694b52d194557be217950b78
+  metadata.gz: b748815b308593963baddf3e99474586b95ad4a7
+  data.tar.gz: 7fab8979be67329acdcbb1e507acf3469e29c1a1
 SHA512:
-  metadata.gz: 73bc346ad396a0302c745fb993281b5451cf68b2ad2357b7ba2086ffbf991426a4607adc31c732f11e0a12caaf88177caeec7402c9fa9f5c7aace8e3f7e10a7d
-  data.tar.gz: e12390631701edd434f4608ac7a4b54a426e89d005266e1880119e450b9bba33780d2aa516f0efe725a6f84260dc5e2c8eea36e1db3e5abef6accf8ad005ead8
+  metadata.gz: d54cb95bc5a4648960ac13b6b11b8694ffc91562c0f0dbadc25c9b9316f58c791f4a86a4846b98c1b3562f95c9b27cdf6e338a9797da49480f61c0a1767e5cee
+  data.tar.gz: bc0dc677367e3646b77436538e526d2ac2d1580409f46d3f6ec207cd57f2cdb990a3aae4cd2b4ddf3452107487399b5512ee7df07187225c420601b6255581f4

data/CHANGELOG.md

@@ -1,3 +1,10 @@
+# 0.0.6 (2017/01/31)
+
+Changes:
+
+* Replace message with a white space if empty to avoid SNS empty message errors
+* Add message config
+
 # 0.0.5 (2016/12/08)
 
 Changes:

data/README.md

@@ -22,7 +22,8 @@ Or install it yourself as:
 
 * **type**: must be `amazon_sns`
 * **topc_arn**: Amazon SNS topic name
-* **subject**: subject of alert. `${command}` is replaced with a given command, `${hostname}` is replaced with the hostname ran a command
+* **subject**: subject of alert. `${command}` is replaced with a given command, `${hostname}` is replaced with the hostname ran the command, `${output}` is replaced with the output.
+* **message**: message of alert. `${command}` is replaced with a given command, `${hostname}` is replaced with the hostname ran the command, `${output}` is replaced with the output. The default is `${output}`.
 * **aws_region**: AWS Region. (default: guess from topic_arn, like arn:aws:sns:us-east-1:<account_id>:<topic_name> => us-east-1)
 * **aws_access_key_id**: Credential key id (default: ENV['AWS_SECRET_KEY_id'] or ~/.aws/credentials or instance profile on EC2)
 * **aws_secret_access_key**: Credential secret access_key (default: ENV['AWS_SECRET_ACCESS_KEY'] or ~/.aws/credentials or instance profile on EC2)

data/alerty-plugin-amazon_sns.gemspec

@@ -2,7 +2,7 @@
 
 Gem::Specification.new do |spec|
   spec.name          = "alerty-plugin-amazon_sns"
-  spec.version       = "0.0.5"
+  spec.version       = "0.0.6"
   spec.authors       = ["Naotoshi Seo"]
   spec.email         = ["sonots@gmail.com"]
 

data/lib/alerty/plugin/amazon_sns.rb

@@ -17,14 +17,14 @@ class Alerty
         params[:secret_access_key] = config.aws_secret_access_key if config.aws_secret_access_key
         @client = Aws::SNS::Client.new(params)
         @subject = config.subject
+        @message = config.message
         @topic_arn = config.topic_arn
         @num_retries = config.num_retries || 3
       end
 
       def alert(record)
-        message = record[:output]
-        subject = expand_placeholder(@subject, record)
-        subject = subject[0..98] # SNS constraint, must be less than 100 character long
+        subject = get_subject(record)
+        message = get_message(record)
         retries = 0
         begin
           @client.publish(topic_arn: @topic_arn, message: message, subject: subject)
@@ -42,13 +42,27 @@ class Alerty
 
       private
 
+      def get_message(record)
+        message = @message.nil? ? record[:output] : expand_placeholder(@message, record)
+        message = ' ' if message.empty? # SNS constraint, SNS errors if message is empty
+        message
+      end
+
+      def get_subject(record)
+        subject = expand_placeholder(@subject, record)
+        subject = subject[0..98] # SNS constraint, must be less than 100 character long
+      end
+
       def guess_region(topic_arn)
         # arn:aws:sns:ap-northeast-1:<account_id>:<topic_name>
         topic_arn.split(':')[3]
       end
 
       def expand_placeholder(str, record)
-        str.gsub('${command}', record[:command]).gsub('${hostname}', record[:hostname])
+        replaced = str.gsub('${command}', record[:command])
+        replaced.gsub!('${hostname}', record[:hostname])
+        replaced.gsub!('${output}', record[:output])
+        replaced
       end
     end
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: alerty-plugin-amazon_sns
 version: !ruby/object:Gem::Version
-  version: 0.0.5
+  version: 0.0.6
 platform: ruby
 authors:
 - Naotoshi Seo
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-12-08 00:00:00.000000000 Z
+date: 2017-01-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: alerty