notifu 1.5.4 → 1.5.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e8704318472d7accf7172d0e3f58b35897b61052
-  data.tar.gz: 4c4be284cdb705f6b60f613b14c3dcfa85feec9d
+  metadata.gz: 891bf686f630e7da27233f067a15204226062373
+  data.tar.gz: 99c6841b45bcfbe93eeb05ba58727f4cc13425bc
 SHA512:
-  metadata.gz: 631757991b3c8662cdadaeb7df9a7408384297f04a2ef36f38b8417ca56747b80001f26f1e19a380b61ca2380032a3b11a38243374c446db192c1b3f69c40c07
-  data.tar.gz: 6dc1ec4e3f218a0d8dbde1164135ee7b3d86ab9b60ea98477faed2c08a08384bf53ce3df80bbeaa37c3b355d6869e339cc5a75c91321f767a49d9738eb8122e2
+  metadata.gz: 93d4fd6775f014e4046d1753465f11016708ba46e011984676669ab149c6b10bfc96822251e607599e1bb729ae0644e9b00bf4e66e168a80c6060f0dd7002dec
+  data.tar.gz: 306d42e62ba6dd27603a7ae5a09c5b76c59fec1ae957642ee3c39f61d47af321ec642bf4e88dae3629b7ad115ff4e8dc44e1f0cbc27ab1dc94203229b2e5bf59

data/lib/notifu/actors/pagerduty.rb

@@ -1,66 +1,53 @@
-# module Notifu
-#   module Actors
-#     class Pagerduty < Notifu::Actor
-#
-#       require 'excon'
-#       require 'erb'
-#
-#       self.name = "pagerduty"
-#       self.desc = "Sends event to pagerduty"
-#       self.retry = 3
-#
-#       def template
-#           "<%= data[:status] %> [<%= data[:host] %>/<%= data[:service] %>]: <%= data[:message] %> (<%= data[:duration] %>) NID:<%= data[:notifu_id] %>]"
-#       end
-#
-#       def post_data
-#         {
-#           text: self.text,
-#           username: "notifu",
-#           icon_emoji: self.emoji
-#         }.to_json
-#       end
-#
-#       def emoji
-#         case self.issue.code
-#         when 0
-#           ":happy_obama:"
-#         when 1
-#           ":sad_obama:"
-#         when 2
-#           ":surprised_obama"
-#         else
-#           ":obama_mic_drop"
-#         end
-#       end
-#
-#       def text
-#         data = OpenStruct.new({
-#           notifu_id: self.issue.notifu_id,
-#           host: self.issue.host,
-#           service: self.issue.service,
-#           message: self.issue.message,
-#           status: self.issue.code.to_state,
-#           first_event: Time.at(self.issue.time_created.to_i),
-#           duration: (Time.now.to_i - self.issue.time_created.to_i).duration,
-#           occurrences_count: self.issue.occurrences_count,
-#           occurrences_trigger: self.issue.occurrences_trigger
-#         })
-#         ERB.new(self.template).result(data.instance_eval {binding})
-#       end
-#
-#       def act
-#         self.contacts.each do |contact|
-#           Excon.post(contact.slack_url,
-#             tcp_nodelay: true,
-#             headers: { "ContentType" => "application/json" },
-#             body: self.post_data,
-#             expects: [ 200 ],
-#             idempotent: true,
-#           )
-#         end
-#       end
-#
-#     end
-#   end
-# end
+module Notifu
+  module Actors
+    class Pagerduty < Notifu::Actor
+
+      require 'excon'
+      require 'erb'
+
+      self.name = "pagerduty"
+      self.desc = "Sends event to pagerduty"
+      self.retry = 3
+
+      def template
+          "<%= data[:status] %> [<%= data[:host] %>/<%= data[:service] %>]: <%= data[:message] %> (<%= data[:duration] %>) NID:<%= data[:notifu_id] %>]"
+      end
+
+      def post_data
+        {
+          text: self.text,
+          username: "notifu",
+          icon_emoji: self.emoji
+        }.to_json
+      end
+
+      def text
+        data = OpenStruct.new({
+          notifu_id: self.issue.notifu_id,
+          host: self.issue.host,
+          service: self.issue.service,
+          message: self.issue.message,
+          status: self.issue.code.to_state,
+          first_event: Time.at(self.issue.time_created.to_i),
+          duration: (Time.now.to_i - self.issue.time_created.to_i).duration,
+          occurrences_count: self.issue.occurrences_count,
+          occurrences_trigger: self.issue.occurrences_trigger
+        })
+        ERB.new(self.template).result(data.instance_eval {binding})
+      end
+
+      def act
+        self.contacts.each do |contact|
+          Excon.post(contact.slack_url,
+            tcp_nodelay: true,
+            headers: { "ContentType" => "application/json" },
+            body: self.post_data,
+            expects: [ 200 ],
+            idempotent: true,
+          )
+        end
+      end
+
+    end
+  end
+end

data/lib/notifu/actors/slack.rb

@@ -9,12 +9,8 @@ module Notifu
       self.desc = "Notifies to Slack channel via Webhook"
       self.retry = 3
 
