rubix 0.5.4 → 0.5.5

data/VERSION

@@ -1 +1 @@
-0.5.4
+0.5.5

data/lib/rubix.rb

@@ -47,6 +47,8 @@ module Rubix
   # @return [true, false]
   def self.connected?
     (!! connection)
+  rescue ConnectionError, AuthenticationError, RequestError
+    false
   end
 
   # Is Rubix presently connected and authorized with a Zabbix server?

data/lib/rubix/connection.rb

@@ -1,6 +1,7 @@
 require 'uri'
 require 'cgi'
 require 'net/http'
+require 'net/https'
 require 'json'
 
 require 'rubix/log'
@@ -127,6 +128,10 @@ module Rubix
         @uri = URI.parse(string)
       end
       @server = Net::HTTP.new(uri.host, uri.port)
+      if @uri.scheme == 'https' 
+        @server.use_ssl = true
+      end
+      return @server
     end
 
     protected
@@ -180,7 +185,7 @@ module Rubix
       @request_id += 1
       begin
         raw_response = server.request(raw_api_request(raw_params))
-      rescue NoMethodError, SocketError => e
+      rescue NoMethodError, Errno::ECONNREFUSED, SocketError => e
         raise RequestError.new("Could not connect to Zabbix server at #{host_with_port}")
       end
       raw_response
@@ -202,7 +207,7 @@ module Rubix
       # @request_id += 1
       begin
         raw_response = server.request(raw_web_request(verb, path, data))
-      rescue NoMethodError, SocketError => e
+      rescue NoMethodError, Errno::ECONNREFUSED, SocketError => e
         raise RequestError.new("Could not connect to the Zabbix server at #{host_with_port}")
       end
     end

data/lib/rubix/log.rb

@@ -30,7 +30,7 @@ module Rubix
   #
   # Will attempt to read from
   #
-  # - <tt>Settings[:log_level]</tt> if <tt>Settings</tt> is defined (see Configliere[http://github.com/infochimps/configliere])
+  # - <tt>Settings[:log_level]</tt> if <tt>Settings</tt> is defined (see Configliere[https://github.com/infochimps-labs/configliere])
   # - the <tt>RUBIX_LOG_LEVEL</tt> environment variable if defined
   #
   # The default is 'info'.
@@ -57,7 +57,7 @@ module Rubix
   #
   # Will attempt to read from
   #
-  # - <tt>Settings[:log]</tt> if <tt>Settings</tt> is defined (see Configliere[http://github.com/infochimps/configliere])
+  # - <tt>Settings[:log]</tt> if <tt>Settings</tt> is defined (see Configliere[https://github.com/infochimps-labs/configliere])
   # - the <tt>RUBIX_LOG_PATH</tt> environment variable if defined
   #
   # Defaults to writing <tt>stdout</tt>.

data/lib/rubix/models/host.rb

@@ -10,7 +10,7 @@ module Rubix
     # server.
     BLANK_IP = '0.0.0.0'
 
-    # The default port.
+    # The default port on the Host at which Zabbix agent is listening.
     DEFAULT_PORT = 10050
 
     # The numeric codes for the various status types.
@@ -23,7 +23,27 @@ module Rubix
       :proxy_active  => 5,
       :proxy_passive => 6
     }
+    
+    # The numeric codes for IPMI authentication algorithms.
+    zabbix_define :IPMI_AUTH, {
+      :default   => -1,
+      :none      => 0,
+      :md2       => 1,
+      :md5       => 2,
+      :straight  => 4,
+      :oem       => 5, 
+      :rmcp_plus => 6 
+    }
 
+    # The numeric codes for IPMI priviledge levels.
+    zabbix_define :IPMI_PRIVILEGE, {
+      :callback => 1,
+      :user     => 2,
+      :operator => 3,
+      :admin    => 4, 
+      :oem      => 5
+    }
+    
     zabbix_attr :name
     zabbix_attr :ip
     zabbix_attr :port
@@ -32,6 +52,13 @@ module Rubix
     zabbix_attr :status
     zabbix_attr :use_ip,    :default => true
     zabbix_attr :monitored, :default => true
+    zabbix_attr :use_ipmi,  :default => false
+    zabbix_attr :ipmi_port, :default => 623
+    zabbix_attr :ipmi_username
+    zabbix_attr :ipmi_password
+    zabbix_attr :ipmi_ip
+    zabbix_attr :ipmi_authtype 
+    zabbix_attr :ipmi_privilege, :default => :user
     
     def initialize properties={}
       super(properties)
@@ -56,6 +83,11 @@ module Rubix
       @monitored = true
     end
     
+    def use_ipmi
+      return @use_ipmi if (!@use_ipmi.nil?)
+      @use_ipmi = false
+    end
+    
     #
     # == Associations == 
     #
@@ -70,6 +102,11 @@ module Rubix
 
     def validate
       raise ValidationError.new("A host must have at least one host group.") if host_group_ids.nil? || host_group_ids.empty?
+      raise ValidationError.new("A host must have a valid ip address if use_ip is set.") if use_ip && ip == self.class::BLANK_IP
+      raise ValidationError.new("A host must have an ip address if use_ip is set.") if use_ip && (ip.nil? || ip.empty?)
+      raise ValidationError.new("A host must have a dns name if use_ip is false.") if !use_ip && dns.nil?
+      raise ValidationError.new("A host must have a ipmi_privilege defined as one of: " + self.class::IPMI_PRIVILEGE_CODES.keys.to_s) if use_ipmi && self.class::IPMI_PRIVILEGE_CODES[ipmi_privilege].nil?
+      raise ValidationError.new("A host must have a ipmi_authtype defined as one of: " + self.class::IPMI_AUTH_CODES.keys.to_s) if use_ipmi && self.class::IPMI_AUTH_CODES[ipmi_authtype].nil?
       true
     end
     
@@ -85,21 +122,26 @@ module Rubix
         :macros    => user_macro_params
       }.tap do |hp|
         hp[:profile] = profile if profile
+        hp[:profile].delete("hostid") if hp[:profile] && hp[:profile]["hostid"]
         hp[:status]  = (monitored ? 0 : 1) unless monitored.nil?
         
-        case
-        when use_ip == true && (!ip.nil?) && (!ip.empty?)
-          hp[:useip] = 1
-          hp[:ip]    = ip
-          hp[:port]  = port || self.class::DEFAULT_PORT
-        when (!dns.nil?) && (!dns.empty?)
-          hp[:useip] = 0
-          hp[:dns]   = dns
-          hp[:port]  = port || self.class::DEFAULT_PORT
-        else
-          hp[:ip] = self.class::BLANK_IP
-          hp[:useip] = 1
-        end
+        # Check to see if use_ip is set, otherwise we will use dns
+        hp[:useip]          = (use_ip == true ? 1 : 0)
+        
+        # if we have an IP then use it, otherwise use 0.0.0.0, same goes for the port
+        hp[:ip]             = ip   || self.class::BLANK_IP
+        hp[:port]           = port || self.class::DEFAULT_PORT
+        
+        # Always allow for a DNS record to exist even if we dont use it to monitor.
+        hp[:dns]            = dns           if dns
+        
+        hp[:useipmi]        = (use_ipmi == true ? 1 : 0)
+        hp[:ipmi_port]      = ipmi_port     if ipmi_port
+        hp[:ipmi_username]  = ipmi_username if ipmi_username
+        hp[:ipmi_password]  = ipmi_password if ipmi_password
+        hp[:ipmi_ip]        = ipmi_ip       if ipmi_ip
+        hp[:ipmi_authtype]  = self.class::IPMI_AUTH_CODES[ipmi_authtype]       if ipmi_authtype
+        hp[:ipmi_privilege] = self.class::IPMI_PRIVILEGE_CODES[ipmi_privilege] if ipmi_privilege
       end
     end
     
@@ -132,6 +174,7 @@ module Rubix
     end
 
     def self.build host
+      host['profile'].delete('hostid') if host.is_a?(Hash) && host['profile'].is_a?(Hash) && host['profile']['hostid']
       new({
             :id             => host[id_field].to_i,
             :name           => host['host'],
@@ -142,13 +185,20 @@ module Rubix
             :port           => host['port'],
             :ip             => host['ip'],
             :dns            => host['dns'],
-            :use_ip         => (host['useip'].to_i  == '1'),
+            :use_ip         => (host['useip'].to_i  == 1),
 
             # If the status is '1' then this is an unmonitored host.
             # Otherwise it's either '0' for monitored and ok or
             # something else for monitored and *not* ok.
             :monitored      => (host['status'].to_i == 1 ? false : true),
-            :status         => self::STATUS_NAMES[host['status'].to_i]
+            :status         => self::STATUS_NAMES[host['status'].to_i],
+            :use_ipmi       => (host['useipmi'].to_i == 1),
+            :ipmi_port      => host['ipmi_port'].to_i,
+            :ipmi_username  => host['ipmi_username'],
+            :ipmi_password  => host['ipmi_password'],
+            :ipmi_ip        => host['ipmi_ip'],
+            :ipmi_authtype  => self::IPMI_AUTH_NAMES[host['ipmi_authtype'].to_i],
+            :ipmi_privilege => self::IPMI_PRIVILEGE_NAMES[host['ipmi_privilege'].to_i]
           })
     end
     

data/spec/requests/application_request_spec.rb

@@ -5,7 +5,7 @@ describe "Applications" do
   before do
     integration_test
     @host_group = ensure_save(Rubix::HostGroup.new(:name => 'rubix_spec_host_group_1'))
-    @host = ensure_save(Rubix::Host.new(:name => 'rubix_spec_host_1', :host_groups => [@host_group]))
+    @host = ensure_save(Rubix::Host.new(:name => 'rubix_spec_host_1', :host_groups => [@host_group], :ip => '123.123.123.123'))
   end
 
   after do

data/spec/requests/host_request_spec.rb

@@ -4,7 +4,7 @@ describe "Hosts" do
 
   before do
     integration_test
-    @host_group_1 = ensure_save(Rubix::HostGroup.new(:name => 'rubix_spec_host_group_1'))
+    @host_group_1 = ensure_save(Rubix::HostGroup.new(:name => 'rubix_spec_host_group_1', :ip => '123.123.123.123'))
   end
 
   after do
@@ -26,10 +26,11 @@ describe "Hosts" do
     end
     
     it "can be created" do
-      host = Rubix::Host.new(:name => 'rubix_spec_host_1', :host_groups => [@host_group_1])
+      host = Rubix::Host.new(:name => 'rubix_spec_host_1', :host_groups => [@host_group_1], :ip => '123.123.123.123')
       host.save.should be_true
       host.monitored.should be_true
       host.use_ip.should be_true
+      host.ip.should == '123.123.123.123'
     end
   end
 

data/spec/requests/item_request_spec.rb

@@ -5,8 +5,8 @@ describe "Items" do
   before do
     integration_test
     @host_group = ensure_save(Rubix::HostGroup.new(:name => 'rubix_spec_host_group_1'))
-    @host_1     = ensure_save(Rubix::Host.new(:name => 'rubix_spec_host_1', :host_groups => [@host_group]))
-    @host_2     = ensure_save(Rubix::Host.new(:name => 'rubix_spec_host_2', :host_groups => [@host_group]))
+    @host_1     = ensure_save(Rubix::Host.new(:name => 'rubix_spec_host_1', :host_groups => [@host_group], :ip => '123.123.123.123'))
+    @host_2     = ensure_save(Rubix::Host.new(:name => 'rubix_spec_host_2', :host_groups => [@host_group], :ip => '123.123.123.124'))
     @app_1      = ensure_save(Rubix::Application.new(:name => 'rubix_spec_app_1', :host_id => @host_1.id))
     @app_2      = ensure_save(Rubix::Application.new(:name => 'rubix_spec_app_1', :host_id => @host_2.id))
   end

data/spec/requests/time_series_request_spec.rb

@@ -5,7 +5,7 @@ describe "TimeSeries" do
   before do
     integration_test
     @host_group = ensure_save(Rubix::HostGroup.new(:name => 'rubix_spec_host_group_1'))
-    @host       = ensure_save(Rubix::Host.new(:name => 'rubix_spec_host_1', :host_groups => [@host_group]))        
+    @host       = ensure_save(Rubix::Host.new(:name => 'rubix_spec_host_1', :host_groups => [@host_group], :ip => '123.123.123.123'))
   end
 
   after do

data/spec/requests/trigger_request_spec.rb

@@ -11,8 +11,8 @@ describe "Triggers" do
     @template_item_1 = ensure_save(Rubix::Item.new(:key => 'rubix.spec1', :description => 'rubix template item description 1', :host_id => @template_1.id, :value_type => :character))
     @template_item_2 = ensure_save(Rubix::Item.new(:key => 'rubix.spec2', :description => 'rubix template item description 2', :host_id => @template_2.id, :value_type => :character))
     
-    @host_1          = ensure_save(Rubix::Host.new(:name => 'rubix_spec_host_1', :host_groups => [@host_group]))
-    @host_2          = ensure_save(Rubix::Host.new(:name => 'rubix_spec_host_2', :host_groups => [@host_group]))
+    @host_1          = ensure_save(Rubix::Host.new(:name => 'rubix_spec_host_1', :host_groups => [@host_group], :ip => '123.123.123.123'))
+    @host_2          = ensure_save(Rubix::Host.new(:name => 'rubix_spec_host_2', :host_groups => [@host_group], :ip => '123.123.123.124'))
     @host_item_1     = ensure_save(Rubix::Item.new(:key => 'rubix.spec1', :description => 'rubix host item description 1', :host_id => @host_1.id, :value_type => :character))
     @host_item_2     = ensure_save(Rubix::Item.new(:key => 'rubix.spec2', :description => 'rubix host item description 2', :host_id => @host_2.id, :value_type => :character))
   end

data/spec/requests/user_macro_request_spec.rb

@@ -5,7 +5,7 @@ describe "User Macros" do
   before do
     integration_test
     @host_group = ensure_save(Rubix::HostGroup.new(:name => 'rubix_spec_host_group_1'))
-    @host       = ensure_save(Rubix::Host.new(:name => 'rubix_spec_host_1', :host_groups => [@host_group]))
+    @host       = ensure_save(Rubix::Host.new(:name => 'rubix_spec_host_1', :host_groups => [@host_group], :ip => '123.123.123.123'))
   end
 
   after do

data/spec/support/integration_helper.rb

@@ -162,6 +162,6 @@ module Rubix
     def data_path *args
       File.join(File.expand_path('../../data', __FILE__), *args)
     end
-    
+
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rubix
 version: !ruby/object:Gem::Version
-  version: 0.5.4
+  version: 0.5.5
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-03-08 00:00:00.000000000Z
+date: 2012-05-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &17098960 !ruby/object:Gem::Requirement
+  requirement: &17590460 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *17098960
+  version_requirements: *17590460
 - !ruby/object:Gem::Dependency
   name: mysql2
-  requirement: &17098520 !ruby/object:Gem::Requirement
+  requirement: &17589800 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *17098520
+  version_requirements: *17589800
 - !ruby/object:Gem::Dependency
   name: json
-  requirement: &17098000 !ruby/object:Gem::Requirement
+  requirement: &17589040 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - <=
@@ -43,10 +43,10 @@ dependencies:
         version: 1.6.1
   type: :runtime
   prerelease: false
-  version_requirements: *17098000
+  version_requirements: *17589040
 - !ruby/object:Gem::Dependency
   name: configliere
-  requirement: &17097460 !ruby/object:Gem::Requirement
+  requirement: &17588500 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,10 +54,10 @@ dependencies:
         version: 0.4.8
   type: :runtime
   prerelease: false
-  version_requirements: *17097460
+  version_requirements: *17588500
 - !ruby/object:Gem::Dependency
   name: multipart-post
-  requirement: &17097080 !ruby/object:Gem::Requirement
+  requirement: &17588120 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,7 +65,7 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *17097080
+  version_requirements: *17588120
 description: Rubix provides abstractions for connecting to Zabbix's API, an ORM for
   wrapping Zabbix resources, a set of scripts for writing data to Zabbix, and a collection
   of Monitor classes for building periodic monitors.