rubix 0.0.12 → 0.1.0

data/VERSION

@@ -1 +1 @@
-0.0.12
+0.1.0

data/lib/rubix/associations.rb

@@ -10,6 +10,7 @@ module Rubix
     
     autoload :BelongsToHost,        'rubix/associations/belongs_to_host'
     autoload :BelongsToTemplate,    'rubix/associations/belongs_to_template'
+    autoload :BelongsToItem,        'rubix/associations/belongs_to_item'
     
   end
 end

data/lib/rubix/associations/belongs_to_item.rb

@@ -0,0 +1,34 @@
+module Rubix
+  module Associations
+
+    module BelongsToItem
+
+      def item= i
+        return unless i
+        @item    = i
+        @item_id = i.id
+      end
+
+      def item
+        return @item if @item
+        return unless @item_id
+        @item = Item.find(:id => @item_id)
+      end
+
+      def item_id= iid
+        puts "I AM TRYING TO SET ITEM_ID=#{iid}"
+        return unless iid
+        @item_id = iid
+      end
+
+      def item_id
+        return @item_id if @item_id
+        return unless @item
+        @item_id = @item.id
+      end
+
+    end
+  end
+end
+
+      

data/lib/rubix/models.rb

@@ -7,4 +7,5 @@ module Rubix
   autoload :Application,    'rubix/models/application'
   autoload :UserMacro,      'rubix/models/user_macro'
   autoload :Trigger,        'rubix/models/trigger'
+  autoload :TimeSeries,     'rubix/models/time_series'
 end

data/lib/rubix/models/item.rb

@@ -59,7 +59,7 @@ module Rubix
       self::VALUE_CODES[value_type_from_value(value)]
     end
     
-    attr_accessor :key, :description
+    attr_accessor :key, :description, :units
     attr_writer :type, :value_type
     
     def initialize properties={}
@@ -67,6 +67,7 @@ module Rubix
       @key            = properties[:key]
       @description    = properties[:description]
       @type           = properties[:type]
+      @units          = properties[:units]
       
       self.value_type = properties[:value_type]
 
@@ -110,9 +111,10 @@ module Rubix
         :description  => (description || 'Unknown'),
         :type         => self.class::TYPE_CODES[type],
         :key_         => key,
-        :value_type   => self.class::VALUE_CODES[value_type],
+        :value_type   => self.class::VALUE_CODES[value_type]
       }.tap do |p|
         p[:applications] = application_ids if application_ids
+        p[:units]        = units           if units
       end
     end
 
@@ -122,12 +124,14 @@ module Rubix
     
     def self.find_params options={}
       super().merge({
-                      :hostids => [options[:host_id]],
                       :filter => {
                         :key_ => options[:key],
                         :id   => options[:id]
                       }
-                    })
+                    }.tap do |o|
+                      o[:hostids] = [options[:host_id]] if options[:host_id]
+                    end
+                    )
     end
 
     def self.build item
@@ -138,9 +142,14 @@ module Rubix
             :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_']
+            :key             => item['key_'],
+            :units           => item['units']
           })
     end
+
+    def time_series options={}
+      TimeSeries.find(options.merge(:item_id => self.id, :item => self))
+    end
     
   end
 end

data/lib/rubix/models/time_series.rb

