notifu 1.6.3 → 1.6.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4854010e7da3616c5a97453edc92f874bee9e45f
-  data.tar.gz: df68b5961047d135c801ae52905a5c16773ecb2a
+  metadata.gz: 3675e110c2b3899f1cb8a54bab95fc452b42eba6
+  data.tar.gz: 540012ec1cd765b36e8cfe390fa5528fe8f15032
 SHA512:
-  metadata.gz: e2bb261159095a91c8a61581827d9b440b8080c1bcbc45a0a0c4ef04f99fd0e4b9ce4827b20e99c8e0271456e3193b53a9ea86c85ddec0a022e2d7551422ccb9
-  data.tar.gz: 2e097437c9acd94cb1589235697af481300ef7e26f76e293cab3851e17616a2f5bffc659aba9a2d1cb8737b8c87d951a9539e04f08345584ab87d545503d305a
+  metadata.gz: 902f012ad82d980285c8f010bbf508ba1963f1ef03c835aa585324a201b14e788367c8e7b847bf2961350c9c4882a5720fe8d9d7fd5121a22282c627b48fdf4f
+  data.tar.gz: f8b27fa397401295ffad30e762a1b4d9ee519f6d85b24b2b38242c41a70198768f7816897660c3ce0e3ec77b44ecd4426407b85233286b2d802b17d92aebefb8

data/lib/notifu/actors/gammu_sms_bridge.rb

@@ -7,24 +7,11 @@ module Notifu
       self.retry = 3
 
       def act
-        data = OpenStruct.new({
-          notifu_id: self.issue.notifu_id,
-          host: self.issue.host,
-          message: self.issue.message,
-          service: self.issue.service,
-          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
-        })
-        message = ERB.new(self.template).result(data.instance_eval {binding})
-
         self.contacts.each do |contact|
           cell = contact.cell
-          template = ERB.new File.new("sms.erb").read, nil, "%"
-          message = "template.result(self.issue)"
-
+          tmpl = contact.sms_template
+          tmpl ||= default_template
+          message = self.apply_template tmpl
           # send message to sms-bridge
           socket = TCPSocket.new Notifu::CONFIG[:actors][:gammu_sms_bridge][:host], Notifu::CONFIG[:actors][:gammu_sms_bridge][port]
           socket.send contact.cell.to_s + "--" + message
@@ -33,9 +20,6 @@ module Notifu
         end
       end
 
-      def template
-          "<%= data[:status] %> [<%= data[:host] %>/<%= data[:service] %>]: (<%= data[:message] %>) <%= data[:duration] %> [<%= data[:notifu_id] %>]"
-      end
     end
   end
-end
+end

data/lib/notifu/actors/pagerduty.rb

@@ -3,7 +3,6 @@ module Notifu
     class Pagerduty < Notifu::Actor
 
       require 'excon'
-      require 'erb'
 
       self.name = "pagerduty"
       self.desc = "Sends event to pagerduty"
@@ -16,11 +15,12 @@ module Notifu
           description: self.text,
           incident_key: self.issue.notifu_id,
           details: {
-            status: self.issue.code.to_state,
-            dc: 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,
+            datacenter: self.issue.datacenter,
             first_event: Time.at(self.issue.time_created.to_i),
           },
           client: "Sensu",
@@ -28,40 +28,31 @@ module Notifu
         }
       end
 
-      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,
-          status: self.issue.code.to_state
-        })
-        ERB.new(self.template).result(data.instance_eval {binding})
+      def text(c)
+        t = c.pagerduty_template
+        t ||= self.default_template
+        self.apply_template t
       end
 
-      def template
-        "<%= data[:status] %> [<%= data[:datacenter] %>/<%= data[:host] %>/<%= data[:service] %>]: <%= data[:message] %>"
-      end
 
       def act
         type = "resolve" if self.issue.code.to_i == 0
         type ||= "trigger"
 
         self.contacts.each do |contact|
+          contact.pagerduty_id || next
+
           begin
-            c = contact.pagerduty_id
-          rescue
-            c = false
+            Excon.post(Notifu::CONFIG[:actors][:pagerduty][:url],
+              tcp_nodelay: true,
+              headers: { "ContentType" => "application/json" },
+              body: self.post_data(type, c).to_json,
+              expects: [ 200 ],
+              idempotent: true,
+            )
+          rescue Exception => e
+            log "error", "Failed to send event to PagerDuty - #{e.class}: #{e.message}"
           end
-
-          Excon.post(Notifu::CONFIG[:actors][:pagerduty][:url],
-            tcp_nodelay: true,
-            headers: { "ContentType" => "application/json" },
-            body: self.post_data(type, c).to_json,
-            expects: [ 200 ],
-            idempotent: true,
-          ) if c
         end
       end
 

