zabbirc 0.2.0 → 0.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: fc13d87c01a24f572c2335c3b833a67bd69ac32e
-  data.tar.gz: f52a51ece4b4cadbccf80667bc0318ef49200624
+  metadata.gz: 1d4081d968390062febd6847ba0792fd884837ef
+  data.tar.gz: a06fc08a9ce62d8732a7452d881446abf71b3452
 SHA512:
-  metadata.gz: 6dce36ab81b1e7ec021e638a3df1a005ecd028031bb882823cfc86a50f10f905156c191de858cb121ab3ae69741313d3be0187a2a16e77b352cfe97a91193d1b
-  data.tar.gz: 0bd55518c88310f0d03ba5bff6308a19bd8a657690dfcc324a673850e898af0efad0e99a8956625fea044888cab047a0f0b8bc53cab1f3e1215d9cec46670df8
+  metadata.gz: 7f4874d643b926dcb8e6fd7fb82fd10d4d3e087bd5ac14d2f232b93f9b02fb0eaa9e3a1662246cefdb0a144e68a6ad32f84b1f80a1982f7398a9ef910045665d
+  data.tar.gz: 88c8c869678986755f6738a1efe8a8fb75b5792146a7efc5de2d16fb1228eb9ae4893a0809f06bf4b6ba05e7f17fc20b0ef00d37e8b125861cab0a18f2eddb87

data/bin/zabbirc

@@ -1,7 +1,6 @@
 #!/usr/bin/env ruby
-require 'zabbirc'
+require 'zabbirc/configuration'
 config_path = File.expand_path(ARGV[0])
-
 unless config_path
   $stderr.puts "No config path specified"
   exit false
@@ -13,6 +12,8 @@ end
 
 require_relative config_path
 
+require 'zabbirc'
+
 Zabbirc.logger # initializes logger
 exit false unless Zabbirc::Zabbix::Connection.test_connection
 

data/lib/zabbirc/configuration.rb

@@ -1,4 +1,5 @@
 require 'active_support/configurable'
+require 'active_support/all'
 
 require 'zabbirc/priority'
 

data/lib/zabbirc/irc/base_command.rb

@@ -129,6 +129,7 @@ module Zabbirc
       end
 
       def parse_priority priority
+        priority = priority.to_i if priority =~ /^\d+$/
         Priority.new(priority)
       rescue ArgumentError => e
         reply("#{e}")

data/lib/zabbirc/irc/event_command.rb

@@ -21,7 +21,7 @@ module Zabbirc
 
         events = Zabbix::Event.recent
         events = events.select{|e| e.priority >= priority }