@@ -0,0 +1,101 @@
+module Rubix
+  
+  class TimeSeries < Model
+
+    #
+    # == Properties & Finding ==
+    #
+
+    attr_writer   :from, :upto
+    attr_writer   :raw_data
+    
+    def initialize properties={}
+      super(properties)
+      @from       = properties[:from]
+      @upto       = properties[:upto]
+      
+      self.item    = properties[:item]
+      self.item_id = properties[:item_id]
+      puts "MY ITEM ID IS #{self.item_id}"
+    end
+
+    def self.zabbix_name
+      'history'
+    end
+
+    def self.default_from
+      (Time.now - 3600).utc
+    end
+
+    def from
+      @from ||= self.class.default_from
+    end
+
+    def self.default_upto
+      Time.now.utc
+    end
+
+    def upto
+      @upto ||= self.class.default_upto
+    end
+
+    def raw_data
+      @raw_data ||= []
+    end
+
+    #
+    # == Associations ==
+    #
+
+    include Associations::BelongsToItem
+
+    #
+    # == Requests == 
+    #
+    
+    def self.get_params
+      super().merge(:output => :extend)
+    end
+    
+    def self.find_params options={}
+      super().merge({
+                      :itemids => [options[:item_id].to_s],
+                      :time_from => (options[:from] || default_from).to_i.to_s,
+                      :time_till => (options[:upto] || default_upto).to_i.to_s
+                    })
+    end
+
+    def self.find options={}
+      response = find_request(options)
+      case
+      when response.success?
+        new(options.merge(:raw_data => response.result))
+      else
+        error("Error finding #{resource_name} using #{options.inspect}: #{response.error_message}")
+      end
+    end
+
+    #
+    # == Transformations ==
+    #
+    
+    def parsed_data
+      return @parsed_data if @parsed_data
+      caster = case
+               when item.nil?                        then nil
+               when item.value_type == :float        then :to_f
+               when item.value_type == :unsigned_int then :to_i
+               end
+      @parsed_data = raw_data.map do |point|
+        next unless point.is_a?(Hash) && point['clock'] && point['value']
+        timestamp = point['clock'].to_i
+        next if timestamp == 0
+        {
+          'time'  => Time.at(timestamp),
+          'value' => (caster ? point['value'].send(caster) : point['value'])
+        }
+      end.compact
+    end
+    
+  end
+end

data/spec/requests/item_request_spec.rb

@@ -22,7 +22,7 @@ describe "Items" do
     end
 
     it "can be created" do
-      item = Rubix::Item.new(:key => 'rubix.spec1', :description => 'rubix item description 1', :host_id => @host_1.id, :value_type => :character, :applications => [@app_1])
+      item = Rubix::Item.new(:key => 'rubix.spec1', :description => 'rubix item description 1', :host_id => @host_1.id, :value_type => :character, :applications => [@app_1], :units => 'B')
       item.save.should be_true
       item.host.name.should == @host_1.name
       item.applications.map(&:name).should include(@app_1.name)
@@ -33,7 +33,7 @@ describe "Items" do
   describe "when existing" do
 
     before do
-      @item = ensure_save(Rubix::Item.new(:key => 'rubix.spec1', :description => 'rubix item description 1', :host_id => @host_1.id, :value_type => :character, :applications => [@app_1]))
+      @item = ensure_save(Rubix::Item.new(:key => 'rubix.spec1', :description => 'rubix item description 1', :host_id => @host_1.id, :value_type => :character, :applications => [@app_1], :units => 'B'))
     end
 
     it "can have its host, application, and properties updated" do
@@ -42,6 +42,7 @@ describe "Items" do
       @item.type         = :external
       @item.value_type   = :unsigned_int
       @item.host_id      = @host_2.id
+      @item.units        = 'MB'
       @item.applications = [@app_2]
       @item.save.should be_true
 
@@ -52,6 +53,7 @@ describe "Items" do
       new_item.value_type.should == :unsigned_int
       new_item.type.should       == :external
       new_item.host.name.should == @host_2.name
+      new_item.units.should == 'MB'
       new_item.applications.map(&:name).should include(@app_2.name)
     end
 

data/spec/requests/time_series_request_spec.rb

@@ -0,0 +1,55 @@
+require 'spec_helper'
+
+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]))
+  end
+
+  after do
+    truncate_all_tables
+  end
+
+  describe "setting a timeframe" do
+
+    it "should set a default timeframe" do
+      Rubix::TimeSeries.new.from.should_not be_nil
+      Rubix::TimeSeries.new.upto.should_not be_nil
+    end
+
+    it "should accept a given timeframe when querying" do
+      Rubix::TimeSeries.find_params(:item_id => 100, :from => '1327543430', :upto => Time.at(1327543450))[:time_from].should == '1327543430'
+      Rubix::TimeSeries.find_params(:item_id => 100, :from => '1327543430', :upto => Time.at(1327543450))[:time_till].should == '1327543450'
+    end
+  end
+  
+
+  describe "when the item doesn't exist" do
+
+    it "returns an empty TimeSeries" do
+      @ts = Rubix::TimeSeries.find(:item_id => 100)
+      @ts.should_not be_nil
+      @ts.raw_data.should be_empty
+      @ts.parsed_data.should be_empty
+    end
+
+  end
+
+  describe "when the item exists" do
+
+    before do
+      @item = ensure_save(Rubix::Item.new(:host_id => @host.id, :key => 'foo.bar.baz', :value_type => :unsigned_int, :description => "rubix item description"))
+    end
+
+    it "should parse the results properly" do
+      @ts = Rubix::TimeSeries.find(:item_id => @item.id)
+      @ts.should_not be_nil
+      @ts.should_receive(:raw_data).and_return([{'clock' => '1327543429', 'value' => '3'}, {'clock' => '1327543430'}])
+      @ts.parsed_data.should == [{'time' => Time.at(1327543429), 'value' => 3}]
+    end
+
+  end
+end
+    