data/lib/notifu/actors/slack.rb

@@ -3,19 +3,18 @@ module Notifu
     class Slack < Notifu::Actor
 
       require 'excon'
-      require 'erb'
 
       self.name = "slack"
       self.desc = "Notifies to Slack channel via Webhook"
       self.retry = 3
 
-      def post_data(rich = false)
+      def post_data(template, rich)
         return {
           username: "notifu",
           icon_emoji: ":loudspeaker:",
           attachments: [
             {
-              fallback: self.text(self.fallback_template),
+              fallback: self.apply_template(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}",
@@ -34,14 +33,27 @@ module Notifu
               ]
             }
           ]
-        } if rich
-        return {
-          username: "notifu",
-          icon_emoji: ":loudspeaker:",
-          text: self.text(self.template)
-        }
+        } if rich != nil
+
+        template ||= self.default_template
+        return { username: "notifu", icon_emoji: ":loudspeaker:", text: self.text }
+      end
+
+      def text(c)
+        t = c.slack_template
+        t ||= self.default_template
+        self.apply_template t
+      end
+
+      def default_template
+        "#{self.status_icon} *<<%= uchiwa_url %>|<%= datacenter %>/<%= host %>>* <%= address %> #{self.service_icon} *<%= service %>* - <%= message %> _<%= duration %>_"
+      end
+
+      def fallback_template
+        "<%= status %> | <%= datacenter%>/<%= host %>/<%= service %> - <%= message %>"
       end
 
+
       def color
         case self.issue.code.to_i
         when 0
@@ -76,50 +88,25 @@ module Notifu
         @service_icon ||= ":gear:"
       end
 
-      # fallback simple message (templated, see below)
-      def text(tmpl)
-        data = 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}",
-          service_icon: self.service_icon,
-          status_icon: self.status_icon
-        })
-        ERB.new(tmpl).result(data.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_icon] %> *<<%= data[:uchiwa_url] %>|<%= data[:datacenter] %>/<%= data[:host] %>>* <%= data[:address] %> <%= data[:service_icon] %> *<%= data[:service] %>* - <%= data[:message] %> _<%= data[:duration] %>_"
-      end
-
       def act
         self.contacts.each do |contact|
+          if contact.slack_id != nil
+            data = self.post_data(contact.slack_template, contact.slack_rich).merge({ channel: contact.slack_id })
+          else
+            data = self.post_data(contact.slack_template, contact.slack_rich)
+          end
+
           begin
-            data = { channel: contact.slack_id }.merge(self.post_data(contact.slack_rich)) if contact.slack_rich
-            data ||= { channel: contact.slack_id }.merge(self.post_data)
-          rescue
-            data = self.post_data
+            Excon.post(Notifu::CONFIG[:actors][:slack][:url],
+              tcp_nodelay: true,
+              headers: { "ContentType" => "application/json" },
+              body: data.to_json,
+              expects: [ 200 ],
+              idempotent: true
+            )
+          rescue Exception => e
+            log "error", "Failed to send message to Slack - #{e.class}: #{e.message}"
           end
-          puts data.to_yaml
-          Excon.post(Notifu::CONFIG[:actors][:slack][:url],
-            tcp_nodelay: true,
-            headers: { "ContentType" => "application/json" },
-            body: data.to_json,
-            expects: [ 200 ],
-            idempotent: true
-          )
         end
       end
 

data/lib/notifu/actors/smtp.rb

@@ -2,7 +2,6 @@ module Notifu
   module Actors
     class Smtp < Notifu::Actor
 
-      require 'ostruct'
       require 'mail'
 
       self.name = "smtp"
@@ -10,23 +9,12 @@ module Notifu
       self.retry = 2
 
       def act
-        data = OpenStruct.new({
-          notifu_id: self.issue.notifu_id,
-          host: self.issue.host,
-          message: self.issue.message,
-          service: self.issue.service,
-          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
-        })
         contacts = self.contacts.map { |contact| "#{contact.full_name} <#{contact.mail}>"}
-        text_message = ERB.new(self.text_template).result(data.instance_eval {binding})
-        html_message = ERB.new(self.html_template).result(data.instance_eval {binding})
+        text_message = self.apply_template(self.text_template)
+        html_message = self.apply_template(self.html_template)
         mail = Mail.new do
           from Notifu::CONFIG[:actors][:smtp][:from]
-          subject "#{data[:status]}/#{data[:host]}/#{data[:service]}"
+          subject "#{self.issue.code.to_state]}: #{self.issue.host]}/#{self.issue.service]}"
           to contacts
           text_part do
             body text_message
