notifu 1.5.7 → 1.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 430135e0520fe3009d65af3a7f52e3113c88c8c7
-  data.tar.gz: 962b2ee3c40d65e3b255c992cb2837124bdf1580
+  metadata.gz: 9364470e12c8804cc66f80ab480218251a1eb7ab
+  data.tar.gz: e97654f25362cb83f20f6d7ac8b9d96f8c3efec4
 SHA512:
-  metadata.gz: 7c955f1a0c6b575d53ffe31dabd042d1974d2b3b43698b2ba4f5f0c82bcfdda96f53923b5a69184555767a1c570b00465f5ff73d55228054d68ca8eb45d1465c
-  data.tar.gz: 912bf319e15d9d43f6409653504cb1eb59202f395c35e97514c88e21079caf7db3ec05420a4df7ffbb9e9ff520108934f4c49b2815817e17e9c3e78f1c2eea76
+  metadata.gz: 8fe267fffbe74b86fe8076977beba3fd1b7dd0893dbfda97b548434a49cdf00d5cdfde31b95c691e59f77e10587705bb468116cd0a81a5553156aac5731b7e4c
+  data.tar.gz: b6c714aae5e7e294a47599545dfffec0c5a70356537775e56af2add97b2a5cad9f860dc6535ac7462f9a69c89a6f42f74948daec08a1592ce1ffeb9aa2a0f438

data/bin/notifu

@@ -1,15 +1,11 @@
 #!/usr/bin/env ruby
 
-path = File.symlink?(__FILE__) ? File.readlink(__FILE__) : __FILE__
-$basepath = '/' + File.dirname(path).split('/')[1..-2].join('/') + '/lib/notifu/'
-$actorpath = $basepath + "actors/"
-# $sidekiq_bin = $basepath.sub(/app\//, '') + ".rvm/wrappers/notifu/sidekiq"
-$sidekiq_bin = "sidekiq"
-
 require 'notifu'
 
-Notifu::CONFIG = Notifu::Config.new.get
+$basepath = Gem::Specification.find_by_name('notifu').gem_dir + '/lib/notifu/'
+$actorpath = $basepath + "actors/"
+$sidekiq_bin = Gem.bin_path('sidekiq', 'sidekiq')
 
+Notifu::CONFIG = Notifu::Config.new.get
 Ohm.redis = Redic.new Notifu::CONFIG[:redis_data]
-
 Notifu::CLI::Root.start(ARGV)

data/lib/notifu/actors/pagerduty.rb

@@ -10,7 +10,7 @@ module Notifu
       self.retry = 3
 
       def template
-          "<%= data[:status] %> [<%= data[:host] %>/<%= data[:service] %>]: <%= data[:message] %> (<%= data[:duration] %>) NID:<%= data[:notifu_id] %>]"
+        "<%= data[:status] %> [<%= data[:host] %>/<%= data[:service] %>]: <%= data[:message] %> (<%= data[:duration] %>) NID:<%= data[:notifu_id] %>]"
       end
 
       def post_data
@@ -31,14 +31,15 @@ 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
 
       def act
         self.contacts.each do |contact|
-          Excon.post(contact.slack_url,
+          Excon.post(Notifu::CONFIG[:actors][:slack][:url],
             tcp_nodelay: true,
             headers: { "ContentType" => "application/json" },
             body: self.post_data,

data/lib/notifu/cli.rb

@@ -1,3 +1,6 @@
+require "notifu/cli/service"
+require "notifu/cli/object"
+
 module Notifu
   module CLI
     class Root < Thor
@@ -10,4 +13,4 @@ module Notifu
       subcommand "service", Service
     end
   end
-end
+end

data/lib/notifu/model/contact.rb

@@ -8,7 +8,7 @@ module Notifu
       attribute :mail
       attribute :slack_id
       attribute :slack_rich
-      attribute :pagerduty_url
+      attribute :pagerduty_id
       index :name
       unique :name
 

data/lib/notifu/model/event.rb

@@ -18,6 +18,7 @@ module Notifu
       attr_reader :code
       attr_reader :aspiring_code
       attr_reader :message
+      attr_reader :playbook
       attr_reader :api_endpoint
       attr_reader :duration
       attr_reader :unsilence

data/lib/notifu/model/issue.rb

@@ -19,6 +19,7 @@ module Notifu
       attribute :code
       attribute :aspiring_code
       attribute :message
+      attribute :playbook
       attribute :process_result
       attribute :api_endpoint
       attribute :duration

data/lib/notifu/workers/processor.rb

@@ -276,14 +276,14 @@ module Notifu
 
     def silenced?
       if self.event.service == "keepalive"
-        path = "silence/#{self.event.host}"
+        id = "silence/#{self.event.host}"
       else
-        path = "silence/#{self.event.host}/#{self.event.service}"
+        id = "silence/#{self.event.host}/#{self.event.service}"
       end
 
-      get_stashes.each do |stash|
+      get_silenced.each do |stash|
         begin
-          return true if stash["path"] == path
+          return true if stash["id"] == id
         rescue NoMethodError
           return false
         end
@@ -360,14 +360,13 @@ module Notifu
     ##
     # get stashes from Sensu API
     #
-    def get_stashes
-      return @stashes if @stashes
+    def get_silenced
       begin
-        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 = []
-        log "error", "Failed to get stashes #{self.event.api_endpoint}/stashes"
+        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})"
+        return []
       end
     end
 
