zabbirc 0.0.6 → 0.0.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0442b2c7c53bf6dafea3ea822c5782d94b7ba20f
-  data.tar.gz: c04aa4f8923eba8a611e44fd3192d0f63c287045
+  metadata.gz: c14c5732f6e3e5d9209fb9b788cd2f533142eecd
+  data.tar.gz: d868a4bca00497bf01f8e808eb7d8a51165a9f70
 SHA512:
-  metadata.gz: a77d8bab630b1fea6945384de58ed5e884fcc8689de3304a73ff8cdfff57358f14bc439a319333690fbf8228e28ddfa694921dcee152866bc94142d3c91e8c96
-  data.tar.gz: 170bd4acf9dd5acf23ac20bab8c63391416328d2458ea2860acdbd081d078580af681f27ab84b4181feb5bf2d101f28117f7a496ad51c4f7a32b39b16c6885d0
+  metadata.gz: ac71f44f93f205561568d147b9467227180c3a79b928f850d861577221f6f73c3cdb78073e6c6b8f1c2a80b0df5f795e060e9c720f9db8a358088b1a81cb6db4
+  data.tar.gz: a7b4006245ccc9004f0b28c21dbb09a7e4755f68c5acc3a7f699e6f8fcefa990a9a4a0d852d9b3cc861eb1c29c5c0b416597bd9c67c403b45d5e0f863ca748f4

data/config/config.rb

@@ -7,4 +7,6 @@ Zabbirc.configure do |config|
   # config.irc_channels = ["#libra-zabbix"]
   config.irc_server = "irc.freenode.org"
   config.irc_channels = ["#zabbirc-test", "#zabbirc-test-2"]
+
+  config.notify_about_events_from_last = 25.minutes
 end

data/lib/zabbirc/irc/plugin.rb

@@ -21,8 +21,8 @@ module Zabbirc
       match /(settings set)\s*$/, method: :zabbirc_help_detail
 
       # Events
-      register_help "events", "Show events from last #{Zabbirc.config.notify_about_events_from_last.to_i / 60} minutes. Usage: !events"
-      match "events", method: :list_events
+      register_help "events", "Show events from last #{Zabbirc.config.notify_about_events_from_last.to_i / 60} minutes filtered by <priority> and <host>. Usage: !events [<priority [<host>]]"
+      match /events(?: ([a-zA-Z0-9\-]+)(?: ([a-zA-Z0-9\-]+))?)?\s*$/, method: :list_events
 
       # Host
       register_help "status", "Show status of host. Usage: !status <hostname>"

data/lib/zabbirc/irc/plugin_methods.rb

@@ -94,8 +94,8 @@ module Zabbirc
         op = authenticate m
         return unless op
         case key
-        when "notify"
-          set_notify m, op, value
+        when "notify", "notify_recoveries"
+          set_boolean m, op, key, value
         when "events_priority"
           set_events_priority m, op, value
         when "primary_channel"
@@ -105,21 +105,22 @@ module Zabbirc
         end
       end
 
-      def set_notify m, op, value
+      def set_boolean m, op, key, value
         if value.nil?
-          m.reply "#{op.nick}: notify allowed values: true, on, 1, false, off, 0"
+          m.reply "#{op.nick}: #{key} allowed values: true, on, 1, false, off, 0"
           return
         end
+
         case value
         when "true", "on", "1"
-          op.setting.set :notify, true
+          op.setting.set key, true
         when "false", "off", "0"
-          op.setting.set :notify, false
+          op.setting.set key, false
         else
           m.reply "#{op.nick}: uknown value `#{value}`. Allowed values: true, on, 1, false, off, 0"
           return
         end
-        m.reply "#{op.nick}: setting `notify` has been set to `#{op.setting.get :notify}`"
+        m.reply "#{op.nick}: setting `#{key}` has been set to `#{op.setting.get key}`"
       end
 
       def set_events_priority m, op, value
@@ -155,16 +156,22 @@ module Zabbirc
       end
 
       ### Events
-      def list_events m
+      def list_events m, priority=nil, host=nil
         op = authenticate m
         return unless op
+        priority = parse_priority(m, priority || 0)
+        return unless priority
+        
         events = Zabbix::Event.recent
