zabbirc 0.2.1 → 0.2.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1d4081d968390062febd6847ba0792fd884837ef
-  data.tar.gz: a06fc08a9ce62d8732a7452d881446abf71b3452
+  metadata.gz: d19487ed3b008b96ed9834da9be4dcc1739397d2
+  data.tar.gz: 6b4d2299af4229cc7991ffc6b268c522128bec97
 SHA512:
-  metadata.gz: 7f4874d643b926dcb8e6fd7fb82fd10d4d3e087bd5ac14d2f232b93f9b02fb0eaa9e3a1662246cefdb0a144e68a6ad32f84b1f80a1982f7398a9ef910045665d
-  data.tar.gz: 88c8c869678986755f6738a1efe8a8fb75b5792146a7efc5de2d16fb1228eb9ae4893a0809f06bf4b6ba05e7f17fc20b0ef00d37e8b125861cab0a18f2eddb87
+  metadata.gz: dbdf9dcbd24433c9b539d2805facd668bbf241dab7294d759bc108707f5dec617987ad46555b8a8f44f7fdc7545ff71b6f575d468cddc31e13b27656c001ef38
+  data.tar.gz: 54e596bd981be3078251ebb6b4fa57c0035b3046a5189c578ce4cea6e4dca908ef74f6ea37831217b31912478220794cc5a673fab04050794408d5afdbe50c2d

data/config/config.rb

@@ -3,10 +3,11 @@ Zabbirc.configure do |config|
   config.zabbix_login = ENV['ZABBIX_LOGIN']
   config.zabbix_password = ENV['ZABBIX_PASSWORD']
 
-  # config.irc_server = "irc.devel.redhat.com"
+  config.irc_server = "irc.devel.redhat.com"
   # config.irc_channels = ["#libra-zabbix"]
-  config.irc_server = "irc.freenode.org"
-  config.irc_channels = ["#zabbirc-test", "#zabbirc-test-2"]
+  # config.irc_server = "irc.freenode.org"
+  config.irc_channels = ["#zabbirc-test"] #, "#zabbirc-test-2"]
 
   config.notify_about_events_from_last = 25.minutes
+  config.colors = true
 end

data/lib/zabbirc.rb

@@ -26,6 +26,13 @@ module Zabbirc
   def self.maintenances_id_shortener
     @maintenances_id_shortener ||= IdShortener.new
   end
+
+  def self.rich_text_formatter
+    @rich_text_formatter ||= begin
+      palette = (config.colors ? Palettes::Default : Palettes::Clean)
+      RichTextFormatter.new palette
+    end
+  end
 end
 
 require 'zabbirc/configuration'
@@ -36,3 +43,4 @@ require 'zabbirc/zabbix/resource/base'
 require_dir "zabbirc/zabbix/*.rb"
 require 'zabbirc/services/base'
 require_dir "zabbirc/services/*.rb"
+

data/lib/zabbirc/configuration.rb

@@ -20,11 +20,16 @@ module Zabbirc
     config_accessor :zabbix_password
 
     config_accessor :irc_server
+    config_accessor :irc_port
+    config_accessor :irc_ssl
+    config_accessor :irc_ssl_verify
     config_accessor :irc_channels
 
     config_accessor :events_check_interval
     config_accessor :notify_about_events_from_last
 
+    config_accessor :colors
+
     def param_name
       config.param_name.respond_to?(:call) ? config.param_name.call : config.param_name
     end
@@ -54,6 +59,10 @@ module Zabbirc
     config.default_events_priority = :high
 
     config.irc_server = "irc.freenode.org"
+    config.irc_port = 6667
+    config.irc_ssl = false
+    config.irc_ssl_verify = false
     config.irc_channels = ["#zabbirc-test", "#zabbirc-test-2"]
+    config.colors = true
   end
-end
+end

data/lib/zabbirc/irc/base_command.rb

@@ -70,6 +70,7 @@ module Zabbirc
           "#{@op.nick}: #{options[:prefix]}#{m}"
         end.join("\n")
 
+        msg = Zabbirc.rich_text_formatter.format msg
         @message.reply msg
       end
 

data/lib/zabbirc/irc/host_command.rb

@@ -30,13 +30,13 @@ module Zabbirc
 
         triggers = Zabbix::Trigger.get(hostids: host.id, filter: {value: 1}, selectHosts: :extend)
         triggers = triggers.sort{|x,y| x.priority <=> y.priority }
-        msg = ["Host: #{host.name}"]
+        msg = ["$C,GREY$Host:$C,RST$ #{host.name}"]
         if triggers.empty?
-          msg[0] << " - status: OK"
+          msg[0] << " - $C,GREY$status:$C,GREEN$ OK$C,RST$"
         else
-          msg[0] << " - status: #{triggers.size} problems"
+          msg[0] << " - $C,GREY$status:$C,RED$ #{triggers.size} problems$C,RST$"
           triggers.each do |trigger|
-            msg << "status: #{trigger.label}"
+            msg << "$C,GREY$status:$C,RST$ #{trigger.label}"
           end
         end
         reply msg
@@ -47,14 +47,14 @@ module Zabbirc
         limit = @args.shift
         limit ||= 8
 
-        msg = ["Host: #{host.name}"]
+        msg = ["$C,GREY$Host:$C,RST$ $U$#{host.name}$U,RST$"]
         events = Zabbix::Event.get(hostids: host.id, limit: limit, selectHosts: :extend, selectRelatedObject: :extend, sortfield: :clock, sortorder: "DESC")
         if events.empty?
           msg[0] << " - no events found"
         else
-          msg[0] << " - showing last #{events.size} events"
+          msg[0] << " - showing last $C,RED$#{events.size}$C,RST$ events"
           events.each do |event|
-            msg << "!latest: #{event.label}"
+            msg << "$C,GREY$!latest:$C,RST$ #{event.label}"
           end
         end
         reply msg

data/lib/zabbirc/irc/settings_command.rb

@@ -25,22 +25,22 @@ module Zabbirc
       def show
         inline = @op.setting.collect do |key, value|
           next if key == "host_groups"
-          "#{key}: #{value}"
+          "$C,BLUE_CYAN$#{key}:$C,RST$ #{value}"
         end.compact.join(", ")
 
-        reply "Default settings: #{inline}"
+        reply "$C,GREY$Default settings: $C,RST$#{inline}"
 
         host_group_options = []
         @op.setting.get(:host_groups).each do |group_id, options|
           if options.any?
             group = Zabbix::HostGroup.find(group_id)
-            group_options = options.collect{|k,v| "#{k}: #{v}" }.sort.join(", ")
-            host_group_options << " - #{group.name}: #{group_options}"
+            group_options = options.collect{|k,v| "$C,BLUE_CYAN$#{k}:$C,RST$ #{v}" }.sort.join(", ")
+            host_group_options << " - $C,ORANGE$#{group.name}: $C,RST$ #{group_options}"
           end
         end
 
         if host_group_options.any?
-          reply "Host group settings:"
+          reply "$C,GREY$Host group settings: $C,RST$"
           reply host_group_options
         end
       end
@@ -94,21 +94,22 @@ module Zabbirc
       end
 
       def set_value key, value, host_groups_flag, host_groups
+        key_label = "$C,BLUE_CYAN$#{key}$C,RST$"
         case host_groups_flag
         when :none
           @op.setting.set key, value
-          reply "setting `#{key}` has been set to `#{@op.setting.get key}`"
+          reply "setting `#{key_label}` has been set to `$C,BLUE_CYAN$#{@op.setting.get key}$C,RST$`"
         when :all
           @op.setting.set key, value
           host_groups.each do |host_group|
             @op.setting.set key, value, host_group_id: host_group.id
           end
-          reply "setting `#{key}` has been set to `#{@op.setting.get key}` for all host groups"
+          reply "setting `#{key_label}` has been set to `$C,BLUE_CYAN$#{@op.setting.get key}$C,RST$` for all host groups"
         when :some
           host_groups.each do |host_group|
             @op.setting.set key, value, host_group_id: host_group.id
           end
-          reply "setting `#{key}` has been set to `#{value}` for host groups: #{host_groups.collect(&:name).join(", ")}"
+          reply "setting `#{key_label}` has been set to `$C,BLUE_CYAN$#{value}$C,RST$` for host groups: $C,ORANGE$#{host_groups.collect(&:name).join(", ")}$C,ORANGE$"
         end
       end
 

data/lib/zabbirc/op_list.rb

@@ -59,6 +59,7 @@ module Zabbirc
                 when Zabbix::Event
                   object.label
                 end
+      message = Zabbirc.rich_text_formatter.format message
       group_by(&:primary_channel).each do |channel, ops|
         next if channel.nil?
         op_targets = ops.collect{|op| "#{op.nick}:" }.join(" ")

data/lib/zabbirc/palettes/clean.rb

