rubix 0.0.9 → 0.0.10

data/VERSION

@@ -1 +1 @@
-0.0.9
+0.0.10

data/lib/rubix/associations.rb

@@ -6,8 +6,10 @@ module Rubix
     autoload :HasManyHostGroups,    'rubix/associations/has_many_host_groups'
     autoload :HasManyUserMacros,    'rubix/associations/has_many_user_macros'
     autoload :HasManyApplications,  'rubix/associations/has_many_applications'
+    autoload :HasManyItems,         'rubix/associations/has_many_items'
     
-    autoload :BelongsToHost, 'rubix/associations/belongs_to_host'
+    autoload :BelongsToHost,        'rubix/associations/belongs_to_host'
+    autoload :BelongsToTemplate,    'rubix/associations/belongs_to_template'
     
   end
 end

data/lib/rubix/associations/belongs_to_template.rb

@@ -0,0 +1,33 @@
+module Rubix
+  module Associations
+
+    module BelongsToTemplate
+
+      def template= h
+        return unless h
+        @template    = h
+        @template_id = h.id
+      end
+
+      def template
+        return @template if @template
+        return unless @template_id
+        @template = Template.find(:id => @template_id)
+      end
+
+      def template_id= tid
+        return unless tid
+        @template_id = tid
+      end
+
+      def template_id
+        return @template_id if @template_id
+        return unless @template
+        @template_id = @template.id
+      end
+
+    end
+  end
+end
+
+      

data/lib/rubix/associations/has_many_items.rb

@@ -0,0 +1,30 @@
+module Rubix
+  module Associations
+    module HasManyItems
+      
+      def items= is
+        return unless is
+        @items    = is
+        @item_ids = is.map(&:id)
+      end
+      
+      def items
+        return @items if @items
+        return unless @item_ids
+        @items = @item_ids.map { |iid| Item.find(:id => iid, :host_id => (host_id || template_id)) }
+      end
+
+      def item_ids= iids
+        return unless iids
+        @item_ids = iids
+      end
+      
+      def item_ids
+        return @item_ids if @item_ids
+        return unless @items
+        @item_ids = @items.map(&:id)
+      end
+      
+    end
+  end
+end

data/lib/rubix/models.rb

@@ -6,4 +6,5 @@ module Rubix
   autoload :Item,           'rubix/models/item'
   autoload :Application,    'rubix/models/application'
   autoload :UserMacro,      'rubix/models/user_macro'
+  autoload :Trigger,        'rubix/models/trigger'
 end

data/lib/rubix/models/item.rb

@@ -6,10 +6,29 @@ module Rubix
     # == Properties & Finding ==
     #
 
-    # The numeric code for a Zabbix item of type 'Zabbix trapper'.  The
-    # item must have this type in order for the Zabbix server to listen
-    # and accept data submitted by +zabbix_sender+.
-    TRAPPER_TYPE = 2.freeze
+    # The numeric codes for the various item types.
+    #
+    # Items without a type will be set to 'trapper' so they can be
+    # easily written to manually.
+    TYPE_CODES = {
+      :zabbix     => 0,
+      :snmpv1     => 1,
+      :trapper    => 2,
+      :simple     => 3,
+      :snmpv2c    => 4,
+      :internal   => 5,
+      :snmpv3     => 6,
+      :active     => 7,
+      :aggregate  => 8,
+      :httptest   => 9,
+      :external   => 10,
+      :db_monitor => 11,
+      :ipmi       => 12,
+      :ssh        => 13,
+      :telnet     => 14,
+      :calculated => 15
+    }.freeze
+    TYPE_NAMES = TYPE_CODES.invert.freeze
 
     # The numeric codes for the value types of a Zabbix item.  This Hash
     # is used by ZabbixPipe#value_code_from_value to dynamically set the
@@ -21,14 +40,7 @@ module Rubix
       :unsigned_int => 3,         # Numeric (unsigned)
       :text         => 4          # Text
     }.freeze
-
-    VALUE_NAMES = {
-      0 => :float,              # Numeric (float)
-      1 => :character,          # Character
-      2 => :log_line,           # Log
-      3 => :unsigned_int,       # Numeric (unsigned)
-      4 => :text                # Text
-    }.freeze
+    VALUE_NAMES = VALUE_CODES.invert.freeze
 
     # Return the +value_type+ name (:float, :text, &c.) for a Zabbix
     # item's value type by examining the given +value+.
@@ -48,17 +60,22 @@ module Rubix
     end
     
     attr_accessor :key, :description
-    attr_reader :value_type
+    attr_writer :type, :value_type
     
     def initialize properties={}
       super(properties)
       @key            = properties[:key]
       @description    = properties[:description]
+      @type           = properties[:type]
       
       self.value_type = properties[:value_type]
 
       self.host            = properties[:host]
       self.host_id         = properties[:host_id]
+
+      self.template        = properties[:template]
+      self.template_id     = properties[:template_id]
+      
       self.applications    = properties[:applications]
       self.application_ids = properties[:application_ids]
     end
@@ -67,12 +84,12 @@ module Rubix
       "#{self.class.resource_name} #{self.key || self.id}"
     end
 
-    def value_type= vt
-      if vt.nil? || vt.to_s.empty? || !self.class::VALUE_CODES.include?(vt.to_sym)
-        @value_type = :character
-      else
-        @value_type = vt.to_sym
-      end
+    def value_type
+      @value_type ||= :character
+    end
+
+    def type
+      @type ||= :trapper
     end
 
     #
@@ -80,6 +97,7 @@ module Rubix
     #
 
     include Associations::BelongsToHost
+    include Associations::BelongsToTemplate
     include Associations::HasManyApplications
 
     #
@@ -90,7 +108,7 @@ module Rubix
       {
         :hostid       => host_id,
         :description  => (description || 'Unknown'),
-        :type         => self.class::TRAPPER_TYPE,
+        :type         => self.class::TYPE_CODES[type],
         :key_         => key,
         :value_type   => self.class::VALUE_CODES[value_type],
       }.tap do |p|
@@ -117,7 +135,8 @@ module Rubix
             :id              => item[id_field].to_i,
             :host_id         => item['hostid'].to_i,
             :description     => item['description'],
-            :value_type      => item['value_type'] ? self::VALUE_NAMES[item['value_type'].to_i] : :character,
+            :type            => TYPE_NAMES[item['type'].to_i],
+            :value_type      => VALUE_NAMES[item['value_type'].to_i],
             :application_ids => (item['applications'] || []).map { |app| app['applicationid'].to_i },
             :key             => item['key_']
           })

data/lib/rubix/models/trigger.rb

@@ -0,0 +1,133 @@
+module Rubix
+  
+  class Trigger < Model
+
+    #
+    # == Properties & Finding ==
+    #
+
+    PRIORITY_NAMES = {
+      :not_classified => 0,
+      :information    => 1,
+      :warning        => 2,
+      :average        => 3,
+      :high           => 4,
+      :disaster       => 5
+    }.freeze
+    PRIORITY_CODES = PRIORITY_NAMES.invert.freeze
+
+    STATUS_NAMES = {
+      :enabled  => 0,
+      :disabled => 1
+    }.freeze
+    STATUS_CODES = STATUS_NAMES.invert.freeze
+    
+    attr_accessor :description, :url, :status, :priority, :comments
+    attr_reader   :expression
+    
+    def initialize properties={}
+      super(properties)
+      @description = properties[:description]
+      @url         = properties[:url]
+      @status      = properties[:status]
+      @priority    = properties[:priority]
+      @comments    = properties[:comments]
+
+      self.expression  = properties[:expression]
+      
+      self.host     = properties[:host]
+      self.template = properties[:template]
+      
+      self.template_id = properties[:template_id]
+      self.host_id = properties[:host_id]
+      
+      self.items    = properties[:items]
+      self.item_ids = properties[:item_ids]
+    end
+
+    def expression= e
+      if e =~ %r!^\{(.*)\}!
+        trigger_condition = $1
+        if trigger_condition && trigger_condition =~ /:/
+          host_or_template_name = trigger_condition.split(':').first
+          host_or_template = Template.find(:name => host_or_template_name) || Host.find(:name => host_or_template_name)
+          case host_or_template
+          when Host     then self.host = host_or_template
+          when Template then self.template = host_or_template
+          end
+        end
+      end
+      @expression = e
+    end
+
+    #
+    # == Associations ==
+    #
+
+    include Associations::BelongsToHost
+    include Associations::BelongsToTemplate
+    include Associations::HasManyItems
+
+    #
+    # == Requests == 
+    #
+    
+    def create_params
+      {
+        :templateid   => (template_id || host_id),
+        :description  => (description || 'Unknown'),
+        :expression   => expression,
+        :priority     => self.class::PRIORITY_CODES[priority],
+        :status       => self.class::STATUS_CODES[status],
+        :comments     => comments,
+        :url          => url
+      }
+    end
+
+    def self.get_params
+      super().merge(:select_items => :refer)
+    end
+    
+    def self.find_params options={}
+      fp = {
+        :filter => {
+          :description => options[:description]
+        }
+      }.tap do |fp|
+        case
+        when options[:template_id]
+          fp[:templateids] = [options[:template_id]]
+        when options[:host_id]
+          fp[:hostids] = [options[:host_id]]
+        end
+      end
+      super().merge(fp)
+    end
+
+    def self.build trigger
+      new({
+            :id              => trigger[id_field].to_i,
+            :description     => trigger['description'],
+            :expression      => trigger['expression'],
+            :comments        => trigger['comments'],
+            :url             => trigger['url'],
+            :status          => STATUS_CODES[trigger['status'].to_i],
+            :priority        => PRIORITY_CODES[trigger['priority'].to_i],
+            :item_ids        => (trigger['items'] || []).map { |item| item['itemid'].to_i }
+          }.merge(host_or_template_params_from_id(trigger['templateid'].to_i)))
+    end
+
+    def self.host_or_template_params_from_id id
+      template_or_host = Template.find(:id => id) || Host.find(:id => id)
+      case template_or_host
+      when Template
+        { :template => template_or_host }
+      when Host
+        { :host     => template_or_host }
+      else
+        {}
+      end
+    end
+    
+  end
+end

data/spec/requests/item_request_spec.rb

@@ -39,6 +39,7 @@ describe "Items" do
     it "can have its host, application, and properties updated" do
       @item.key          = 'rubix.spec2'
       @item.description  = 'rubix item description 2'
+      @item.type         = :external
       @item.value_type   = :unsigned_int
       @item.host_id      = @host_2.id
       @item.applications = [@app_2]
@@ -48,6 +49,8 @@ describe "Items" do
 
       new_item = Rubix::Item.find(:key => 'rubix.spec2', :host_id => @host_2.id)
       new_item.should_not be_nil
+      new_item.value_type.should == :unsigned_int
+      new_item.type.should       == :external
       new_item.host.name.should == @host_2.name
       new_item.applications.map(&:name).should include(@app_2.name)
     end

data/spec/requests/trigger_request_spec.rb

@@ -0,0 +1,99 @@
+require 'spec_helper'
+
+describe "Triggers" do
+
+  before do
+    integration_test
+    @host_group      = ensure_save(Rubix::HostGroup.new(:name => 'rubix_spec_host_group_1'))
+    
+    @template_1      = ensure_save(Rubix::Template.new(:name => 'rubix_spec_template_1', :host_groups => [@host_group]))
+    @template_2      = ensure_save(Rubix::Template.new(:name => 'rubix_spec_template_2', :host_groups => [@host_group]))
+    @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_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
+
+  after do
+    truncate_all_tables
+  end
+
+  describe "when not existing" do
+
+    it "returns nil on find" do
+      Rubix::Trigger.find(:template_id => @template_1.id, :description => 'rubix template trigger description 1').should be_nil
+      Rubix::Trigger.find(:host_id     => @host_1.id, :description => 'rubix host trigger description 1').should be_nil
+    end
+
+    it "can be created for a template" do
+      trigger = Rubix::Trigger.new(:expression => '{rubix_spec_template_1:rubix.spec1.count(120,1)}>1', :description => 'rubix template trigger description 1', :status => :enabled)
+      trigger.save.should be_true
+      trigger.template.name.should == @template_1.name
+    end
+
+    it "can be created for a host" do
+      trigger = Rubix::Trigger.new(:expression => '{rubix_spec_host_1:rubix.spec1.count(120,1)}>1', :description => 'rubix host trigger description 1', :status => :enabled)
+      trigger.save.should be_true
+      trigger.host.name.should == @host_1.name
+    end
+    
+  end
+
+  describe "when existing on a template" do
+
+    before do
+      @trigger = ensure_save(Rubix::Trigger.new(:expression => '{rubix_spec_template_1:rubix.spec1.count(120,1)}>1', :description => 'rubix template trigger description 1', :status => :enabled))
+    end
+
+    it "can have its host, description, and status updated" do
+      @trigger.status       = :disabled
+      @trigger.description  = 'rubix template trigger description 2'
+      # @trigger.host_id      = @template_2.id
+      @trigger.save.should be_true
+
+      Rubix::Trigger.find(:description => 'rubix template trigger description 1', :host_id => @template_1.id).should be_nil
+
+      new_trigger = Rubix::Trigger.find(:description => 'rubix template trigger description 2', :template_id => @template_1.id)
+      new_trigger.should_not be_nil
+      new_trigger.template.name.should == @template_1.name
+      new_trigger.items.map(&:id).should include(@template_item_1.id)
+      new_trigger.status.should == :disabled
+    end
+
+    it "can be destroyed" do
+      @trigger.destroy
+      Rubix::Trigger.find(:description => 'rubix template trigger description 1', :template_id => @template_1.id).should be_nil
+    end
+  end
+
+  describe "when existing on a host" do
+
+    before do
+      @trigger = ensure_save(Rubix::Trigger.new(:expression => '{rubix_spec_host_1:rubix.spec1.count(120,1)}>1', :description => 'rubix host trigger description 1', :status => :enabled))
+    end
+
+    it "can have its host, description, and status updated" do
+      @trigger.status       = :disabled
+      @trigger.description  = 'rubix host trigger description 2'
+      # @trigger.host_id      = @host_2.id
+      @trigger.save.should be_true
+
+      Rubix::Trigger.find(:description => 'rubix host trigger description 1', :host_id => @host_1.id).should be_nil
+
+      new_trigger = Rubix::Trigger.find(:description => 'rubix host trigger description 2', :host_id => @host_1.id)
+      new_trigger.should_not be_nil
+      new_trigger.host.name.should == @host_1.name
+      new_trigger.items.map(&:id).should include(@host_item_1.id)
+    end
+
+    it "can be destroyed" do
+      @trigger.destroy
+      Rubix::Trigger.find(:description => 'rubix host trigger description 1', :host_id => @host_1.id).should be_nil
+    end
+  end
+  
+end
+    

data/spec/support/integration_helper.rb

@@ -64,7 +64,7 @@ module Rubix
       $RUBIX_INTEGRATION_TEST = true
     end
 
-    RUBIX_TABLES_TO_TRUNCATE = %w[applications groups hostmacro hosts hosts_groups hosts_profiles hosts_profiles_ext hosts_templates items items_applications profiles triggers]
+    RUBIX_TABLES_TO_TRUNCATE = %w[applications groups hostmacro hosts hosts_groups hosts_profiles hosts_profiles_ext hosts_templates items items_applications profiles triggers trigger_depends]
     
     def self.truncate_all_tables
       return unless $RUBIX_INTEGRATION_TEST

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: rubix
 version: !ruby/object:Gem::Version 
-  hash: 13
+  hash: 11
   prerelease: 
   segments: 
   - 0
   - 0
-  - 9
-  version: 0.0.9
+  - 10
+  version: 0.0.10
 platform: ruby
 authors: 
 - Dhruv Bansal
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-12-05 00:00:00 Z
+date: 2011-12-12 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: rspec
@@ -90,6 +90,7 @@ files:
 - bin/zabbix_pipe
 - lib/rubix.rb
 - lib/rubix/models/template.rb
+- lib/rubix/models/trigger.rb
 - lib/rubix/models/user_macro.rb
 - lib/rubix/models/item.rb
 - lib/rubix/models/host.rb
@@ -106,8 +107,10 @@ files:
 - lib/rubix/response.rb
 - lib/rubix/associations/has_many_hosts.rb
 - lib/rubix/associations/has_many_applications.rb
+- lib/rubix/associations/belongs_to_template.rb
 - lib/rubix/associations/has_many_host_groups.rb
 - lib/rubix/associations/belongs_to_host.rb
+- lib/rubix/associations/has_many_items.rb
 - lib/rubix/associations/has_many_templates.rb
 - lib/rubix/associations/has_many_user_macros.rb
 - lib/rubix/monitors/chef_monitor.rb
@@ -126,6 +129,7 @@ files:
 - spec/requests/host_group_request_spec.rb
 - spec/requests/user_macro_request_spec.rb
 - spec/requests/template_request_spec.rb
+- spec/requests/trigger_request_spec.rb
 - spec/requests/host_request_spec.rb
 - spec/requests/application_request_spec.rb
 - spec/spec_helper.rb