-        events = events.select{|e| e.any_host_matches? /#{host}/ } if host.present?
+        events = events.select{|e| e.any_host_matches? /#{host}/i } if host.present?
         msg = if events.any?
                 events.collect do |e|
                   "#{e.label}"

data/lib/zabbirc/irc/maintenance_command.rb

@@ -3,7 +3,7 @@ module Zabbirc
     class MaintenanceCommand < BaseCommand
       register_help "maint", [
           "Show active maintenances: !maint",
-          "Schedule a maintenance: !maint [hostgroups] '<host_name>|<hostgroup_name>[, <host_name>|<hostgroup_name>]' <duration> <reason>",
+          "Schedule a maintenance: !maint [no-data] [hostgroups] '<host_name>|<hostgroup_name>[, <host_name>|<hostgroup_name>]' <duration> <reason>",
           " - duration format: 1h, 30m, 1h30m. h - hour, m - minute.",
           "Delete a maintenance: !maint delete <maintenance-id>"
       ]
@@ -34,7 +34,14 @@ module Zabbirc
 
       def perform_create
         params = {}
-        hostgroups_flag = @args.shift
+        without_data_collection_flag = @args.shift
+        if without_data_collection_flag == "no-data"
+          params[:without_data_collection] = true
+          hostgroups_flag = @args.shift
+        else
+          hostgroups_flag = without_data_collection_flag
+        end
+
         if hostgroups_flag == "hostgroups"
           target_names = @args.shift
           raise UserInputError, help_features["maint"] unless target_names

data/lib/zabbirc/op.rb

@@ -69,6 +69,7 @@ module Zabbirc
       return false if host_settings(:notify, host_groups).all?{|x| x == false }
       return false if @notified_events.key? event.id
       return false if event.value == :ok and host_settings(:notify_recoveries, host_groups).all?{|x| x == false }
+      return false if event.maintenance?
       interesting_priorities(host_groups).any? do |interesting_priority|
         event.priority >= interesting_priority
       end

data/lib/zabbirc/version.rb

@@ -1,3 +1,3 @@
 module Zabbirc
-  VERSION = "0.2.0"
+  VERSION = "0.2.1"
 end

data/lib/zabbirc/zabbix/event.rb

@@ -60,6 +60,21 @@ module Zabbirc
         acknowledged.to_i == 1
       end
 
+      def maintenance?
+        maintenace_host_ids = Maintenance.cached(created_at).flat_map{|m| m.hosts.map(&:id) }
+        event_host_ids = hosts.flat_map(&:id)
+        return true if (maintenace_host_ids & event_host_ids).any?
+
+        maintenace_group_ids = Maintenance.cached(created_at).flat_map{|m| m.groups.map(&:id) }
+        event_group_ids = host_groups.flat_map(&:id)
+        return true if (maintenace_group_ids & event_group_ids).any?
+        false
+      end
+
+      def maintenance_label
+        " [MAINT]" if maintenance?
+      end
+
       def created_at
         Time.at(clock.to_i)
       end
@@ -94,7 +109,7 @@ module Zabbirc
       end
 
       def label
-        format_label "|%sid| %time [%priority-code] %msg - %state"
+        format_label "|%sid| %time%maint [%priority-code] %msg - %state"
       end
 
       def format_label fmt
@@ -104,7 +119,8 @@ module Zabbirc
             gsub("%msg", "#{message}").
             gsub("%id", "#{id}").
             gsub("%sid", "#{shorten_id}").
-            gsub("%state", "#{state}")
+            gsub("%state", "#{state}").
+            gsub("%maint", "#{maintenance_label}")
       end
 
       def any_host_matches? regexp

data/lib/zabbirc/zabbix/maintenance.rb

@@ -2,6 +2,7 @@ module Zabbirc
   module Zabbix
     class Maintenance < Resource::Base
 
+      CACHE_TTL = 1.minute
       has_many :hosts
       has_many :groups, class_name: "HostGroup"
 
@@ -15,7 +16,8 @@ module Zabbirc
       def self.create *options
         default_options = {
             host_ids: [],
-            host_group_ids: []
+            host_group_ids: [],
+            without_data_collection: false
         }
 
         options = options.extract_options!
@@ -34,6 +36,7 @@ module Zabbirc
             active_till: maint_end.to_i,
             hostids: host_ids,
             groupids: host_group_ids,
+            maintenance_type: (options[:without_data_collection] ? 1 : 0),
             timeperiods: [
                 {
                     timeperiod_type: 0,
@@ -46,6 +49,20 @@ module Zabbirc
         r["maintenanceids"].first
       end
 
+      def self.cached timestamp = nil
+        if @maintenances_timestamp and @maintenances_timestamp < CACHE_TTL.ago
+          @maintenances, @maintenances_timestamp = nil, nil
+        end
+        @maintenances_timestamp ||= Time.current
+        @maintenances ||= Maintenance.get(selectHosts: :extend, selectGroups: :extend)
+
+        if timestamp
+          @maintenances.select{|maintenance| maintenance.active_range.cover?(timestamp) }
+        else
+          @maintenances
+        end
+      end
+
       def shorten_id
         @shorten_id ||= Zabbirc.maintenances_id_shortener.get_shorten_id id
       end
@@ -58,12 +75,20 @@ module Zabbirc
         Time.at(super.to_i)
       end
 
+      def active_range
+        active_since..active_till
+      end
+
       def active?
         (active_since..active_till).cover? Time.current
       end
 
+      def data_collection_label
+        " [NO-DATA-COL]" if maintenance_type.to_i == 1
+      end
+
       def label
-        format_label "|%sid| %start -> %end >> %name %targets"
+        format_label "|%sid|%data-collection-label %start -> %end >> %name %targets"
       end
 
       def format_label fmt
@@ -72,7 +97,8 @@ module Zabbirc
             gsub("%name", "#{name}").
             gsub("%id", "#{id}").
             gsub("%sid", "#{shorten_id}").
-            gsub("%targets", "#{target_labels}")
+            gsub("%targets", "#{target_labels}").
+            gsub("%data-collection-label", "#{data_collection_label}")
       end
 
       def target_labels

data/spec/event_command_spec.rb

@@ -70,8 +70,8 @@ describe Zabbirc::Irc::HostCommand do
       end
       before do
         allow(Zabbirc::Zabbix::Event).to receive(:recent).and_return(events)
-        allow(event_high_good_host).to receive(:any_host_matches?).with(/#{host}/).and_return(true)
-        allow(event_high_bad_host).to receive(:any_host_matches?).with(/#{host}/).and_return(false)
+        allow(event_high_good_host).to receive(:any_host_matches?).with(/#{host}/i).and_return(true)
+        allow(event_high_bad_host).to receive(:any_host_matches?).with(/#{host}/i).and_return(false)
       end
 
       it "should report latest events" do

data/spec/maintenance_command_spec.rb

@@ -76,6 +76,15 @@ describe Zabbirc::Irc::MaintenanceCommand do
         expect(mock_message).to receive(:reply)
         maintenance_command.run
       end
+
+      context "without data collection" do
+        let(:cmd) { "no-data '#{host1.name},#{host2.name}' #{duration} #{reason}" }
+        it "should create maintenance" do
+          expect(Zabbirc::Zabbix::Maintenance).to receive(:create).with(duration: duration_int, host_ids: hosts.collect(&:id), name: reason, without_data_collection: true)
+          expect(mock_message).to receive(:reply)
+          maintenance_command.run
+        end
+      end
     end
 
     context "host groups" do
@@ -85,6 +94,15 @@ describe Zabbirc::Irc::MaintenanceCommand do
         expect(mock_message).to receive(:reply)
         maintenance_command.run
       end
+
+      context "without data collection" do
+        let(:cmd) { "no-data hostgroups '#{host_group1.name},#{host_group2.name}' #{duration} #{reason}" }
+        it "should create maintenance" do
+          expect(Zabbirc::Zabbix::Maintenance).to receive(:create).with(duration: duration_int, host_group_ids: host_groups.collect(&:id), name: reason, without_data_collection: true)
+          expect(mock_message).to receive(:reply)
+          maintenance_command.run
+        end
+      end
     end
 
 

data/tmp/playground.rb

@@ -29,4 +29,9 @@ def get_event short_id
       selectRelatedObject: :extend,
       selectHosts: :extend
   )
-end
+end
+
+
+include Zabbirc::Zabbix
+es = Event.get(selectHosts: :extend, sortfield: :clock);
+Event.preload_host_groups es;

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: zabbirc
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.2.1
 platform: ruby
 authors:
 - Filip Zachar
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-11-13 00:00:00.000000000 Z
+date: 2015-11-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport