notifu 1.6.0 → 1.6.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9364470e12c8804cc66f80ab480218251a1eb7ab
-  data.tar.gz: e97654f25362cb83f20f6d7ac8b9d96f8c3efec4
+  metadata.gz: 854992e5b4ebb8c15056b86c0a3237040af3b8be
+  data.tar.gz: 8328abddbed1e6b6c72f4edc1e3e326c362676ae
 SHA512:
-  metadata.gz: 8fe267fffbe74b86fe8076977beba3fd1b7dd0893dbfda97b548434a49cdf00d5cdfde31b95c691e59f77e10587705bb468116cd0a81a5553156aac5731b7e4c
-  data.tar.gz: b6c714aae5e7e294a47599545dfffec0c5a70356537775e56af2add97b2a5cad9f860dc6535ac7462f9a69c89a6f42f74948daec08a1592ce1ffeb9aa2a0f438
+  metadata.gz: d40c16982b46c70b53e4632f1ae7f625b961a81acef48474c4d254e76ca2a78a829bd2a9cf7061ba82ef6ca6d59a0d750bb79368aeea13e8683d445c2510684f
+  data.tar.gz: ea4b78c0e5eebbc2f914f3eb7dea09f2ca35cb8c16a09650f8a8c00f5bc63ff5b6e3c88ab304a2354ad91b83f2e719e64f3957fe205ce0e2d9dc19744cdccfe5

data/lib/notifu/actors/pagerduty.rb

@@ -9,43 +9,59 @@ module Notifu
       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
+      def post_data(type, service_id)
         {
-          text: self.text,
-          username: "notifu",
-          icon_emoji: self.emoji
-        }.to_json
+          service_key: service_id,
+          event_type: type,
+          description: self.text,
+          incident_key: self.issue.notifu_id,
+          details: {
+            status: self.issue.code.to_state,
+            dc: self.issue.datacenter,
+            host: self.issue.host,
+            service: self.issue.service,
+            message: self.issue.message,
+            first_event: Time.at(self.issue.time_created.to_i),
+          },
+          client: "Sensu",
+          client_url: "#{Notifu::CONFIG[:uchiwa_url]}/#/client/#{self.issue.datacenter}/#{self.issue.host}?check=#{self.issue.service}"
+        }
       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,
-          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,
-          uchiwa_url: "#{Notifu::CONFIG[:uchiwa_url]}/#/client/#{self.issue.datacenter}/#{self.issue.host}?check=#{self.issue.service}"
+          status: self.issue.code.to_state
         })
         ERB.new(self.template).result(data.instance_eval {binding})
       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|
-          Excon.post(Notifu::CONFIG[:actors][:slack][:url],
+          begin
+            c = contact.pagerduty_id
+          rescue
+            c = false
+          end
+
+          Excon.post(Notifu::CONFIG[:actors][:pagerduty][:url],
             tcp_nodelay: true,
             headers: { "ContentType" => "application/json" },
-            body: self.post_data,
+            body: self.post_data(type, c).to_json,
             expects: [ 200 ],
             idempotent: true,
-          )
+          ) if c
         end
       end
 

data/lib/notifu/actors/slack.rb

@@ -9,7 +9,7 @@ module Notifu
       self.desc = "Notifies to Slack channel via Webhook"
       self.retry = 3
 
-      def post_data(rich)
+      def post_data(rich = false)
         return {
           username: "notifu",
           icon_emoji: ":loudspeaker:",
@@ -34,12 +34,12 @@ module Notifu
               ]
             }
           ]
-        }.to_json if rich
-        {
+        } if rich
+        return {
           username: "notifu",
           icon_emoji: ":loudspeaker:",
           text: self.text
-        }.to_json
+        }
       end
 
       def color
@@ -64,10 +64,7 @@ module Notifu
           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,
           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})
@@ -81,14 +78,16 @@ module Notifu
       def act
         self.contacts.each do |contact|
           begin
-            data = { channel: contact.slack_id }.merge(self.post_data(contact.slack_rich))
+            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
           end
+          puts data.to_yaml
           Excon.post(Notifu::CONFIG[:actors][:slack][:url],
             tcp_nodelay: true,
             headers: { "ContentType" => "application/json" },
-            body: data,
+            body: data.to_json,
             expects: [ 200 ],
             idempotent: true
           )

data/lib/notifu/workers/processor.rb

@@ -45,12 +45,12 @@ module Notifu
 
     def perform *args
       t_start = Time.now.to_f*1000.0
-      log "info", "Task start"
+      log "debug", "Task start"
 
       # read event
       self.event = Notifu::Model::Event.new args
       self.now = Time.now
-      log "info", "Processing event NID #{self.event.notifu_id}"
+      log "debug", "Processing event NID #{self.event.notifu_id}"
 
       # try to check if we already know about the issue, otherwise save it into DB as a new one
       self.issue = Notifu::Model::Issue.with(:notifu_id, self.event.notifu_id)
@@ -61,7 +61,7 @@ module Notifu
 
       t_finish = Time.now.to_f*1000.0
 
-      log "info", "Task finish (in #{t_finish-t_start}ms)"
+      log "debug", "Task finish (in #{t_finish-t_start}ms)"
     end
 
 ###################################################################

data/lib/notifu.rb

@@ -7,6 +7,4 @@ require "notifu/util"
 require "notifu/config"
 require "notifu/logger"
 require "notifu/model"
-require "notifu/cli/service"
-require "notifu/cli/object"
 require "notifu/cli"

metadata

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