Zabbix-2.0

.gitignore

@@ -39,3 +39,4 @@ TAGS*
 a.out
 nohop.out
 spec/test.yml
+tmp/

Gemfile

@@ -19,6 +19,7 @@ end
 # Gems for testing and coverage
 group :test do
   gem 'simplecov',   ">= 0.5",   :platform => [:ruby_19],   :require => false
+  gem 'pg'
 end
 
 # Gems you would use if hacking on this gem (rather than with it)

VERSION

@@ -1 +1 @@
-0.5.14
+0.5.21

lib/rubix.rb

@@ -7,6 +7,8 @@
 
 module Rubix
 
+  SERVER_VERSIONS = ['2.0.4', '2.0.5'].freeze
+
   autoload :Connection,     'rubix/connection'
   autoload :Response,       'rubix/response'
   autoload :Sender,         'rubix/sender'
@@ -77,7 +79,7 @@ def self.version
       File.read(File.expand_path('../../VERSION', __FILE__)).chomp
     rescue => e
       'unknown'
-    end    
+    end
   end
 
   # Base class for Rubix errors.
@@ -99,5 +101,8 @@ def self.version
 
   # Given an incorrect argument.
   ArgumentError       = Class.new(Error)
-
+
+  # Incorrect version of Zabbix server
+  VersionError        = Class.new(Error)
+
 end

lib/rubix/associations.rb

@@ -1,6 +1,6 @@
 module Rubix
   module Associations
-    
+
     autoload :HasManyHosts,         'rubix/associations/has_many_hosts'
     autoload :HasManyTemplates,     'rubix/associations/has_many_templates'
     autoload :HasManyHostGroups,    'rubix/associations/has_many_host_groups'
@@ -11,15 +11,19 @@ module Associations
     autoload :HasManyUserGroups,    'rubix/associations/has_many_user_groups'
     autoload :HasManyConditions,    'rubix/associations/has_many_conditions'
     autoload :HasManyInterfaces,    'rubix/associations/has_many_interfaces'
+    autoload :HasManyScreenItems,   'rubix/associations/has_many_screen_items'
+    autoload :HasManyGraphItems,    'rubix/associations/has_many_graph_items'
     autoload :HasInventory,         'rubix/associations/has_inventory'
-
+    autoload :HasMessage,           'rubix/associations/has_message'
+
     autoload :BelongsToHost,        'rubix/associations/belongs_to_host'
     autoload :BelongsToTemplate,    'rubix/associations/belongs_to_template'
     autoload :BelongsToItem,        'rubix/associations/belongs_to_item'
     autoload :BelongsToAction,      'rubix/associations/belongs_to_action'
     autoload :BelongsToUser,        'rubix/associations/belongs_to_user'
     autoload :BelongsToUserGroup,   'rubix/associations/belongs_to_user_group'
     autoload :BelongsToMediaType,   'rubix/associations/belongs_to_media_type'
+    autoload :BelongsToInterface,   'rubix/associations/belongs_to_interface'
   end
 end
 

lib/rubix/associations/belongs_to_interface.rb

@@ -0,0 +1,32 @@
+module Rubix
+  module Associations
+
+    module BelongsToInterface
+
+      def interface= i
+        return unless i
+        @interface    = i
+        @interface_id = i.id
+      end
+
+      def interface
+        return @interface if @host
+        return unless @interface_id
+        @interface = Interface.find(:id => @host_id)
+      end
+
+      def interface_id= hid
+        return unless hid
+        @interface_id = hid
+      end
+
+      def interface_id
+        return @interface_id if @host_id
+        return unless @interface
+        @interface_id = @host.id
+      end
+
+    end
+  end
+end
+

lib/rubix/associations/has_many_conditions.rb

@@ -15,9 +15,6 @@ def conditions= cs
           c.kind_of?(Condition) ? c : Condition.new(c)
         end
       end
-
     end
   end
 end
-
-

lib/rubix/associations/has_many_graph_items.rb

@@ -0,0 +1,15 @@
+module Rubix
+  module Associations
+    module HasManyGraphItems
+
+      def graph_items= sis
+        @graph_items    = sis
+      end
+
+      def graph_items
+        @graph_items || []
+      end
+    end
+  end
+end
+

lib/rubix/associations/has_many_interfaces.rb

@@ -34,5 +34,3 @@ def interface_params
     end
   end
 end
-
-

lib/rubix/associations/has_many_screen_items.rb

@@ -0,0 +1,15 @@
+module Rubix
+  module Associations
+    module HasManyScreenItems
+
+      def screen_items= sis
+        @screen_items    = sis
+      end
+
+      def screen_items
+        @screen_items || []
+      end
+    end
+  end
+end
+

lib/rubix/associations/has_many_templates.rb

@@ -1,13 +1,13 @@
 module Rubix
   module Associations
     module HasManyTemplates
-      
+
       def templates= hs
         return unless hs
         @templates    = hs
         @template_ids = hs.map(&:id)
       end
-      
+
       def templates
         return @templates if @templates
         return unless @template_ids
@@ -18,7 +18,7 @@ def template_ids= tids
         return unless tids
         @template_ids = tids
       end
-      
+
       def template_ids
         return @template_ids if @template_ids
         return unless @templates
@@ -27,11 +27,8 @@ def template_ids
 
       def template_params
         return [] unless template_ids
-        template_ids.map { |tid| { 'templateid' => tid } }
+        template_ids.uniq.map { |tid| { 'templateid' => tid } }
       end
-
     end
   end
 end
-
-

lib/rubix/associations/has_many_user_groups.rb

@@ -21,7 +21,7 @@ def user_group_ids= ugids
 
       def user_group_ids
         return @user_group_ids if @user_group_ids