@@ -377,7 +376,7 @@ module Notifu
     #
     def unsilence!
       path = "silence/#{self.event.host}/#{self.event.service}"
-      get_stashes.each do |stash|
+      get_silenced.each do |stash|
         if stash["path"] == path
           if stash["expire"] < 0
             if self.event.unsilence

data/lib/notifu.rb

@@ -1,17 +1,12 @@
-require 'yaml'
-require 'json'
-require 'thor'
-require 'ohm'
+require "yaml"
+require "json"
+require "thor"
+require "ohm"
 require "notifu/mixins"
 require "notifu/util"
 require "notifu/config"
 require "notifu/logger"
 require "notifu/model"
-require "notifu/model/contact"
-require "notifu/model/event"
-require "notifu/model/group"
-require "notifu/model/issue"
-require "notifu/model/sla"
 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.5.7
+  version: 1.6.0
 platform: ruby
 authors:
 - Radek 'blufor' Slavicinsky
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-12-14 00:00:00.000000000 Z
+date: 2017-01-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor
@@ -277,7 +277,6 @@ files:
 - lib/notifu/model/group.rb
 - lib/notifu/model/issue.rb
 - lib/notifu/model/sla.rb
-- lib/notifu/sensu/handler.rb
 - lib/notifu/util.rb
 - lib/notifu/workers/actor.rb
 - lib/notifu/workers/processor.rb

data/lib/notifu/sensu/handler.rb

@@ -1,105 +0,0 @@
-require 'sensu/redis'
-require 'digest'
-require 'json'
-
-module Sensu::Extension
-  class Notifu < Handler
-
-    def definition
-      {
-        type: 'extension',
-        name: 'notifu'
-      }
-    end
-
-    def name
-      definition[:name]
-    end
-
-    def options
-      return @options if @options
-      @options = {
-        :host    => '127.0.0.1',
-        :port    => 6379,
-        :db      => 2
-      }
-      if @settings[:notifu].is_a?(Hash)
-        @options.merge!(@settings[:notifu])
-      end
-      @options
-    end
-
-    def description
-      'Notifu handler for Sensu Server'
-    end
-
-    def post_init
-
-      if @redis
-        yield(@redis)
-      else
-        Sensu::Redis.connect(options) do |connection|
-          connection.auto_reconnect = false
-          connection.reconnect_on_error = true
-          connection.on_error do |error|
-            @logger.warn(error)
-          end
-          @redis = connection
-        end
-      end
-      @redis.sadd("queues", "processor")
-    end
-
-    def run(event_data)
-      event = JSON.parse(event_data, { :symbolize_names => true })
-      notifu_id = Digest::SHA256.hexdigest("#{event[:client][:name]}:#{event[:client][:address]}:#{event[:check][:name]}").to_s[-10,10]
-
-      if event[:check][:name] == "keepalive"
-        sgs = event[:client][:sgs]
-        sgs ||= event[:client][:sla]
-      else
-        sgs = event[:check][:sgs]
-        sgs ||= event[:check][:sla]
-      end
-
-      payload = {
-        notifu_id: notifu_id,
-        datacenter: event[:client][:datacenter] || 'default',
-        host: event[:client][:name],
-        address: event[:client][:address],
-        service: event[:check][:name],
-        occurrences_trigger: event[:check][:occurrences],
-        occurrences_count: event[:occurrences],
-        interval: event[:check][:interval] || 0,
-        time_last_event: event[:check][:executed],
-        sgs: sgs,
-        action: event[:action],
-        code: event[:check][:status],
-        message: event[:check][:output],
-        duration: event[:check][:duration],
-        api_endpoint: "http://" + @settings[:api][:host].to_s + ":" + @settings[:api][:port].to_s
-      }
-
-      job = {
-        'class' => 'Notifu::Processor',
-        'args' => [ payload ],
-        'jid' => SecureRandom.hex(12),
-        'retry' => true,
-        'enqueued_at' => Time.now.to_f
-      }
-
-      begin
-        @redis.lpush("queue:processor", JSON.dump(job))
-      rescue Exception => e
-        yield "failed to send event to Notifu #{e.message}", 1
-      end
-
-      yield "sent event to Notifu #{notifu_id}", 0
-    end
-
-    def stop
-      yield
-    end
-
-  end
-end