notifu 1.6.1 → 1.6.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 854992e5b4ebb8c15056b86c0a3237040af3b8be
-  data.tar.gz: 8328abddbed1e6b6c72f4edc1e3e326c362676ae
+  metadata.gz: 5b69631e3ea0fbdbb5e28b4b39fd1de5a8d5d491
+  data.tar.gz: 589bb9be936d20b9a6766220bbb8dafd93d38503
 SHA512:
-  metadata.gz: d40c16982b46c70b53e4632f1ae7f625b961a81acef48474c4d254e76ca2a78a829bd2a9cf7061ba82ef6ca6d59a0d750bb79368aeea13e8683d445c2510684f
-  data.tar.gz: ea4b78c0e5eebbc2f914f3eb7dea09f2ca35cb8c16a09650f8a8c00f5bc63ff5b6e3c88ab304a2354ad91b83f2e719e64f3957fe205ce0e2d9dc19744cdccfe5
+  metadata.gz: f7b97cb854bb4eab2c9a637bcba5de2e2812e106ba0331af16d39ce343a2f8dbd9567319484c20eb3c7bfc49cfc654bfe1123019d6f5b5e79b4bf4d5f8e70943
+  data.tar.gz: 81da4b166bff5f063ac9761d920c1e2d8e78c95dc2cd627b3d91372ac7d644d4e0e87467fe1eef34cff6ee6a0995ebd1613abd67f00a33aedf1fa42a1d85d969

data/lib/notifu/actors/slack.rb

@@ -15,7 +15,7 @@ module Notifu
           icon_emoji: ":loudspeaker:",
           attachments: [
             {
-              fallback: self.text,
+              fallback: self.text(self.fallback_template),
               color: self.color,
               title: "#{self.issue.host} - #{self.issue.service}",
               title_link: "#{Notifu::CONFIG[:uchiwa_url]}/#/client/#{self.issue.datacenter}/#{self.issue.host}?check=#{self.issue.service}",
@@ -38,7 +38,7 @@ module Notifu
         return {
           username: "notifu",
           icon_emoji: ":loudspeaker:",
-          text: self.text
+          text: self.text(self.template)
         }
       end
 
@@ -55,24 +55,53 @@ module Notifu
         end
       end
 
+      def status_icon
+        return @status_icon if defined? @status_icon
+        case self.issue.code.to_i
+        when 0
+          @status_icon = ":white_check_mark:"
+        when 1
+          @status_icon = ":exclamation:"
+        when 2
+          @status_icon = ":bangbang:"
+        else
+          @status_icon = ":question: _#{self.issue.code.to_s}_"
+        end
+        @status_icon
+      end
+
+      def service_icon
+        return @service_icon if defined? @service_icon
+        @service_icon = ":computer:" if self.issue.service == "keepalive"
+        @service_icon ||= ":gear:"
+      end
+
       # fallback simple message (templated, see below)
-      def text
-        data = OpenStruct.new({
+      def text(tmpl)
+        @tmpl_struct ||= OpenStruct.new({
           notifu_id: self.issue.notifu_id,
           datacenter: self.issue.datacenter,
           host: self.issue.host,
+          address: self.issue.address,
           service: self.issue.service,
           message: self.issue.message,
           status: self.issue.code.to_state,
           duration: (Time.now.to_i - self.issue.time_created.to_i).duration,
-          uchiwa_url: "#{Notifu::CONFIG[:uchiwa_url]}/#/client/#{self.issue.datacenter}/#{self.issue.host}?check=#{self.issue.service}"
+          uchiwa_url: "#{Notifu::CONFIG[:uchiwa_url]}/#/client/#{self.issue.datacenter}/#{self.issue.host}?check=#{self.issue.service}",
+          service_icon: self.service_icon,
+          status_icon: self.status_icon
         })
-        ERB.new(self.template).result(data.instance_eval {binding})
+        ERB.new(tmpl).result(@tmpl_struct.instance_eval {binding})
       end
 
       # template for fallback message
+      def fallback_template
+        "*<%= data[:status] %>* <%= data[:datacenter]%> <%= data[:host] %> <%= data[:service] %> - <%= data[:message] %> (<%= data[:duration] %>) <%= data[:uchiwa_url] %>"
+      end
+
+      # template for plain message
       def template
-        "**<%= data[:status] %>** [<<%= data[:uchiwa_url] %>|<%= data[:datacenter]%>/<%= data[:host] %>/<%= data[:service] %>>]: <%= data[:message] %> (<%= data[:duration] %>)"
+        "<%= data[:status_icon] %> *<<%= data[:uchiwa_url] %>|<%= data[:datacenter] %>/<%= data[:host] %>>* <%= data[:address] %> <%= data[:service_icon] %> *<%= data[:service] %>* - <%= data[:message] %> _<%= data[:duration] %>_"
       end
 
       def act

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: notifu
 version: !ruby/object:Gem::Version
-  version: 1.6.1
+  version: 1.6.2
 platform: ruby
 authors:
 - Radek 'blufor' Slavicinsky
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-01-12 00:00:00.000000000 Z
+date: 2017-01-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor