sensu-plugins-slack 1.3.0 → 1.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5579a23a8858bc8529d481ed4a02ea25f2102c77
-  data.tar.gz: 7dd114c35c39b4aa2ce84d9cac6a8a8f3b0b1b56
+  metadata.gz: 0898d7f8bf6098fa616bc6cca6c84767b2b7c396
+  data.tar.gz: 0c4b6d37a6e734c558fbb6d221de05184a708cac
 SHA512:
-  metadata.gz: 1cf0939e2b68fb1db386ffe53d89259694c471e8553f804fd7782b6ce0eaaa0297a1d4e83b0729048cecec027ba4f5b4702b130a9e8d1070f26ad85af1953c48
-  data.tar.gz: a70ba0e606b325f8b093db76319902b66ee6a5390ee3233e4ad6a8d8b5c24934fe509a98de74b69191ffbf1537282dec33defb3ff0c5511e7de4968d22bdb7bf
+  metadata.gz: 36d283b289b924ce4c22c1e722e3df728eadc23de79f478867579da11b196c3f2ee883a40e7ad73f35c72b70465b276f285b03f928c37b6a46793b1901ad365e
+  data.tar.gz: c054fe9cae7cc838032fb13ec3736829d9a6e863bb3c885a7f8813ccaddd5d2c6ddd1d80095cc09d222878c5b7400c63e9195c26d6486d03d8e2626ebe3425b4

data/CHANGELOG.md

@@ -5,6 +5,10 @@ This CHANGELOG follows the format listed at [Keep A Changelog](http://keepachang
 
 ## [Unreleased]
 
+## [1.4.0] - 2017-07-24
+### Added
+- `slack-handler-multichannel.rb`: Added support for client-defined channel overrides (@fildred13)
+
 ## [1.3.0] - 2017-07-19
 ### Added
 - `slack-handler-multichannel.rb`: Added support for `icon_emoji` option, which documentation already suggested was supported (@fildred13)

data/bin/handler-slack-multichannel.rb

@@ -16,30 +16,45 @@
 #
 # Default channels and compulsory channels can be set in the handler config:
 #
-# { "handlers":
+# { "handlers": {
 #     "slack": {
 #       "channels" {
 #         "default": [ "#no-team-alerts" ],
 #         "compulsory": [ "#all-alerts" ],
 #        }
-#     }
+#     },
+#     ...,
+#   }
 # }
 #
 # Alerts are always sent to the compulsory channel(s).
 #
 # Alerts are sent to default channels if no channels are configured
-# in the check config.
+# in the client config or check config.
+#
+# If channels are defined on the client, they will override the defaults:
+#
+# { "client":{
+#     "name": "Appserver"
+#     "slack" {
+#       "channels" [ "#appserver-team-alerts" ]
+#     },
+#     ...,
+#   }
+# }
 #
-# Check specific channels:
+# If channels are defined on a check, they will override anything defined on
+# the client or the defaults:
 #
-# { "checks":
+# { "checks": {
 #     "check_my_db": {
 #       "handlers": [ "default", "slack" ],
 #       "slack" {
 #         "channels" [ "#db-team-alerts" ]
-#       }
+#       },
 #       ...,
 #     }
+#   }
 # }
 #
 # Custom Field support added:
@@ -132,6 +147,12 @@ class Slack < Sensu::Handler
     return false
   end
 
+  def client_configured_channels
+    return @event['client']['slack']['channels']
+  rescue
+    return false
+  end
+
   def custom_field
     get_setting('custom_field')
   end
@@ -142,6 +163,9 @@ class Slack < Sensu::Handler
     if check_configured_channels
       channels = check_configured_channels
       puts "using check configured channels: #{channels.join('.').chomp(',')}"
+    elsif client_configured_channels
+      channels = client_configured_channels
+      puts "using client configured channels: #{channels.join('.').chomp(',')}"
     else
       channels = default_channels
       puts "using check default channels: #{default_channels.join(',').chomp(',')}"

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

@@ -1,7 +1,7 @@
 module SensuPluginsSlack
   module Version
     MAJOR = 1
-    MINOR = 3
+    MINOR = 4
     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.3.0
+  version: 1.4.0
 platform: ruby
 authors:
 - Sensu-Plugins and contributors
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-07-20 00:00:00.000000000 Z
+date: 2017-07-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: erubis