+        events = events.select{|e| e.priority >= priority }
+        events = events.select{|e| e.any_host_matches? /#{host}/ } if host
         msg = if events.any?
                 events.collect do |e|
                   "#{op.nick}: #{e.label}"
                 end.join("\n")
               else
-                "#{op.nick}: No last events"
+                host_filter = host ? " and host `#{host}`" : ""
+                "#{op.nick}: No last events for priority `#{priority}`#{host_filter}"
               end
         m.reply msg
       rescue Zabbix::NotConnected => e
@@ -228,6 +235,14 @@ module Zabbirc
         end
       end
 
+      def parse_priority m, priority
+        op = get_op m
+        Priority.new(priority)
+      rescue ArgumentError => e
+        m.reply("#{op.nick}: #{e}")
+        nil
+      end
+
       def rescue_not_connected m, e
         op = get_op m
         return unless op

data/lib/zabbirc/op.rb

@@ -65,6 +65,7 @@ module Zabbirc
     def interested_in? event
       return false unless setting.get :notify
       return false if @notified_events.key? event.id
+      return false if event.value == :ok and not setting.get :notify_recoveries
       event.priority >= interesting_priority
     end
 

data/lib/zabbirc/service.rb

@@ -86,7 +86,7 @@ module Zabbirc
     end
 
     def pre_start_script
-      @ops_service.iterate
+      @ops_service.sync_ops
       @ops.load_settings
     rescue => e
       Zabbirc.logger.error "Exception `#{e}` while running pre_start_script"

data/lib/zabbirc/services/ops.rb

@@ -3,6 +3,18 @@ module Zabbirc
     class Ops < Base
       def iterate
         sync_ops
+        synchronize do
+          @service.ops.dump_settings
+        end
+      end
+
+      def sync_ops
+        synchronize do
+          sync_zabbix
+          @cinch_bot.channels.each do |channel|
+            sync_irc channel
+          end
+        end
       rescue Zabbix::NotConnected => e
         if Zabbix::Connection.up?
           @service.ops.interested.notify e.to_s
@@ -20,16 +32,6 @@ module Zabbirc
         channel.users.keys.find { |irc_user| irc_user.user.sub("~","") == login }
       end
 
-      def sync_ops
-        synchronize do
-          sync_zabbix
-          @cinch_bot.channels.each do |channel|
-            sync_irc channel
-          end
-        end
-        # @service.ops.dump_settings
-      end
-
       def sync_irc channel
         logins = channel_logins channel
 

data/lib/zabbirc/setting.rb

@@ -2,6 +2,7 @@ module Zabbirc
   class Setting
     DEFAULTS = ActiveSupport::HashWithIndifferentAccess.new({
         notify: true,
+        notify_recoveries: true,
         primary_channel: nil,
         events_priority: Zabbirc.config.default_events_priority
     })
@@ -14,8 +15,7 @@ module Zabbirc
       stored_options = ActiveSupport::HashWithIndifferentAccess.new stored_options
       unknown_keys = stored_options.keys - DEFAULTS.keys
       stored_options.delete_if{|k,_v| unknown_keys.include? k }
-      stored_options.merge DEFAULTS.deep_dup
-      @options = stored_options
+      @options = DEFAULTS.deep_dup.merge(stored_options)
     end
 
     def set name, value

data/lib/zabbirc/zabbix/event.rb

@@ -79,6 +79,10 @@ module Zabbirc
             gsub("%state", "#{state}")
       end
 
+      def any_host_matches? regexp
+        hosts.any?{|h| h.name =~ regexp }
+      end
+
       private
 
       def determine_related_object

data/lib/zabbirc/zabbix/resource/base.rb

@@ -28,7 +28,7 @@ module Zabbirc
 
         def initialize attrs
           @attrs = ActiveSupport::HashWithIndifferentAccess.new attrs
-          raise ArgumentError, "attribute `#{self.class.model_name}id` not found, probably not an Event" unless @attrs.key? :"#{self.class.model_name}id"
+          raise ArgumentError, "attribute `#{self.class.model_name}id` not found, probably not a #{self.class.model_name}" unless @attrs.key? :"#{self.class.model_name}id"
         end
 
         def id

data/lib/zabbirc.rb

@@ -25,7 +25,4 @@ require_dir "zabbirc/irc/*.rb"
 require 'zabbirc/zabbix/resource/base'
 require_dir "zabbirc/zabbix/*.rb"
 require 'zabbirc/services/base'
-require_dir "zabbirc/services/*.rb"
-
-# TODO Error message when cannot connect to Zabbix
-# TODO Dump op specific settings in loop, so it can be loaded on the fatal server failure
+require_dir "zabbirc/services/*.rb"

data/spec/bot_spec.rb

@@ -125,27 +125,51 @@ describe Zabbirc::Irc::PluginMethods do
       let(:recent_events) { [] }
 
       it "should report no last events" do
-        expect(mock_message).to receive(:reply).with("#{mock_nick}: No last events")
+        expect(mock_message).to receive(:reply).with("#{mock_nick}: No last events for priority `#{Zabbirc::Priority.new(0)}`")
         bot.list_events mock_message
       end
     end
 
-    context "no last events" do
-      let(:event1) { double "Event1", label: "Event 1 label" }
-      let(:event2) { double "Event2", label: "Event 2 label" }
-      let(:recent_events) { [event1, event2] }
+    context "some last events" do
+      let(:event1_information) { double "Event1", label: "Event 1 label", priority: Zabbirc::Priority.new(:information) }
+      let(:event2_information) { double "Event2", label: "Event 2 label", priority: Zabbirc::Priority.new(:information) }
+      let(:event3_high)        { double "Event3", label: "Event 3 label", priority: Zabbirc::Priority.new(:high) }
+      let(:recent_events) { [event1_information, event2_information, event3_high] }
       let(:expected_msg) { recent_events.collect{|e| "#{mock_nick}: #{e.label}"}.join("\n") }
 
-      it "should report no last events" do
+      before do
+        recent_events.each do |e|
+          allow(e).to receive(:any_host_matches?).and_return(false)
+        end
+      end
+
+      it "should report all last events" do
         expect(mock_message).to receive(:reply).with(expected_msg)
         bot.list_events mock_message
       end
+
+      context "with high priority filtered" do
+        let(:expected_msg) { [event3_high].collect{|e| "#{mock_nick}: #{e.label}"}.join("\n") }
+        it "should report high priority last events" do
+          expect(mock_message).to receive(:reply).with(expected_msg)
+          bot.list_events mock_message, "high"
+        end
+      end
+
+      context "with host filtered" do
+        let(:expected_msg) { [event1_information].collect{|e| "#{mock_nick}: #{e.label}"}.join("\n") }
+        it "should report host matched last events" do
+          allow(event1_information).to receive(:any_host_matches?).and_return(true  )
+          expect(mock_message).to receive(:reply).with(expected_msg)
+          bot.list_events mock_message, "information", "host1"
+        end
+      end
     end
   end
 
   describe "#show_settings" do
     let(:mock_user_settings) { {primary_channel: "#channel-1", events_priority: "high", notify: false } }
-    let(:expected_msg) { "#{mock_nick}: notify: false, primary_channel: #channel-1, events_priority: high" }
+    let(:expected_msg) { "#{mock_nick}: notify: false, notify_recoveries: true, primary_channel: #channel-1, events_priority: high" }
     it "should show settings" do
       expect(mock_message).to receive(:reply).with(expected_msg)
       bot.show_settings mock_message

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: zabbirc
 version: !ruby/object:Gem::Version
-  version: 0.0.6
+  version: 0.0.7
 platform: ruby
 authors:
 - Filip Zachar
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-12-10 00:00:00.000000000 Z
+date: 2014-12-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -145,7 +145,6 @@ files:
 - tmp/module_test.rb
 - tmp/playground.rb
 - tmp/thread_test.rb
-- zabbirc_config.rb
 homepage: https://github.com/tulak/zabbirc
 licenses:
 - MIT

data/zabbirc_config.rb

@@ -1,14 +0,0 @@
-Zabbirc.configure do |config|
-  ### Zabbix server configuration
-  config.zabbix_api_url = "https://your.zabbix-server.com/zabbix/api_jsonrpc.php"
-  config.zabbix_login = "zabbirc"
-  config.zabbix_password = "zabbircpass"
-
-  ### IRC configurations
-  # config.irc_server = "irc.freenode.org"
-  # config.irc_channels = ["#zabbirc-test", "#zabbirc-test-2"]
-
-  ### Zabbirc configurations
-  # config.events_check_interval = 10.seconds
-  # config.notify_about_events_from_last = 5.minutes
-end