sensu-plugins-slack 1.0.0 → 1.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3f54c218e9c552fac733928646ace4874f0649a4
-  data.tar.gz: 3a6a84804253872170a3ccf52803847164faede4
+  metadata.gz: 69f0b3777097fb1a163e2e5f07b1f3e91acfa5b2
+  data.tar.gz: fddcfcbf75a6938e24357c7fa73c3b2b8d7c0270
 SHA512:
-  metadata.gz: 224c3535db33eaa5af3aa1658a0b486b87fe19eca70939b3e5b6566d45a77072da7e8bb793fed0fb2a4138c35d7792836f301a39028fa22f37773d0b9101abd4
-  data.tar.gz: 3f4fb750ffc643689fb319541b031a15a3dfbe2c774dc9f0ade3fae1164a87e392ac89b237292ad28ae37bc2bfa18c5e1d43f6ca3a4d8484d27aa799c2820c86
+  metadata.gz: 4b9ac03a6e9e46669b0cf015f82cf2a5f4c8dbf9fa600f278205b6411c46ba79dbed45d870037fd727d19183f3262ddac47287f1f97279dc57f7d68fcdc7f2bc
+  data.tar.gz: dd166527f1daa5174251018b62daa97b79972c634bf525acc3fea43fd3b6b07e3697f059c1bed16f5524eab62c96062ba5f7fc26bb3f066f230c122333e6f013

data/CHANGELOG.md

@@ -1,10 +1,19 @@
-#Change Log
+# Change Log
 This project adheres to [Semantic Versioning](http://semver.org/).
 
 This CHANGELOG follows the format listed at [Keep A Changelog](http://keepachangelog.com/)
 
 ## [Unreleased]
 
+## [1.1.0] - 2017-06-22
+### Added
+- `slack-handler-multichannel.rb`: Add title line to mirror functionality of slack-handler.rb (@zer0nimbus)
+- `handler-slack.rb`: Add a `link_names` parameter to allow for mentions (@unionsep)
+
+### Fixed
+- Allow custom channels with custom payload (@bashtoni)
+- `handler-slack.rb`: Access the event notification from the correct location (@dunpealer)
+
 ## [1.0.0] - 2016-06-14
 ### Added
 - Added a payload_template to allow for a customized JSON payload
@@ -65,7 +74,8 @@ This CHANGELOG follows the format listed at [Keep A Changelog](http://keepachang
 ### Added
 - initial release
 
-[Unreleased]: https://github.com/sensu-plugins/sensu-plugins-slack/compare/1.0.0...HEAD
+[Unreleased]: https://github.com/sensu-plugins/sensu-plugins-slack/compare/1.1.0...HEAD
+[1.1.0]: https://github.com/sensu-plugins/sensu-plugins-slack/compare/1.0.0...1.1.0
 [1.0.0]: https://github.com/sensu-plugins/sensu-plugins-slack/compare/v0.1.2...1.0.0
 [0.1.2]: https://github.com/sensu-plugins/sensu-plugins-slack/compare/0.1.1...v0.1.2
 [0.1.1]: https://github.com/sensu-plugins/sensu-plugins-slack/compare/0.1.0...0.1.1

data/README.md

@@ -21,6 +21,7 @@
     "message_prefix": "optional prefix - can be used for mentions",
     "surround": "optional - can be used for bold(*), italics(_), code(`) and preformatted(```)",
     "bot_name": "optional bot name, defaults to slack defined",
+    "link_names": "optional - find and link channel names and usernames",
     "message_template": "optional description erb template file - /some/path/to/template.erb",
     "payload_template": "optional json payload template file (note: overrides most other template options.)",
     "template": "backwards-compatible alias for message_template",
@@ -53,6 +54,7 @@
 {
   "username": "sensu alarms",
   "icon_emoji": ":bell:",
+  "channel": channel,
   "attachments": [
     {
       "fallback": "<%= @event["check"]["output"] %>",

data/bin/handler-slack-multichannel.rb

@@ -157,12 +157,12 @@ class Slack < Sensu::Handler
         notice = @event['notification'] || build_description
         post_data(notice, channel)
       else
-        post_data(render_payload_template, channel)
+        post_data(render_payload_template(channel), channel)
       end
     end
   end
 
-  def render_payload_template
+  def render_payload_template(channel)
     return unless payload_template && File.readable?(payload_template)
     template = File.read(payload_template)
     eruby = Erubis::Eruby.new(template)
@@ -230,6 +230,7 @@ class Slack < Sensu::Handler
     {
       icon_url: 'http://sensuapp.org/img/sensu_logo_large-c92d73db.png',
       attachments: [{
+        title: "#{@event['client']['address']} - #{translate_status}",
         text: [slack_message_prefix, notice].compact.join(' '),
         color: color
       }]

data/bin/handler-slack.rb

@@ -54,6 +54,10 @@ class Slack < Sensu::Handler
     get_setting('surround')
   end
 
+  def slack_link_names
+    get_setting('link_names')
+  end
+
   def message_template
     get_setting('template') || get_setting('message_template')
   end
@@ -88,14 +92,14 @@ class Slack < Sensu::Handler
 
   def handle
     if payload_template.nil?
-      description = @event['notification'] || build_description
+      description = @event['check']['notification'] || build_description
       post_data("#{incident_key}: #{description}")
     else
-      post_data(render_payload_template)
+      post_data(render_payload_template(slack_channel))
     end
   end
 
-  def render_payload_template
+  def render_payload_template(channel)
     return unless payload_template && File.readable?(payload_template)
     template = File.read(payload_template)
     eruby = Erubis::Eruby.new(template)
@@ -178,6 +182,7 @@ class Slack < Sensu::Handler
       payload[:channel] = slack_channel if slack_channel
       payload[:username] = slack_bot_name if slack_bot_name
       payload[:icon_emoji] = slack_icon_emoji if slack_icon_emoji
+      payload[:link_names] = slack_link_names if slack_link_names
     end
   end
 

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

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sensu-plugins-slack
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.1.0
 platform: ruby
 authors:
 - Sensu-Plugins and contributors
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-06-14 00:00:00.000000000 Z
+date: 2017-06-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: erubis
@@ -205,9 +205,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.1
+rubygems_version: 2.4.5
 signing_key: 
 specification_version: 4
 summary: Sensu plugins for interfacing with Slack chat
 test_files: []
-has_rdoc: