zabbix 0.3.0 → 0.4.0

data/Rakefile

@@ -10,7 +10,7 @@ begin
     gem.email       = "mknopp@yammer-inc.com"
     gem.homepage    = "http://github.com/mhat/zabbix"
     gem.authors     = ["Matthew Knopp"]
-    gem.add_development_dependency "thoughtbot-shoulda", ">= 0"
+    gem.add_development_dependency "shoulda", ">= 0"
     # gem is a Gem::Specification... see http://www.rubygems.org/read/chapter/20 for additional settings
   end
   Jeweler::GemcutterTasks.new

data/VERSION

@@ -1 +1 @@
-0.3.0
+0.4.0

data/lib/zabbix/sender.rb

@@ -2,36 +2,38 @@ class Zabbix::Sender
 
   DEFAULT_SERVER_PORT = 10051
 
-  attr_reader :configured 
+  attr_reader :configured
 
   def initialize(opts={})
+    @client_host = Socket.gethostbyname(Socket.gethostname)[0]
+
     if opts[:config_file]
       config = Zabbix::Agent::Configuration.read(opts[:config_file])
-      @host  = config.server
-      @port  = config.server_port || DEFAULT_SERVER_PORT
+      @server_host  = config.server
+      @server_port  = config.server_port || DEFAULT_SERVER_PORT
     end
 
     if opts[:host]
-      @host = opts[:host]
-      @port = opts[:port] || DEFAULT_SERVER_PORT
+      @server_host = opts[:host]
+      @server_port = opts[:port] || DEFAULT_SERVER_PORT
     end
 
   end
 
 
   def configured?
-    @configured ||= !(@host.nil? and @port.nil?)
+    @configured ||= !(@server_host.nil? and @server_port.nil?)
   end
 
 
   def connect
-    @socket ||= TCPSocket.new(@host, @port)
+    @socket ||= TCPSocket.new(@server_host, @server_port)
   end
 
   def disconnect
     if @socket
       @socket.close unless @socket.closed?
-      @socket = nil 
+      @socket = nil
     end
     return true
   end
@@ -41,7 +43,7 @@ class Zabbix::Sender
   end
 
 
-  def send_stop(key, opts={}) 
+  def send_stop(key, opts={})
     send_data("#{key}.stop", 1, opts)
   end
 
@@ -54,36 +56,36 @@ class Zabbix::Sender
   end
 
   def send_data(key, value, opts={})
-    return false unless configured? 
-    host  = opts[:host]
-    clock = opts[:ts  ]
-    return send_zabbix_request([ cons_zabbix_data_element(host, key, value, clock) ])
-  end  
+    return false unless configured?
+    return send_zabbix_request([
+      cons_zabbix_data_element(key, value, opts)
+    ])
+  end
 
-  private 
+  private
 
-  def cons_zabbix_data_element(host, key, value, clock=Time.now.to_i)
+  def cons_zabbix_data_element(key, value, opts={})
     return {
-      :host  => host, 
-      :key   => key, 
+      :key   => key,
       :value => value,
-      :clock => clock
+      :host  => opts[:host] || @client_host,
+      :clock => opts[:ts  ] || Time.now.to_i,
     }
   end
 
   def send_zabbix_request(data)
     status  = false
     request = Yajl::Encoder.encode({
-      :request => 'agent data' , 
+      :request => 'agent data' ,
       :clock   => Time.now.to_i,
       :data    => data
     })
 
-    begin 
+    begin
       sock = connect
       sock.write "ZBXD\x01"
       sock.write [request.size].pack('q')
-      sock.write request 
+      sock.write request
       sock.flush
 
       # FIXME: check header to make sure it's the message we expect?
@@ -96,7 +98,7 @@ class Zabbix::Sender
       ## FIXME
     ensure
       disconnect
-    end 
+    end
 
     return status
   end

data/lib/zabbix/sender/buffer.rb

@@ -6,12 +6,7 @@ class Zabbix::Sender::Buffer < Zabbix::Sender
 
   def append(key, value, opts={})
     return false unless configured?
-    @buffer << {
-      :host  => opts[:host] || Socket.gethostname,
-      :clock => opts[:ts  ] || Time.now.to_i,
-      :key   => key, 
-      :value => value, 
-    }
+    @buffer << cons_zabbix_data_element(key, value, opts)
   end  
 
   def flush 
@@ -20,5 +15,6 @@ class Zabbix::Sender::Buffer < Zabbix::Sender
     @buffer.clear
     return ret
   end
+  alias send! flush
 
 end

data/zabbix.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{zabbix}
-  s.version = "0.3.0"
+  s.version = "0.4.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Matthew Knopp"]
-  s.date = %q{2011-02-14}
+  s.date = %q{2011-10-28}
   s.description = %q{send data to zabbix from ruby}
   s.email = %q{mknopp@yammer-inc.com}
   s.extra_rdoc_files = [
@@ -34,24 +34,19 @@ Gem::Specification.new do |s|
   ]
   s.homepage = %q{http://github.com/mhat/zabbix}
   s.require_paths = ["lib"]
-  s.rubygems_version = %q{1.3.7}
+  s.rubygems_version = %q{1.5.2}
   s.summary = %q{send data to zabbix from ruby}
-  s.test_files = [
-    "test/helper.rb",
-    "test/test_zabbix.rb"
-  ]
 
   if s.respond_to? :specification_version then
-    current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION
     s.specification_version = 3
 
     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
-      s.add_development_dependency(%q<thoughtbot-shoulda>, [">= 0"])
+      s.add_development_dependency(%q<shoulda>, [">= 0"])
     else
-      s.add_dependency(%q<thoughtbot-shoulda>, [">= 0"])
+      s.add_dependency(%q<shoulda>, [">= 0"])
     end
   else
-    s.add_dependency(%q<thoughtbot-shoulda>, [">= 0"])
+    s.add_dependency(%q<shoulda>, [">= 0"])
   end
 end
 

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: zabbix
 version: !ruby/object:Gem::Version 
-  hash: 19
-  prerelease: false
+  hash: 15
+  prerelease: 
   segments: 
   - 0
-  - 3
+  - 4
   - 0
-  version: 0.3.0
+  version: 0.4.0
 platform: ruby
 authors: 
 - Matthew Knopp
@@ -15,11 +15,11 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-02-14 00:00:00 -08:00
+date: 2011-10-28 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
-  name: thoughtbot-shoulda
+  name: shoulda
   prerelease: false
   requirement: &id001 !ruby/object:Gem::Requirement 
     none: false
@@ -86,10 +86,9 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.7
+rubygems_version: 1.5.2
 signing_key: 
 specification_version: 3
 summary: send data to zabbix from ruby
-test_files: 
-- test/helper.rb
-- test/test_zabbix.rb
+test_files: []
+