-      def template
-        "<%= data[:status] %> [<%= data[:host] %>/<%= data[:service] %>]: <%= data[:message] %> (<%= data[:duration] %>) NID:<%= data[:notifu_id] %>]"
-      end
-
-      def post_data
-        {
+      def post_data(rich)
+        return {
           username: "notifu",
           icon_emoji: ":loudspeaker:",
           attachments: [
@@ -22,7 +18,7 @@ module Notifu
               fallback: self.text,
               color: self.color,
               title: "#{self.issue.host} - #{self.issue.service}",
-              title_link: "https://sensu.skypicker.com/#/client/#{Notifu::CONFIG[:actors][:slack][:dc]}/#{self.issue.host}?check=#{self.issue.service}",
+              title_link: "#{Notifu::CONFIG[:uchiwa_url]}/#/client/#{self.issue.datacenter}/#{self.issue.host}?check=#{self.issue.service}",
               text: self.issue.message,
               fields: [
                 {
@@ -38,6 +34,11 @@ module Notifu
               ]
             }
           ]
+        }.to_json if rich
+        {
+          username: "notifu",
+          icon_emoji: ":loudspeaker:",
+          text: self.text
         }.to_json
       end
 
@@ -54,9 +55,11 @@ module Notifu
         end
       end
 
+      # fallback simple message (templated, see below)
       def text
         data = OpenStruct.new({
           notifu_id: self.issue.notifu_id,
+          datacenter: self.issue.datacenter,
           host: self.issue.host,
           service: self.issue.service,
           message: self.issue.message,
@@ -64,17 +67,28 @@ module Notifu
           first_event: Time.at(self.issue.time_created.to_i),
           duration: (Time.now.to_i - self.issue.time_created.to_i).duration,
           occurrences_count: self.issue.occurrences_count,
-          occurrences_trigger: self.issue.occurrences_trigger
+          occurrences_trigger: self.issue.occurrences_trigger,
+          uchiwa_url: "#{Notifu::CONFIG[:uchiwa_url]}/#/client/#{self.issue.datacenter}/#{self.issue.host}?check=#{self.issue.service}"
         })
         ERB.new(self.template).result(data.instance_eval {binding})
       end
 
+      # template for fallback message
+      def template
+        "**<%= data[:status] %>** [<<%= data[:uchiwa_url] %>|<%= data[:datacenter]%>/<%= data[:host] %>/<%= data[:service] %>>]: <%= data[:message] %> (<%= data[:duration] %>)"
+      end
+
       def act
         self.contacts.each do |contact|
+          begin
+            data = { channel: contact.slack_id }.merge(self.post_data(contact.slack_rich))
+          rescue
+            data = self.post_data
+          end
           Excon.post(contact.slack_url,
             tcp_nodelay: true,
             headers: { "ContentType" => "application/json" },
-            body: self.post_data,
+            body: data,
             expects: [ 200 ],
             idempotent: true
           )

data/lib/notifu/config.rb

@@ -3,7 +3,7 @@ module Notifu
 
     attr_reader :config
 
-    @@config_path = "/etc/notifu/"
+    @@config_path = "/etc/notifu/" # FIXME: should be parametrized
 
     def initialize
       begin
@@ -117,4 +117,4 @@ module Notifu
       end
     end
   end
-end
+end

data/lib/notifu/model/contact.rb

@@ -6,8 +6,8 @@ module Notifu
       attribute :full_name
       attribute :cell
       attribute :mail
-      attribute :jabber
-      attribute :slack_url
+      attribute :slack_id
+      attribute :slack_rich
       attribute :pagerduty_url
       index :name
       unique :name

data/lib/notifu/model/event.rb

@@ -3,6 +3,7 @@ module Notifu
     class Event
       include Notifu::Util
       attr_reader :notifu_id
+      attr_reader :datacenter
       attr_reader :host
       attr_reader :address
       attr_reader :service

data/lib/notifu/model/issue.rb

@@ -3,6 +3,7 @@ module Notifu
     class Issue < Ohm::Model
       include Notifu::Util
       attribute :notifu_id
+      attribute :datacenter
       attribute :host
       attribute :address
       attribute :service

data/lib/notifu/sensu/handler.rb

@@ -64,6 +64,7 @@ module Sensu::Extension
 
       payload = {
         notifu_id: notifu_id,
+        datacenter: event[:client][:datacenter] || 'default',
         host: event[:client][:name],
         address: event[:client][:address],
         service: event[:check][:name],

data/lib/notifu/workers/processor.rb

@@ -281,12 +281,11 @@ module Notifu
         path = "silence/#{self.event.host}/#{self.event.service}"
       end
 
-      silenced = false
       get_stashes.each do |stash|
-        silenced = true if stash["path"] == path
+        return true if stash["path"] == path
       end
 
-      return silenced
+      false
     end
 
     def is_ok?
@@ -361,7 +360,7 @@ module Notifu
     def get_stashes
       return @stashes if @stashes
       begin
-        sensu_api = Excon.get "#{self.event.api_endpoint}/stashes"
+        sensu_api = Excon.get("#{self.event.api_endpoint}/stashes", user: Notifu::CONFIG[:sensu_api][:username], password: Notifu::CONFIG[:sensu_api][:password])
         @stashes = JSON.parse sensu_api.body
       rescue
         @stashes = []
@@ -380,7 +379,7 @@ module Notifu
           if stash["expire"] < 0
             if self.event.unsilence
               begin
-                Excon.delete "#{self.event.api_endpoint}/stashes/silence/#{self.event.host}/#{self.event.service}"
+                Excon.delete("#{self.event.api_endpoint}/stashes/silence/#{self.event.host}/#{self.event.service}", user: Notifu::CONFIG[:sensu_api][:username], password: Notifu::CONFIG[:sensu_api][:password])
                 log "info", "Unstashed #{self.event.host}/#{self.event.service} after recovery"
               rescue
                 log "warning", "Failed to fetch stashes from Sensu API: #{self.event.api_endpoint}/stashes"

metadata

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