-        return unless @user_groups
+        return [] unless @user_groups
         @user_group_ids = @user_groups.map(&:id)
       end
 

lib/rubix/associations/has_message.rb

@@ -0,0 +1,15 @@
+module Rubix
+  module Associations
+    module HasMessage
+
+      def message
+        @message
+      end
+
+      def message= m
+        @message = m.kind_of?(Message) ? m : Message.new(m)
+      end
+    end
+  end
+end
+

lib/rubix/connection.rb

@@ -42,6 +42,9 @@ class Connection
     # @return [Rubix::Response] the last response from the Zabbix API -- useful for logging purposes
     attr_reader :last_response
 
+    # @return [Hash] the last request to the Zabbix API -- useful for debugging purposes
+    attr_reader :last_request
+
     # Set up a connection to a Zabbix API.
     #
     # The +uri_or_string+ can be either a string or a <tt>URI</tt>
@@ -74,6 +77,8 @@ def initialize uri_or_string, username=nil, password=nil
     # @return [Rubix::Response]
     def request method, params
       authorize! unless authorized?
+      @last_request = {:method  => method, :params  => params}
+
       response = till_response do
         send_api_request :jsonrpc => "2.0",
         :id      => request_id,
@@ -114,6 +119,9 @@ def authorize!
       raise AuthenticationError.new("Could not authenticate with Zabbix API at #{uri}: #{response.error_message}") if response.error?
       raise AuthenticationError.new("Malformed response from Zabbix API: #{response.body}") unless response.string?
       @auth = response.result
+
+      raise VersionError.new("Incorrect Zabbix Server API version #{api_version}, should be one of #{SERVER_VERSIONS.join(', ')}") unless SERVER_VERSIONS.include? api_version
+      @auth
     end
 
     # Set the URI for this connection's Zabbix API server.
@@ -134,6 +142,10 @@ def uri= uri_or_string
       return @server
     end
 
+    def api_version
+      @api_version ||= request('apiinfo.version', {}).result
+    end
+
     protected
 
     # The parameters used for constructing an authorization request

lib/rubix/models.rb

@@ -18,4 +18,9 @@ module Rubix
   autoload :Medium,          'rubix/models/medium'
   autoload :Interface,       'rubix/models/interface'
   autoload :Inventory,       'rubix/models/inventory'
+  autoload :Graph,           'rubix/models/graph'
+  autoload :GraphItem,       'rubix/models/graph_item'
+  autoload :Screen,          'rubix/models/screen'
+  autoload :ScreenItem,      'rubix/models/screen_item'
+  autoload :Message,         'rubix/models/message'
 end

lib/rubix/models/action.rb

@@ -21,7 +21,7 @@ class Action < Model
 
     zabbix_attr :name,                     :required => true
     zabbix_attr :event_source,             :default => :triggers, :required => true
-    zabbix_attr :escalation_time,          :default => 0
+    zabbix_attr :escalation_time,          :default => 60
     zabbix_attr :enabled,                  :default => true
     zabbix_attr :message_subject,          :default => MESSAGE_SUBJECT
     zabbix_attr :message_body,             :default => MESSAGE_BODY
@@ -91,7 +91,7 @@ def self.find_params options={}
     end
 
     def self.get_params
-      super().merge({:select_conditions => :refer, :select_operations => :refer})
+      super().merge({:selectConditions => :refer, :selectOperations => :refer})
     end
 
     def self.build action
@@ -107,8 +107,8 @@ def self.build action
             :send_recovery_message    => (action['recovery_msg'].to_i == 1),
             :recovery_message_subject => action['r_shortdata'],
             :recovery_message_body    => action['r_longdata'],
-            :conditions               => (action['conditions'] || []).map { |c| Condition.build(c) },
-            :operations               => (action['operations'] || []).map { |o| Operation.build(o) }
+            :conditions               => (action['conditions'] || []).map { |id, c| Condition.build(c) },
+            :operations               => (action['operations'] || []).map { |id, o| Operation.build(o) }
           })
     end
 

lib/rubix/models/graph.rb

@@ -0,0 +1,65 @@
+module Rubix
+  class Graph < Model
+    include Associations::HasManyGraphItems
+    #
+    # == Properties & Finding ==
+    #
+
+    def initialize properties={}
+      super(properties)
+      self.graph_items = properties[:graph_items].map { |gi| gi.is_a?(GraphItem) ? gi : GraphItem.new(gi) } if properties[:graph_items]
+    end
+
+    zabbix_attr :name,   :required => true
+    zabbix_attr :width,  :required => true
+    zabbix_attr :height, :required => true
+
+    #
+    # == Validation =
+    #
+
+    def validate
+      raise ValidationError.new("A graph must have at least one graph item.") if graph_items.nil? || graph_items.empty?
+      graph_items.each do |gi|
+        raise ValidationError.new("A graph item must have item_id property.") unless gi.item_id
+        raise ValidationError.new("A graph item must have color property.")   unless gi.color
+      end
+      true
+    end
+
+    #
+    # == Requests ==
+    #
+
+    def create_params
+      {
+        :name => name, :height => height, :width => width,
+        :gitems => self.graph_items.map { |gi| gi.create_params }
+      }
+    end
+
+    def update_params
+      { id_field => id, :name => name, :hosts => {:hostid => host_id}}
+    end
+
+    def self.find_params options={}
+      super().merge({
+                      :selectGraphItems => 'extend',
+                      :filter => {
+                        :name   => options[:name],
+                        id_field => options[:id]
+                      }
+                    })
+    end
+
+    def self.build app
+      params = {
+        :id   => app[id_field].to_i,
+        :name => app['name'],
+        :graph_items => (app['gitems'] || []).map { |id, gi| GraphItem.build gi }
+      }
+      new(params)
+    end
+  end
+end
+