@@ -42,32 +30,32 @@ module Notifu
 
       def text_template
         %{
-<%= data[:message] %>
-
-Notifu ID: <%= data[:notifu_id] %>
-Host: <%= data[:host] %>
-Service: <%= data[:service] %>
-Status: <%= data[:status] %>
-First event: <%= Time.at(data[:first_event]).to_s %>
-Duration: <%= data[:duration] %>
-Occurences: <%= data[:occurrences_count] %>/<%= data[:occurrences_trigger] %> (occured/trigger)
+<%= message %>
+
+Notifu ID: <%= notifu_id %>
+Host: <%= host %>
+Service: <%= service %>
+Status: <%= status %>
+First event: <%= Time.at(first_event).to_s %>
+Duration: <%= duration %>
+Occurences: <%= occurrences_count %>/<%= occurrences_trigger %> (occured/trigger)
 }
       end
 
       def html_template
         %{
-<h3><%= data[:message] %></h3><br/>
-
-<strong>Notifu ID: </strong><%= data[:notifu_id] %><br/>
-<strong>Host: </strong><%= data[:host] %><br/>
-<strong>Service: </strong><%= data[:service] %><br/>
-<strong>Status: </strong><%= data[:status] %><br/>
-<strong>First event: </strong><%= Time.at(data[:first_event]).to_s %><br/>
-<strong>Duration: </strong><%= data[:duration] %><br/>
-<strong>Occurences: </strong><%= data[:occurrences_count] %>/<%= data[:occurrences_trigger] %> (occured/trigger)<br/>
+<h3><%= message %></h3><br/>
+
+<strong>Notifu ID: </strong><%= notifu_id %><br/>
+<strong>Host: </strong><%= host %><br/>
+<strong>Service: </strong><%= service %><br/>
+<strong>Status: </strong><%= status %><br/>
+<strong>First event: </strong><%= Time.at(first_event).to_s %><br/>
+<strong>Duration: </strong><%= duration %><br/>
+<strong>Occurences: </strong><%= occurrences_count %>/<%= occurrences_trigger %> (occured/trigger)<br/>
 }
       end
 
     end
   end
-end
+end

data/lib/notifu/actors/stdout.rb

@@ -3,14 +3,13 @@ module Notifu
     class Stdout < Notifu::Actor
 
       self.name = "stdout"
-      self.desc = "STDOUT notifier, useful for debug only"
+      self.desc = "STDOUT notifier, useful for testing"
       self.retry = 0
 
       def act
-        puts self.issue.to_yaml
-        puts self.contacts.to_yaml
+        puts self.apply_template(self.default_template)
       end
 
     end
   end
-end
+end

data/lib/notifu/actors/twilio_call.rb

@@ -3,7 +3,6 @@ module Notifu
     class TwilioCall < Notifu::Actor
 
       require 'excon'
-      require 'erb'
 
       self.name = "twilio_call"
       self.desc = "POST requst to trigger phone-call"

data/lib/notifu/mixins.rb

@@ -13,9 +13,9 @@ class Numeric
     days  = hours / 24
 
     if days > 0
-      "#{days}d, #{hours % 24}h"
+      "#{days}d, #{hours % 24}h, #{mins % 60}min, #{secs % 60}s"
     elsif hours > 0
-      "#{hours}h, #{mins % 60}min"
+      "#{hours}h, #{mins % 60}min, #{secs % 60}s"
     elsif mins > 0
       "#{mins}min, #{secs % 60}s"
     elsif secs >= 0

data/lib/notifu/model/contact.rb

@@ -6,9 +6,12 @@ module Notifu
       attribute :full_name
       attribute :cell
       attribute :mail
+      attribute :pagerduty_id
+      attribute :pagerduty_template
       attribute :slack_id
       attribute :slack_rich
-      attribute :pagerduty_id
+      attribute :slack_template
+      attribute :sms_template
       index :name
       unique :name
 

data/lib/notifu/util.rb

@@ -5,5 +5,14 @@ module Notifu
       self.instance_variable_set args.keys.first, args.values.first
     end
 
+    def self.log(prio, msg)
+      $logger.log prio, "JID-#{self.jid}: " + msg.to_s
+    end
+
+    def self.action_log event(worker)
+      $logger.action_log worker, event
+    end
+
+
   end
 end

data/lib/notifu/workers/actor.rb

@@ -21,6 +21,9 @@ module Notifu
     include Notifu::Util
     include Sidekiq::Worker
 
