zabbix 0.1.0 → 0.2.0

data/VERSION

@@ -1 +1 @@
-0.1.0
+0.2.0

data/lib/zabbix.rb

@@ -1,9 +1,12 @@
 module Zabbix
 end
 
+require "socket" 
+require "yajl"
 require "zabbix/agent/configuration"
 require "zabbix/sender"
 require "zabbix/sender/easy"
+require "zabbix/sender/buffer"
 
 ## we could use zabbix-sender, but that appears to be unecessary; we can instead 
 ## simply talk to the zabbit-server. we get there via the parent. 

data/lib/zabbix/sender.rb

@@ -1,6 +1,3 @@
-require 'socket'
-require 'yajl'
-
 class Zabbix::Sender
 
   DEFAULT_SERVER_PORT = 10051
@@ -28,9 +25,16 @@ class Zabbix::Sender
 
 
   def connect
-    TCPSocket.new(@host, @port)
+    @socket ||= TCPSocket.new(@host, @port)
   end
 
+  def disconnect
+    if @socket
+      @socket.close unless @socket.closed?
+      @socket = nil 
+    end
+    return true
+  end
 
   def send_start(key, opts={})
     send_data("#{key}.start", 1, opts)
@@ -48,35 +52,49 @@ class Zabbix::Sender
 
   def send_data(key, value, opts={})
     return false unless configured? 
-    host   = opts[:host] || Socket.gethostname
-    ts     = opts[:ts]   || Time.now.to_i 
-    socket = connect 
-
-    # construct json
-    json = Yajl::Encoder.encode({ 
-      :request => "agent data",
-      :clock   => ts,
-      :data    => [{
-        :host       => host,
-        :key        => key,
-        :value      => value,
-        :clock      => ts
-      }]
-    })
+    host  = opts[:host]
+    clock = opts[:ts  ]
+    return send_zabbix_request([ cons_zabbix_data_element(host, key, value, clock) ])
+  end  
 
-    # send the data
-    socket.write "ZBXD\x01"
-    socket.write [json.size].pack('q')
-    socket.write json
-    socket.flush
+  private 
 
-    # read the response message if desired
-    #header = socket.read(5)
-    #len    = socket.read(8)
-    #len    = len.unpack('q').shift
-    #msg    = socket.read(len)
-    socket.close 
+  def cons_zabbix_data_element(host, key, value, clock=Time.now.to_i)
+    return {
+      :host  => host, 
+      :key   => key, 
+      :value => value,
+      :clock => clock
+    }
+  end
 
-    return true
-  end  
+  def send_zabbix_request(data)
+    status  = false
+    request = Yajl::Encoder.encode({
+      :request => 'agent data' , 
+      :clock   => Time.now.to_i,
+      :data    => data
+    })
+
+    begin 
+      sock = connect
+      sock.write "ZBXD\x01"
+      sock.write [request.size].pack('q')
+      sock.write request 
+      sock.flush
+
+      # FIXME: check header to make sure it's the message we expect?
+      header   = sock.read(5)
+      len      = sock.read(8)
+      len      = len.unpack('q').shift
+      response = Yajl::Parser.parse(sock.read(len))
+      status   = true if response['response'] == 'success'
+    rescue => e
+      ## FIXME
+    ensure
+      disconnect
+    end 
+
+    return status
+  end
 end

data/lib/zabbix/sender/buffer.rb

@@ -0,0 +1,24 @@
+class Zabbix::Sender::Buffer < Zabbix::Sender
+  def initialize(opts={})
+    @buffer = [] 
+    super(opts)
+  end
+
+  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, 
+    }
+  end  
+
+  def flush 
+    return false unless @buffer.size > 0
+    ret = send_zabbix_request(@buffer)
+    @buffer.clear
+    return ret
+  end
+
+end

data/test/test_zabbix.rb

@@ -18,15 +18,24 @@ class TestZabbix < Test::Unit::TestCase
     assert_equal true, zbx.configured?
   end 
 
-  should "send some data" do
+  should "should send start stop and heartbeat" do
     config_file = "#{File.dirname(__FILE__)}/zabbix_agentd.conf"
     zbx  = Zabbix::Sender.new :config_file => config_file
     key  = :"foo.bar.baz"
     host = "testhost.example.com"
     assert_equal true, zbx.send_start(key, :host => host)
-    assert_equal true, zbx.send_heartbeat(key, "8==D~~~ ADAM", :host => host)
+    assert_equal true, zbx.send_heartbeat(key, "8==D", :host => host)
     assert_equal true, zbx.send_stop(key, :host => host)
   end
 
-  
+  should "should bulk send data" do 
+    config_file = "#{File.dirname(__FILE__)}/zabbix_agentd.conf"
+    zbx  = Zabbix::Sender::Buffer.new :config_file => config_file
+    key  = :"foo.bar.baz"
+    host = "testhost.example.com"
+    zbx.append key, "8===D",   :host => host 
+    zbx.append key, "8====D",  :host => host 
+    zbx.append key, "8=====D", :host => host 
+    assert_equal true, zbx.flush   
+  end
 end

data/test/zabbix_agentd.conf

@@ -1,2 +1,2 @@
-Server=localhost
+Server=sysmon-002.sc1.yammer.com
 ServerPort=10051

data/zabbix.gemspec

@@ -0,0 +1,57 @@
+# Generated by jeweler
+# DO NOT EDIT THIS FILE DIRECTLY
+# Instead, edit Jeweler::Tasks in Rakefile, and run 'rake gemspec'
+# -*- encoding: utf-8 -*-
+
+Gem::Specification.new do |s|
+  s.name = %q{zabbix}
+  s.version = "0.2.0"
+
+  s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
+  s.authors = ["Matthew Knopp"]
+  s.date = %q{2010-12-17}
+  s.description = %q{send data to zabbix from ruby}
+  s.email = %q{mknopp@yammer-inc.com}
+  s.extra_rdoc_files = [
+    "LICENSE",
+    "README.rdoc"
+  ]
+  s.files = [
+    ".document",
+    "LICENSE",
+    "README.rdoc",
+    "Rakefile",
+    "VERSION",
+    "lib/zabbix.rb",
+    "lib/zabbix/agent/configuration.rb",
+    "lib/zabbix/sender.rb",
+    "lib/zabbix/sender/buffer.rb",
+    "lib/zabbix/sender/easy.rb",
+    "test/helper.rb",
+    "test/test_zabbix.rb",
+    "test/zabbix_agentd.conf",
+    "zabbix.gemspec"
+  ]
+  s.homepage = %q{http://github.com/mhat/zabbix}
+  s.require_paths = ["lib"]
+  s.rubygems_version = %q{1.3.7}
+  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"])
+    else
+      s.add_dependency(%q<thoughtbot-shoulda>, [">= 0"])
+    end
+  else
+    s.add_dependency(%q<thoughtbot-shoulda>, [">= 0"])
+  end
+end
+

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: zabbix
 version: !ruby/object:Gem::Version 
-  hash: 27
+  hash: 23
   prerelease: false
   segments: 
   - 0
-  - 1
+  - 2
   - 0
-  version: 0.1.0
+  version: 0.2.0
 platform: ruby
 authors: 
 - Matthew Knopp
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-11-30 00:00:00 -08:00
+date: 2010-12-17 00:00:00 -08:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -43,7 +43,6 @@ extra_rdoc_files:
 - README.rdoc
 files: 
 - .document
-- .gitignore
 - LICENSE
 - README.rdoc
 - Rakefile
@@ -51,17 +50,19 @@ files:
 - lib/zabbix.rb
 - lib/zabbix/agent/configuration.rb
 - lib/zabbix/sender.rb
+- lib/zabbix/sender/buffer.rb
 - lib/zabbix/sender/easy.rb
 - test/helper.rb
 - test/test_zabbix.rb
 - test/zabbix_agentd.conf
+- zabbix.gemspec
 has_rdoc: true
 homepage: http://github.com/mhat/zabbix
 licenses: []
 
 post_install_message: 
-rdoc_options: 
-- --charset=UTF-8
+rdoc_options: []
+
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 

data/.gitignore

@@ -1,21 +0,0 @@
-## MAC OS
-.DS_Store
-
-## TEXTMATE
-*.tmproj
-tmtags
-
-## EMACS
-*~
-\#*
-.\#*
-
-## VIM
-*.swp
-
-## PROJECT::GENERAL
-coverage
-rdoc
-pkg
-
-## PROJECT::SPECIFIC