sensu-plugins-slack 0.0.2 → 0.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0e3626c5f54aba53dbaef991059efeb38764e0b5
-  data.tar.gz: 3c37c199a813c5d25e76ede715310efa972e8ed5
+  metadata.gz: 70a744098aa871953bf98783dfd885a7cef8a199
+  data.tar.gz: 9bb145083bcf9c684d03ff2a9da4bd1e70c56bcb
 SHA512:
-  metadata.gz: ee9b1c3af1f8dce5375b27392727ec7ba1368534de163d64e57bf9201431355ceba4c375c68f3634fdfe29e02434946e9cd326c551c81e45799d0daaf5b4155d
-  data.tar.gz: 6b5dda23f0a4b38836eae92bd5af69129b7ef71f2fe1ac6c2b4bb427c3ff19bb777db90b19d314a99cd26106a9cc532af90b1e7d5b5adb8fdf2b347e819071ef
+  metadata.gz: 4c8d89bc5c0f568c810c0405722b155ee1a339f6790917e93fb7986e9c4626082f4462367769734a2bcc7f84added5619b642e439a6f3e5137ab76e6342545eb
+  data.tar.gz: 2e4c4f82842d60548c432d87775f2bd8f1fe3f1e191b649138e996696c1991a01c52cba8445a62a2571b2f3e19421cf0e249f7772694a36e6faed15550a7160f

data/CHANGELOG.md

@@ -5,8 +5,11 @@ This CHANGELOG follows the format listed at [Keep A Changelog](http://keepachang
 
 ## Unreleased][unreleased]
 
-## [0.0.2] - 2015-06-03
+## [0.0.3] - 2015-06-03
+### Added
+-additional functionality to slack hander to improve generated output
 
+## [0.0.2] - 2015-06-03
 ### Fixed
 - added binstubs
 
@@ -14,6 +17,5 @@ This CHANGELOG follows the format listed at [Keep A Changelog](http://keepachang
 - removed cruft from /lib
 
 ## 0.0.1 - 2015-05-29
-
 ### Added
 - initial release

data/README.md

@@ -20,7 +20,15 @@
     "channel": "#notifications-room, optional defaults to slack defined",
     "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"
+    "bot_name": "optional bot name, defaults to slack defined",
+    "template": "/some/path/to/template.erb",
+    "fields": [
+      "list",
+      "of",
+      "optional",
+      "clientkeys",
+      "to_render"
+    ]
   }
 }
 ```

data/bin/handler-slack.rb

@@ -13,6 +13,7 @@
 
 require 'sensu-handler'
 require 'json'
+require 'erubis'
 
 class Slack < Sensu::Handler
   option :json_config,
@@ -26,7 +27,11 @@ class Slack < Sensu::Handler
   end
 
   def slack_channel
-    get_setting('channel')
+    if @event['check']['slack_channel']
+      @event['check']['slack_channel']
+    else
+      get_setting('channel')
+    end
   end
 
   def slack_message_prefix
@@ -41,6 +46,14 @@ class Slack < Sensu::Handler
     get_setting('surround')
   end
 
+  def message_template
+    get_setting('template')
+  end
+
+  def fields
+    get_setting('fields')
+  end
+
   def incident_key
     @event['client']['name'] + '/' + @event['check']['name']
   end
@@ -55,11 +68,20 @@ class Slack < Sensu::Handler
   end
 
   def build_description
-    [
-      @event['check']['output'],
-      @event['client']['address'],
-      @event['client']['subscriptions'].join(',')
-    ].join(' : ')
+    if message_template && File.readable?(message_template)
+      template = File.read(message_template)
+    else
+      template = '''<%=
+      [
+        @event["check"]["output"],
+        @event["client"]["address"],
+        @event["client"]["subscriptions"].join(",")
+      ].join(" : ")
+      %>
+      '''
+    end
+    eruby = Erubis::Eruby.new(template)
+    eruby.result(binding)
   end
 
   def post_data(notice)
@@ -85,11 +107,28 @@ class Slack < Sensu::Handler
   end
 
   def payload(notice)
+    client_fields = []
+
+    unless fields.nil?
+      fields.each do |field|
+        # arbritary based on what I feel like
+        # -vjanelle
+        is_short = true unless @event['client'][field].length > 50
+        client_fields << {
+          title: field,
+          value: @event['client'][field],
+          short: is_short
+        }
+      end
+    end
+
     {
       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
+        color: color,
+        fields: client_fields
       }]
     }.tap do |payload|
       payload[:channel] = slack_channel if slack_channel
@@ -110,4 +149,14 @@ class Slack < Sensu::Handler
   def check_status
     @event['check']['status']
   end
+
+  def translate_status
+    status = {
+      0 => :OK,
+      1 => :WARNING,
+      2 => :CRITICAL,
+      3 => :UNKNOWN
+    }
+    status[check_status.to_i]
+  end
 end

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

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: sensu-plugins-slack
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.3
 platform: ruby
 authors:
 - Sensu-Plugins and contributors
@@ -30,7 +30,7 @@ cert_chain:
   8sHuVruarogxxKPBzlL2is4EUb6oN/RdpGx2l4254+nyR+abg//Ed27Ym0PkB4lk
   HP0m8WSjZmFr109pE/sVsM5jtOCvogyujQOjNVGN4gz1wwPr
   -----END CERTIFICATE-----
-date: 2015-06-04 00:00:00.000000000 Z
+date: 2015-06-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sensu-plugin
@@ -60,6 +60,20 @@ dependencies:
     - - '='
       - !ruby/object:Gem::Version
         version: 1.8.2
+- !ruby/object:Gem::Dependency
+  name: erubis
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: codeclimate-test-reporter
   requirement: !ruby/object:Gem::Requirement
@@ -78,14 +92,14 @@ dependencies:
   name: rubocop
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - '='
       - !ruby/object:Gem::Version
         version: '0.30'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - '='
       - !ruby/object:Gem::Version
         version: '0.30'
 - !ruby/object:Gem::Dependency