@@ -0,0 +1,11 @@
+module Zabbirc
+  module Palettes
+    class Clean
+      def format tokens
+        tokens.reject do |token|
+          token.is_a? Array
+        end.join.gsub(/ +/," ").strip
+      end
+    end
+  end
+end

data/lib/zabbirc/palettes/default.rb

@@ -0,0 +1,101 @@
+module Zabbirc
+  module Palettes
+    class Default
+      COLORS = {
+          "white" => 0,
+          "black" => 1,
+          "blue" => 2,
+          "green" => 3,
+          "red" => 4,
+          "brown" => 5,
+          "purple" => 6,
+          "orange" => 7,
+          "yellow" => 8,
+          "light_green" => 9,
+          "blue_cyan" => 10,
+          "light_cyan" => 11,
+          "light_blue" => 12,
+          "pink" => 13,
+          "grey" => 14,
+          "light_grey" => 15
+      }
+      COMMANDS = {
+          bold: "\x02",
+          color: "\x03",
+          underlined: "\x1F",
+          reset: "\x0F"
+      }
+      RESET_ARG = "RST"
+
+      def format tokens
+        @flags = Hash.new(false)
+        tokens.collect do |token|
+          process_token token
+        end.join
+      end
+
+      private
+      def process_token token
+        case token
+        when Array
+          cmd = token.shift
+          case cmd
+          when :C then process_color token
+          when :B then process_bold token
+          when :U then process_underline token
+          when :RST then process_reset token
+          else
+            raise ArgumentError, "unknown irc richtext command `#{cmd.inspect}`"
+          end
+        when String then token
+        else
+          raise ArgumentError, "unknown token `#{token.inspect}`"
+        end
+      end
+
+      def process_color args
+        raise ArgumentError, "too many arguments for C command" if args.size > 2
+        fg, bg = args.compact
+        return COMMANDS[:color] if fg == RESET_ARG
+        fg = "%02d" % COLORS[fg.downcase] if fg.present?
+        bg = "%02d" % COLORS[bg.downcase] if bg.present?
+        colors = [fg,bg].compact.join(",")
+        "#{COMMANDS[:color]}#{colors}"
+      end
+
+      def process_bold args
+        raise ArgumentError, "too many arguments for B command" if args.size > 1
+        case args.first
+        when RESET_ARG
+          return unless @flags[:bold]
+          @flags[:bold] = false
+          COMMANDS[:bold]
+        else
+          return if @flags[:bold]
+          @flags[:bold] = true
+          COMMANDS[:bold]
+        end
+      end
+
+      def process_underline args
+        raise ArgumentError, "too many arguments for U command" if args.size > 1
+        case args.first
+        when RESET_ARG
+          return unless @flags[:underlined]
+          @flags[:underlined] = false
+          COMMANDS[:underlined]
+        else
+          return if @flags[:underlined]
+          @flags[:underlined] = true
+          COMMANDS[:underlined]
+        end
+      end
+
+      def process_reset args
+        raise ArgumentError, "too many arguments for RST command" unless args.size.zero?
+        @flags = Hash.new(false)
+        COMMANDS[:reset]
+      end
+    end
+  end
+end

data/lib/zabbirc/rich_text_formatter.rb

