sensu-plugins-slack 0.1.0 → 0.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: fa3ad254dff9a4bdacf22ac50e4c1bef87910fb4
-  data.tar.gz: 7b09d2c2e40e949f9248c4b72b9818849a48d7a9
+  metadata.gz: d392b6780809c43dab85d04edde9c41e03d2da58
+  data.tar.gz: 3a42635cb3a3092876ce42217255e53058c70ac2
 SHA512:
-  metadata.gz: 8aa5e19e94ce77ee7dad46b0609d57acdaade31620cd95b56ce9591261823590dcc5d72ef752f179faabf3c20edcc597d07b956b975afbac79612c2d58698a9b
-  data.tar.gz: 53ca73e8bc885a05f6336b64aad8650f07bdaa1f32b40e9139b36fe32cd9ceeb2dec7344e442a028cf5a747c2ecc3d713621dc5a3ec3df9ee15efcfa20ec513f
+  metadata.gz: 533086cf8ebef42a623881de58d4afa928907cdaf041b7dd165e43decedae0bad09f5230e74185e24e3cfbb5b9abb5607a0f64745cbd3a608587b4969a3b1511
+  data.tar.gz: 21a3683747c1e22f1cc082ae73e62ffe584dc2b6d524b25e27bb0ed627c9eb016fb38e4273b172aa4ad693d52a2ac52d1a8f88be0fc581ba786d61dbe6725aac

data/CHANGELOG.md

@@ -5,6 +5,13 @@ This CHANGELOG follows the format listed at [Keep A Changelog](http://keepachang
 
 ## Unreleased
 
+## [0.1.1] - 2015-12-09
+### Changed
+- Slack handler posts JSON content type and format to slack.
+- Slack config supports icon_url and icon_emoji
+### Added
+- add arguments to specify proxy settings
+
 ## [0.1.0] - 2015-11-12
 ### Added
 - New handler-slack-multichannel.rb handler for more complex multi-channel alerting to Slack

data/README.md

@@ -23,6 +23,12 @@
     "surround": "optional - can be used for bold(*), italics(_), code(`) and preformatted(```)",
     "bot_name": "optional bot name, defaults to slack defined",
     "template": "/some/path/to/template.erb",
+    "proxy_address": "The HTTP proxy address (example: proxy.example.com)"
+    "proxy_port": "The HTTP proxy port (if there is a proxy)"
+    "proxy_username": "The HTTP proxy username (if there is a proxy)"
+    "proxy_password": "The HTTP proxy user password (if there is a proxy)"
+    "icon_url": "http://sensuapp.org/img/sensu_logo_large-c92d73db.png"
+    "icon_emoji": ":snowman:"
     "fields": [
       "list",
       "of",

data/bin/handler-slack.rb

@@ -26,6 +26,14 @@ class Slack < Sensu::Handler
     get_setting('webhook_url')
   end
 
+  def slack_icon_emoji
+    get_setting('icon_emoji')
+  end
+
+  def slack_icon_url
+    get_setting('icon_url')
+  end
+
   def slack_channel
     @event['client']['slack_channel'] || @event['check']['slack_channel'] || get_setting('channel')
   end
@@ -50,6 +58,22 @@ class Slack < Sensu::Handler
     get_setting('fields')
   end
 
+  def proxy_address
+    get_setting('proxy_address')
+  end
+
+  def proxy_port
+    get_setting('proxy_port')
+  end
+
+  def proxy_username
+    get_setting('proxy_username')
+  end
+
+  def proxy_password
+    get_setting('proxy_password')
+  end
+
   def incident_key
     @event['client']['name'] + '/' + @event['check']['name']
   end
@@ -69,7 +93,7 @@ class Slack < Sensu::Handler
     else
       template = '''<%=
       [
-        @event["check"]["output"],
+        @event["check"]["output"].gsub(\'"\', \'\\"\'),
         @event["client"]["address"],
         @event["client"]["subscriptions"].join(",")
       ].join(" : ")
@@ -82,12 +106,17 @@ class Slack < Sensu::Handler
 
   def post_data(notice)
     uri = URI(slack_webhook_url)
-    http = Net::HTTP.new(uri.host, uri.port)
+    http = if proxy_address.nil?
+             Net::HTTP.new(uri.host, uri.port)
+           else
+             Net::HTTP::Proxy(proxy_address, proxy_port, proxy_username, proxy_password).new(uri.host, uri.port)
+           end
     http.use_ssl = true
 
-    req = Net::HTTP::Post.new("#{uri.path}?#{uri.query}")
+    req = Net::HTTP::Post.new("#{uri.path}?#{uri.query}", 'Content-Type' => 'application/json')
     text = slack_surround ? slack_surround + notice + slack_surround : notice
-    req.body = "payload=#{payload(text).to_json}"
+
+    req.body = payload(text).to_json
 
     response = http.request(req)
     verify_response(response)
@@ -119,7 +148,7 @@ class Slack < Sensu::Handler
     end
 
     {
-      icon_url: 'http://sensuapp.org/img/sensu_logo_large-c92d73db.png',
+      icon_url: slack_icon_url ? slack_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(' '),
@@ -129,6 +158,7 @@ class Slack < Sensu::Handler
     }.tap do |payload|
       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
     end
   end
 

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

@@ -2,7 +2,7 @@ module SensuPluginsSlack
   module Version
     MAJOR = 0
     MINOR = 1
-    PATCH = 0
+    PATCH = 1
 
     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.1.0
+  version: 0.1.1
 platform: ruby
 authors:
 - Sensu-Plugins and contributors
@@ -30,7 +30,7 @@ cert_chain:
   8sHuVruarogxxKPBzlL2is4EUb6oN/RdpGx2l4254+nyR+abg//Ed27Ym0PkB4lk
   HP0m8WSjZmFr109pE/sVsM5jtOCvogyujQOjNVGN4gz1wwPr
   -----END CERTIFICATE-----
-date: 2015-11-13 00:00:00.000000000 Z
+date: 2015-12-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: erubis