data/spec/rubix/monitors/monitor_spec.rb

@@ -20,7 +20,7 @@ describe Rubix::Monitor do
 
     it "should be the default behavior when run with no arguments" do
       ::ARGV.replace([])
-      $stdout.should_receive(:puts).with(@measurement)
+      $stdout.should_receive(:puts).with(/data/)
       @wrapper.run
     end
 
@@ -47,13 +47,13 @@ describe Rubix::Monitor do
     it "should create a new file if called with a path that doesn't exist" do
       FileUtils.rm(@file.path) if File.exist?(@file.path)
       @wrapper.run
-      File.read(@file.path).should include(@measurement)
+      File.read(@file.path).should match(/data/)
     end
 
     it "should append to an existing file" do
       File.open(@file.path, 'w') { |f| f.puts('old content') }
       @wrapper.run
-      File.read(@file.path).should include(@measurement)
+      File.read(@file.path).should match(/data/)
       File.read(@file.path).should include('old content')
     end
   end

metadata

@@ -1,13 +1,12 @@
 --- !ruby/object:Gem::Specification 
 name: rubix
 version: !ruby/object:Gem::Version 
-  hash: 7
-  prerelease: 
+  prerelease: false
   segments: 
   - 0
+  - 1
   - 0
-  - 12
-  version: 0.0.12
+  version: 0.1.0
 platform: ruby
 authors: 
 - Dhruv Bansal
@@ -15,7 +14,8 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-12-16 00:00:00 Z
+date: 2012-02-01 00:00:00 -06:00
+default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: rspec
@@ -25,7 +25,6 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 3
         segments: 
         - 0
         version: "0"
@@ -39,7 +38,6 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 3
         segments: 
         - 0
         version: "0"
@@ -53,7 +51,6 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 3
         segments: 
         - 0
         version: "0"
@@ -67,7 +64,6 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 31
         segments: 
         - 0
         - 4
@@ -96,6 +92,7 @@ files:
 - lib/rubix/models/host.rb
 - lib/rubix/models/host_group.rb
 - lib/rubix/models/model.rb
+- lib/rubix/models/time_series.rb
 - lib/rubix/models/application.rb
 - lib/rubix/examples/es_monitor.rb
 - lib/rubix/examples/mongo_monitor.rb
@@ -110,6 +107,7 @@ files:
 - 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/belongs_to_item.rb
 - lib/rubix/associations/has_many_items.rb
 - lib/rubix/associations/has_many_templates.rb
 - lib/rubix/associations/has_many_user_macros.rb
@@ -125,6 +123,7 @@ files:
 - spec/rubix/response_spec.rb
 - spec/rubix/sender_spec.rb
 - spec/rubix/connection_spec.rb
+- spec/requests/time_series_request_spec.rb
 - spec/requests/item_request_spec.rb
 - spec/requests/host_group_request_spec.rb
 - spec/requests/user_macro_request_spec.rb
@@ -139,6 +138,7 @@ files:
 - LICENSE
 - README.rdoc
 - VERSION
+has_rdoc: true
 homepage: http://github.com/dhruvbansal/rubix
 licenses: []
 
@@ -152,7 +152,6 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 3
       segments: 
       - 0
       version: "0"
@@ -161,14 +160,13 @@ required_rubygems_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 3
       segments: 
       - 0
       version: "0"
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.8.5
+rubygems_version: 1.3.7
 signing_key: 
 specification_version: 3
 summary: A Ruby client for configuring and writing data to Zabbix