@@ -0,0 +1,32 @@
+require_dir 'zabbirc/palettes/*'
+
+module Zabbirc
+  class RichTextFormatter
+    DEFAULT_PALETTE = Zabbirc::Palettes::Default
+    COMMANDS = %w[C B U RST] # C - color, B - bold, U - underlined, RST - reset all formatting
+    COMMANDS_REGEXP = Regexp.union(COMMANDS)
+    delegate :paint, to: :pallete
+    def initialize palette=DEFAULT_PALETTE
+      @palette = palette.new
+    end
+
+    def format msg
+      tokens = tokenize msg
+      @palette.format tokens
+    end
+
+    private
+    def tokenize msg
+      r = /\$(?<cmd>#{COMMANDS_REGEXP})(?<args>(,[a-zA-Z0-9_]+)*)\$(?<rest>(?:[\n\r]|.)*)/
+      match_data = msg.match(r)
+      return [msg] if match_data.nil?
+      args = match_data[:args].split(/,/).reject(&:blank?)
+      cmd = [
+          match_data[:cmd].to_sym,
+          args
+      ].flatten
+      ([match_data.pre_match, cmd] + tokenize(match_data[:rest])).reject(&:nil?)
+    end
+
+  end
+end

data/lib/zabbirc/service.rb

@@ -22,8 +22,11 @@ module Zabbirc
       @cinch_bot = Cinch::Bot.new do
         configure do |c|
           c.server = Zabbirc.config.irc_server
+	  c.port = Zabbirc.config.irc_port
           c.channels = Zabbirc.config.irc_channels
           c.nick = "zabbirc"
+	  c.ssl.use = Zabbirc.config.irc_ssl
+	  c.ssl.verify = Zabbirc.config.irc_ssl_verify
           c.plugins.plugins = [Irc::Plugin]
         end
       end
@@ -100,4 +103,4 @@ module Zabbirc
       @cinch_bot_thread.join
     end
   end
-end
+end

data/lib/zabbirc/version.rb

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

data/lib/zabbirc/zabbix/event.rb

@@ -35,7 +35,7 @@ module Zabbirc
       attr_reader :attrs
       attr_writer :host_groups
 
-      delegate :priority, :priority_code, to: :related_object
+      delegate :priority, :priority_code, :severity_label, to: :related_object
 
       def related_object
         raise AttributeError, "`source` attribute required" if @attrs[:source].blank?
@@ -72,7 +72,7 @@ module Zabbirc
       end
 
       def maintenance_label
-        " [MAINT]" if maintenance?
+        " $C,PURPLE$[MAINT]$C,RST$" if maintenance?
       end
 
       def created_at
@@ -97,24 +97,34 @@ module Zabbirc
         @shorten_id ||= Zabbirc.events_id_shortener.get_shorten_id id
       end
 
-      alias_method :state, :value
+      def state
+        case value
+        when :ok then "$C,GREEN$ok$C,RST$"
+        when :problem then "$C,RED$problem$C,RST$"
+        else
+          value
+        end
+      end
 
       def message
         desc = related_object.description
-        if desc.include?("{HOST.NAME}")
-          desc.sub("{HOST.NAME}", hosts.collect(&:host).join(', '))
+        host_label_regexp = Regexp.union("{HOSTNAME}", "{HOST.NAME}")
+        host_names = "$U$#{hosts.collect(&:host).join(', ')}$U,RST$"
+        if desc =~ host_label_regexp
+          desc.sub(host_label_regexp, host_names)
         else
-          "#{desc} on #{hosts.collect(&:host).join(', ')}"
+          "#{desc} on #{host_names}"
         end
       end
 
       def label
-        format_label "|%sid| %time%maint [%priority-code] %msg - %state"
+        format_label "$C,PURPLE$|%sid|$C,RST$ %time %severity%maint %msg - %state"
       end
 
       def format_label fmt
         fmt.gsub("%priority-code", "#{priority.code}").
             gsub("%priority-num", "#{priority.number}").
+            gsub("%severity", "#{severity_label}").
             gsub("%time", "#{created_at.to_formatted_s(:short)}").
             gsub("%msg", "#{message}").
             gsub("%id", "#{id}").

data/lib/zabbirc/zabbix/maintenance.rb

@@ -84,11 +84,11 @@ module Zabbirc
       end
 
       def data_collection_label
-        " [NO-DATA-COL]" if maintenance_type.to_i == 1
+        " $C,ORANGE$[NO-DATA-COL]$C,RST$" if maintenance_type.to_i == 1
       end
 
       def label
-        format_label "|%sid|%data-collection-label %start -> %end >> %name %targets"
+        format_label "$C,PURPLE$|%sid|$C,RST$%data-collection-label %start $C,RED$->$C,RST$ %end $C,RED$>>$C,RST$ %name $C,ORANGE$%targets$C,RST$"
       end
 
       def format_label fmt

data/lib/zabbirc/zabbix/trigger.rb

@@ -18,16 +18,41 @@ module Zabbirc
         end
       end
 
+      def state
+        case value
+        when :ok then "$C,GREEN$ok$C,RST$"
+        when :problem then "$C,RED$problem$C,RST$"
+        else
+          value
+        end
+      end
+
       def message
-        if description.include?("{HOST.NAME}")
-          description.sub("{HOST.NAME}", hosts.collect(&:host).join(', '))
+        host_label_regexp = Regexp.union("{HOSTNAME}", "{HOST.NAME}")
+        host_names = "$U$#{hosts.collect(&:host).join(', ')}$U,RST$"
+        if description =~ host_label_regexp
+          description.sub(host_label_regexp, host_names)
         else
-          "#{description} on #{hosts.collect(&:host).join(', ')}"
+          "#{description} on #{host_names}"
+        end
+      end
+
+
+
+      def severity_label
+        code = priority.code
+        case code
+        when :not_classified then "$C,GREY$[#{code}]$C,RST$"
+        when :information    then "$C,LIGHT_GREEN$[#{code}]$C,RST$"
+        when :warning        then "$C,YELLOW$[#{code}]$C,RST$"
+        when :average        then "$C,ORANGE$[#{code}]$C,RST$"
+        when :high           then "$C,RED$[#{code}]$C,RST$"
+        when :disaster       then "$C,BROWN$[#{code}]$C,RST$"
         end
       end
 
       def label
-        format_label "%time [%priority-code] %msg - %value"
+        format_label "%time %severity %msg - %value"
       end
 
       def changed_at
@@ -37,10 +62,11 @@ module Zabbirc
       def format_label fmt
         fmt.gsub("%priority-code", "#{priority.code}").
             gsub("%priority-num", "#{priority.number}").
+            gsub("%severity", "#{severity_label}").
             gsub("%time", "#{changed_at.to_formatted_s(:short)}").
             gsub("%msg", "#{message}").
             gsub("%id", "#{id}").
-            gsub("%value", "#{value}")
+            gsub("%value", "#{state}")
       end
     end
   end

data/spec/support/clean_palette.rb

@@ -0,0 +1,3 @@
+def Zabbirc.rich_text_formatter
+  @rich_text_formatter ||= Zabbirc::RichTextFormatter.new(Zabbirc::Palettes::Clean)
+end

data/templates/zabbirc_config.rb

@@ -7,9 +7,13 @@ Zabbirc.configure do |config|
   ### IRC configurations
   # config.irc_server = "irc.freenode.org"
   # config.irc_channels = ["#zabbirc-test", "#zabbirc-test-2"]
+  # config.irc_port = 6667
+  # config.irc_ssl = false
+  # config.irc_ssl_verify = false
 
   ### Zabbirc configurations
   # config.events_check_interval = 10.seconds
   # config.notify_about_events_from_last = 5.minutes
   # config.default_events_priority = :high
-end
+  # config.colors = true
+end

data/tmp/playground.rb

@@ -34,4 +34,43 @@ end
 
 include Zabbirc::Zabbix
 es = Event.get(selectHosts: :extend, sortfield: :clock);
-Event.preload_host_groups es;
+Event.preload_host_groups es;
+
+
+c = s.ops.get('fzachar').primary_channel
+(0..15).each do |i|
+  msg = "\x03%02d %s - %02d" % [i, "The message", i]
+  c.send(msg)
+  sleep 1
+end
+
+
+
+
+####################################################
+
+$nopry = false
+priorities = (0..5).collect{|i| Zabbirc::Priority.new i }
+e = Zabbirc::Zabbix::Event.get.last
+def e.priority
+  @the_priority
+end
+
+def e.the_priority= p
+  @the_priority = p
+end
+channel = s.ops.get('tulak').primary_channel
+priorities.each do |p|
+  def e.maintenance?
+    false
+  end
+  e.the_priority = p
+  channel.send("tulak: #{Zabbirc.rich_text_formatter.format e.label}")
+
+  def e.maintenance?
+    true
+  end
+
+  channel.send("tulak: #{Zabbirc.rich_text_formatter.format e.label}")
+  sleep 1
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: zabbirc
 version: !ruby/object:Gem::Version
-  version: 0.2.1
+  version: 0.2.2
 platform: ruby
 authors:
 - Filip Zachar
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-11-16 00:00:00.000000000 Z
+date: 2015-11-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -130,7 +130,10 @@ files:
 - lib/zabbirc/logger.rb
 - lib/zabbirc/op.rb
 - lib/zabbirc/op_list.rb
+- lib/zabbirc/palettes/clean.rb
+- lib/zabbirc/palettes/default.rb
 - lib/zabbirc/priority.rb
+- lib/zabbirc/rich_text_formatter.rb
 - lib/zabbirc/service.rb
 - lib/zabbirc/services/base.rb
 - lib/zabbirc/services/events.rb
@@ -154,6 +157,7 @@ files:
 - spec/maintenance_command_spec.rb
 - spec/settings_command_spec.rb
 - spec/spec_helper.rb
+- spec/support/clean_palette.rb
 - spec/support/mock_bot.rb
 - spec/support/ops_builder.rb
 - templates/zabbirc_config.rb