activerecord-zabbix 0.1.0 → 0.1.1

data/README.md

@@ -8,7 +8,7 @@ Although some attempt `may be` (later) made to facilitate this integrating seaml
 Quick Start
 -----------
 
-`gem install activerecord-zabbix`  # once published... (to rubygems-org)
+`gem install activerecord-zabbix`
 
 <pre>
 	
@@ -35,5 +35,13 @@ end
 
 </pre>
 
+Schema (partially implemented)
+------------------------------
 
-[Schema Diagram](https://docs.google.com/drawings/d/12sIp0gAaoAlLOVluyiSLSFYhTiuw8txoUL67BDUVxvc/edit)
+![Schema Diagram](https://github.com/cluetechnologies/activerecord-zabbix/raw/develop/schema.png)
+
+[Schema Diagram - Googledoc](https://docs.google.com/drawings/d/12sIp0gAaoAlLOVluyiSLSFYhTiuw8txoUL67BDUVxvc/edit)
+
+
+
+[cloudseed](http://cloudseed.co.za) infrastructure monitored by [zabbix](http://www.zabbix.co.za)

data/activerecord-zabbix.gemspec

@@ -19,31 +19,31 @@ Gem::Specification.new do |spec|
   spec.files = [
     
     #
-    # du -a lib/ spec/ README* *.gemspec | awk '{print($2)}' | while read file; do echo "'$file',"; done
+    # du -a lib spec README* *.gemspec | awk '{print($2)}' | while read file; do echo "'$file',"; done
     # 
     
-    'lib//activerecord-zabbix.rb',
-    'lib//boot.rb',
-    'lib//zabbix/connect.rb',
-    'lib//zabbix/function.rb',
-    'lib//zabbix/host.rb',
-    'lib//zabbix/item.rb',
-    'lib//zabbix/trigger.rb',
-    'lib//zabbix/version.rb',
-    'lib//zabbix/zabbix.rb',
-    'lib//zabbix',
-    'lib/',
-    'spec//README',
-    'spec//spec_helper.rb',
-    'spec//zabbix/connect_spec.rb',
-    'spec//zabbix/function_spec.rb',
-    'spec//zabbix/host_spec.rb',
-    'spec//zabbix/item_spec.rb',
-    'spec//zabbix/trigger_spec.rb',
-    'spec//zabbix',
-    'spec/',
+    'lib/activerecord-zabbix.rb',
+    'lib/boot.rb',
+    'lib/zabbix/connect.rb',
+    'lib/zabbix/function.rb',
+    'lib/zabbix/host.rb',
+    'lib/zabbix/item.rb',
+    'lib/zabbix/trigger.rb',
+    'lib/zabbix/version.rb',
+    'lib/zabbix/zabbix.rb',
+    'lib/zabbix',
+    'lib',
+    'spec/README',
+    'spec/spec_helper.rb',
+    'spec/zabbix/connect_spec.rb',
+    'spec/zabbix/function_spec.rb',
+    'spec/zabbix/host_spec.rb',
+    'spec/zabbix/item_spec.rb',
+    'spec/zabbix/trigger_spec.rb',
+    'spec/zabbix',
+    'spec',
     'README.md',
-    'activerecord-zabbix.gemspec'  #,
+    'activerecord-zabbix.gemspec'
     
   ]
   

data/lib/zabbix/connect.rb

@@ -17,6 +17,12 @@ module Zabbix
     
     @logger = logger
     
+    @logger.info( 
+    
+      "CONNECT: Zabbix::connect({:host => '#{config[:host]}',:database => '#{config[:database]}'})"
+    
+    ) unless @logger.nil?
+    
     if config.nil?
       
       config = load_standard_rails_things_for_db__and_feel_free_to_rename_this_function
@@ -24,17 +30,34 @@ module Zabbix
     end
     
     begin
-      
-      ActiveRecord::Base.establish_connection(
 
-        :adapter => config[:adapter],
-        :host => config[:host],
-        :database => config[:database],
-        :username => config[:username],
-        :password => config[:password]
+      if config[:port].nil?
+
+        ActiveRecord::Base.establish_connection(
+
+          :adapter => config[:adapter],
+          :host => config[:host],
+          :database => config[:database],
+          :username => config[:username],
+          :password => config[:password]
+
+        )
+
+      else 
+
+        ActiveRecord::Base.establish_connection(
+
+          :adapter => config[:adapter],
+          :host => config[:host],
+          :database => config[:database],
+          :username => config[:username],
+          :password => config[:password],
+          :port => config[:port]
+
+        )
+
+     end
 
-      )
-    
     rescue Exception => e
       
       #

data/lib/zabbix/function.rb

@@ -2,8 +2,8 @@ module Zabbix
   
   class Function < ::ActiveRecord::Base
     
-    set_table_name "functions"
-    set_primary_key "functionid"
+    self.table_name = 'functions'
+    self.primary_key = 'functionid'
   
     belongs_to :item,    :class_name => "Item", :foreign_key => "itemid"
     belongs_to :trigger, :class_name => "Trigger", :foreign_key => "triggerid"

data/lib/zabbix/host.rb

@@ -2,8 +2,8 @@ module Zabbix
 
   class Host < ::ActiveRecord::Base
 
-    set_table_name "hosts"
-    set_primary_key "hostid"
+    self.table_name = 'hosts'
+    self.primary_key = 'hostid'
   
     default_scope where(:status => [0,1] )
     scope :monitored, where(:status => 0)
@@ -18,9 +18,8 @@ module Zabbix
     #has_many :groups, :through => :host_group
     #has_many :host_template, :class_name => "HostTemplate", :foreign_key => "hostid"
     #has_many :templates, :through => :host_template
-  
-  
-    #belongs_to :proxy, :class_name => "Proxy", :foreign_key => "proxy_hostid"
+    
+    belongs_to :proxy, :class_name => "Proxy", :foreign_key => "proxy_hostid"
   
     #def item_last_value(key, value, time_shift_tolerance = 480)
     #  items.where("key_ = ? and lastvalue = ? and lastclock >=", key, value.to_s, Time.now.to_i - time_shift_tolerance)

data/lib/zabbix/item.rb

@@ -2,9 +2,9 @@ module Zabbix
   
   class Item < ::ActiveRecord::Base
     
-    set_table_name "items"
-    set_primary_key "itemid"
-    set_inheritance_column "dodge_rails_assumptions_about_type_column" # this is not an single inheritance table
+    self.table_name = 'items'
+    self.primary_key = 'itemid'
+    self.inheritance_column = 'dodge_rails_pollymorph_assumptions_about_type_column'
     
     belongs_to :host,      :class_name => "Host", :foreign_key => "hostid"
     has_many   :functions, :class_name => "Function", :foreign_key => "itemid"

data/lib/zabbix/trigger.rb

@@ -2,8 +2,10 @@ module Zabbix
   
   class Trigger < ::ActiveRecord::Base
     
-    set_table_name "triggers"
-    set_primary_key "triggerid"
+    self.table_name = 'triggers'
+    self.primary_key = 'triggerid'
+    self.inheritance_column = 'dodge_rails_pollymorph_assumptions_about_type_column'
+    
     
     has_many   :functions, :class_name => "Function", :foreign_key => "triggerid"
     #

data/lib/zabbix/version.rb

@@ -2,7 +2,7 @@ GEM_NAME = 'activerecord-zabbix'
 
 module Zabbix
   
-  Version = VERSION = '0.1.0'
+  Version = VERSION = '0.1.1'
     
 end
 

data/lib/zabbix/zabbix.rb

@@ -3,6 +3,8 @@ require 'zabbix/version'
 require 'zabbix/connect'
 
 require 'zabbix/host'
+require 'zabbix/proxy'
 require 'zabbix/item'
 require 'zabbix/function'
 require 'zabbix/trigger'
+require 'zabbix/event'

data/spec/spec_helper.rb

@@ -1 +1,34 @@
 require 'activerecord-zabbix'
+
+class Logger
+  
+  def initialize( parameter = :noisey )
+    @parameter = parameter
+  end
+  
+  def on
+    @parameter = :noisey
+  end
+  
+  def off
+    @parameter = :silent
+  end
+  
+  def method_missing( symbol, *args, &block )
+    puts "LOG.#{symbol}: #{args}" unless @parameter == :silent
+  end
+  
+  #
+  # rspec won't match unless for these unles they'r defined
+  #
+  def info( msg )
+    puts "LOG.info: [#{msg}]" unless @parameter == :silent
+  end
+  
+  def warn( msg )
+    puts "LOG.warn: [#{msg}]" unless @parameter == :silent
+  end
+  
+end
+
+LOG = Logger.new :silent

data/spec/zabbix/connect_spec.rb

@@ -4,6 +4,7 @@ describe Zabbix do
   
   before :each do
     
+    LOG.on
     
     CONFIG = {
       
@@ -25,7 +26,7 @@ describe Zabbix do
     
     )
     
-    Zabbix.connect( nil, nil )
+    Zabbix.connect( CONFIG, LOG )
     
   end
 

metadata

@@ -1,98 +1,81 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: activerecord-zabbix
-version: !ruby/object:Gem::Version 
-  hash: 27
+version: !ruby/object:Gem::Version
+  version: 0.1.1
   prerelease: 
-  segments: 
-  - 0
-  - 1
-  - 0
-  version: 0.1.0
 platform: ruby
-authors: 
-- ""
-- ""
-- ""
+authors:
+- ''
+- ''
+- ''
 - Richard
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2012-06-27 00:00:00 Z
-dependencies: 
-- !ruby/object:Gem::Dependency 
+date: 2012-07-09 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
   name: activerecord
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
+  requirement: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :runtime
-  version_requirements: *id001
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 description: This is not a rails app.
 email: ops@clue.co.za
 executables: []
-
 extensions: []
-
 extra_rdoc_files: []
-
-files: 
-- lib//activerecord-zabbix.rb
-- lib//boot.rb
-- lib//zabbix/connect.rb
-- lib//zabbix/function.rb
-- lib//zabbix/host.rb
-- lib//zabbix/item.rb
-- lib//zabbix/trigger.rb
-- lib//zabbix/version.rb
-- lib//zabbix/zabbix.rb
-- spec//README
-- spec//spec_helper.rb
-- spec//zabbix/connect_spec.rb
-- spec//zabbix/function_spec.rb
-- spec//zabbix/host_spec.rb
-- spec//zabbix/item_spec.rb
-- spec//zabbix/trigger_spec.rb
+files:
+- lib/activerecord-zabbix.rb
+- lib/boot.rb
+- lib/zabbix/connect.rb
+- lib/zabbix/function.rb
+- lib/zabbix/host.rb
+- lib/zabbix/item.rb
+- lib/zabbix/trigger.rb
+- lib/zabbix/version.rb
+- lib/zabbix/zabbix.rb
+- spec/README
+- spec/spec_helper.rb
+- spec/zabbix/connect_spec.rb
+- spec/zabbix/function_spec.rb
+- spec/zabbix/host_spec.rb
+- spec/zabbix/item_spec.rb
+- spec/zabbix/trigger_spec.rb
 - README.md
 - activerecord-zabbix.gemspec
 homepage: https://github.com/cluetechnologies/activerecord-zabbix
 licenses: []
-
 post_install_message: 
 rdoc_options: []
-
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
+required_ruby_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
 requirements: []
-
 rubyforge_project: 
-rubygems_version: 1.8.5
+rubygems_version: 1.8.24
 signing_key: 
 specification_version: 3
 summary: ActiveRecord access into Zabbix
 test_files: []
-