+    require 'erb'
+    require 'ostruct'
+
     attr_accessor :issue
     attr_accessor :contacts
 
@@ -41,14 +44,53 @@ module Notifu
     sidekiq_options :retry => self.retry
 
     def perform *args
-      sleep 2
-      load_data args
+      sleep 1
+      load_data args || return
       act
     end
 
     def load_data args
       self.issue = Notifu::Model::Issue.with(:notifu_id, args[0])
-      self.contacts = args[1].map { |contact| Notifu::Model::Contact.with(:name, contact) }
+      if self.issue == nil
+        log "error", "Issue with NID #{args[0]} doesn't exist!"
+        return false
+      end
+      self.contacts = Array.new
+      args[1].each do |contact|
+        c = Notifu::Model::Contact.with(:name, contact)
+        self.contacts << c if c
+      end
+      return true
+    end
+
+    def apply_template t
+      @data ||= OpenStruct.new({
+        notifu_id: self.issue.notifu_id,
+        datacenter: self.issue.datacenter,
+        host: self.issue.host,
+        service: self.issue.service,
+        status: self.issue.code.to_state,
+        code: self.issue.code.to_s,
+        message: self.issue.message,
+        first_event: Time.at(self.issue.time_created.to_i),
+        duration: (Time.now.to_i - self.issue.time_created.to_i).duration,
+        interval: self.issue.interval.duration,
+        refresh: self.issue.refresh.duration,
+        occurrences_count: self.issue.occurrences_count,
+        occurrences_trigger: self.issue.occurrences_trigger,
+        uchiwa_url: "#{Notifu::CONFIG[:uchiwa_url]}/#/client/#{self.issue.datacenter}/#{self.issue.host}?check=#{self.issue.service}",
+        playbook: self.issue.playbook
+      })
+      begin
+        ERB.new(t).result(@data.instance_eval { binding })
+      rescue Exception => e
+        log "error", "Failed to render ERB template - #{e.class}: #{e.message}"
+        ERB.new(default_template).result(@data.instance_eval {binding})
+      end
+    end
+
+    def default_template
+      "<%= status %> [<%= dc %>/<%= host %>/<%= service %>]: (<%= message %>) <%= duration %> [<%= notifu_id %>]"
     end
 
   end

data/lib/notifu/workers/processor.rb

@@ -170,7 +170,7 @@ module Notifu
           :"@timestamp" => self.now.iso8601,
         }
 
-        action_log action_log_message
+        action_log "processor", action_log_message
 
       end
 
@@ -365,7 +365,7 @@ module Notifu
         sensu_api = Excon.get("#{self.event.api_endpoint}/silenced", user: Notifu::CONFIG[:sensu_api][:username], password: Notifu::CONFIG[:sensu_api][:password])
         return JSON.parse sensu_api.body
       rescue Exception => e
-        log "error", "Failed to get stashes #{self.event.api_endpoint}/stashes (#{e.message})"
+        log "error", "Failed to get stashes - GET #{self.event.api_endpoint}/stashes (#{e.message})"
         return []
       end
     end
@@ -382,33 +382,23 @@ module Notifu
             if self.event.unsilence
               begin
                 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"
+                log "info", "Unsilenced #{self.event.host}/#{self.event.service} after recovery"
+              rescue Exception => e
+                log "warning", "Failed to unsilence - DELETE #{self.event.api_endpoint}/stashes/silence/#{self.event.host}/#{self.event.service} (#{e.message})"
               end
             else
-              log "info", "#{self.event.host}/#{self.event.service} left stashed (auto-unstash disabled)"
+              log "info", "#{self.event.host}/#{self.event.service} left silenced (auto-unsilence disabled)"
             end
           else
-            log "info", "#{self.event.host}/#{self.event.service} left stashed (auto-unstash doesn't work on checks with defined expiry)"
+            log "info", "#{self.event.host}/#{self.event.service} left silenced (auto-unsilence doesn't work when TTL is defined)"
           end
         end
       end
     end
 
-    ##
-    # logging method
-    #
-    def log(prio, msg)
-      $logger.log prio, "JID-#{self.jid}: " + msg.to_s
-    end
-
     ##
     # action logging method
     #
-    def action_log event
-      $logger.action_log "processor", event
-    end
 
   end
 end
@@ -437,9 +427,5 @@ module Notifu
       end
     end
 
-    def log(prio, msg)
-      $logger.log prio, "JID-#{self.jid}: " + msg.to_s
-    end
-
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: notifu
 version: !ruby/object:Gem::Version
-  version: 1.6.3
+  version: 1.6.4
 platform: ruby
 authors:
 - Radek 'blufor' Slavicinsky