zabbix_receiver 0.0.1 → 0.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1db84526dbaff0fd80bb4cef61161ceb0074ba7a
-  data.tar.gz: c303aa0a685791c419d8a77610f8408974075701
+  metadata.gz: b9b18abfc85a6f0c988942665b7764545131a0e5
+  data.tar.gz: e4ff56edf7bbfd4ba960881f25db18ab9156cbda
 SHA512:
-  metadata.gz: d15a574d116ca65dee81029ab96f8d92f747654bf2625e77935f5b384ce1e29ae7e87472a7afb78365f98859c450f47f8944fe50c04421e0585d4eced63ba096
-  data.tar.gz: de862f50067ed77859ddb88751c00526cfca9c368b31e7a878d749137a92d8a9f2619fd26a8fa4feb9ac3bfea640bba194d876fb918e733cf00171fb327fc48e
+  metadata.gz: 39fcb740b7dc74ea719ac4dc330e52f28aa9202db534669527eb1b4b7f80aee4d3319f49dbdf6808518fe9a0d091c369d092c5cdbf113275e562e745beba5356
+  data.tar.gz: 4d755551630c848207a7174b93804c9ef63244197666da6d7109a597e21d41bc7df077a8e372e641d616d4d00950641dc7a2d3df2986b4a5d158810db22023ea

data/bin/zabbix_receiver

@@ -0,0 +1,3 @@
+#!/usr/bin/env ruby
+require 'zabbix_receiver'
+ZabbixReceiver::CLI.start(ARGV)

data/lib/zabbix_receiver/cli.rb

@@ -0,0 +1,70 @@
+require 'zabbix_receiver'
+require 'serverengine'
+require 'optparse'
+
+module ZabbixReceiver
+  class CLI
+    REQUIRED_OPTIONS = %i(daemonize workers proxy_to_host proxy_to_port bind port)
+
+    def self.start(argv)
+      self.new(argv).start
+    end
+
+    def initialize(argv)
+      load_options(argv)
+    end
+
+    def start
+      options = {
+        worker_type: 'process',
+      }.merge(@options)
+
+      se = ServerEngine.create(Server, Worker, options)
+      se.run
+    end
+
+    private
+
+    def load_options(argv)
+      argv_for_main, argv_for_output = argv.slice_before('--').to_a
+      argv_for_output.shift
+
+      @options = {
+        daemonize: false,
+        workers: 1,
+        bind: '0.0.0.0',
+        port: 10051,
+        proxy_to_port: 10051,
+        to: 'stdout',
+      }
+
+      parser = OptionParser.new
+      parser.on('--daemonize') {|v| @options[:daemonize] = true }
+      parser.on('--log=VAL', 'default: STDERR') {|v| @options[:log] = v }
+      parser.on('--pid-path=VAL') {|v| @options[:pid_path] = v }
+      parser.on('--workers=VAL') {|v| @options[:worker] = v }
+      parser.on('--bind=VAL') {|v| @options[:bind] = v }
+      parser.on('--port=VAL') {|v| @options[:port] = v }
+      parser.on('--proxy-to-host=VAL') {|v| @options[:proxy_to_host] = v }
+      parser.on('--proxy-to-port=VAL') {|v| @options[:proxy_to_port] = v }
+      parser.on('--to=VAL') {|v| @options[:to] = v }
+      parser.on('--log-level=VAL') {|v| @options[:log_level] = v }
+      parser.parse!(argv_for_main)
+
+      REQUIRED_OPTIONS.each do |key|
+        unless @options.has_key?(key)
+          raise "--#{key.to_s.split('_').join('-')} option is required."
+        end
+      end
+
+      @options[:output_class] = output_class
+      @options[:output_options] = @options[:output_class].parse_options(argv_for_output)
+    end
+
+    def output_class
+      require "zabbix_receiver/output/#{@options[:to]}"
+      class_name = @options[:to].split('_').map {|v| v.capitalize }.join
+      ZabbixReceiver::Output.const_get(class_name)
+    end
+  end
+end

data/lib/zabbix_receiver/output/stdout.rb

@@ -0,0 +1,16 @@
+module ZabbixReceiver
+  module Output
+    class Stdout
+      def self.parse_options(argv)
+        {}
+      end
+
+      def initialize(logger, options)
+      end
+
+      def receive_sender_data(data)
+        puts data
+      end
+    end
+  end
+end

data/lib/zabbix_receiver/server.rb

@@ -1,110 +1,14 @@
-require 'json'
-require 'logger'
-
 module ZabbixReceiver
-  class Server
-    ZABBIX_HEADER = "ZBXD\x01"
-
-    def initialize(options = {})
-      @options = {
-        proxy_to: {
-          port: 10051,
-        },
-      }.merge(options)
-
-      validate_options
-
-      @logger = options[:logger] || Logger.new(StringIO.new)
-
-      @blocks_on_receive_sender_data = []
-    end
-
-    def on_receive_sender_data(&block)
-      @blocks_on_receive_sender_data << block
-    end
-
-    def start(address, port)
-      server = TCPServer.open(address, port)
-
-      while true
-        Thread.start(server.accept) do |f|
-          accept(f)
-        end
-      end
-    end
-
-    def accept(f)
-      request = parse(f)
-
-      @logger.debug "Request: #{request}"
-
-      request_type = request['request']
+  module Server
+    attr_reader :sock
 
-      case request_type
-      when 'active checks'
-        proxy_request(f)
-      when 'sender data'
-        @blocks_on_receive_sender_data.each do |block|
-          block.call(request)
-        end
+    def before_run
+      bind = config[:bind]
+      port = config[:port]
 
-        count = request['data'].size
-
-        respond_with(f, {
-          "response" => "success",
-          "info" => "Processed #{count} Failed 0 Total #{count} Seconds spent 0.000000"
-        })
-      else
-        @logger.error "Unknown request type (#{request_type})"
-      end
-    ensure
-      f && f.close
-    end
-
-    def proxy_request(f)
-      f.seek(0)
-
-      socket = TCPSocket.open(
-        @options[:proxy_to][:host],
-        @options[:proxy_to][:port],
-      )
-      socket.write(f.read)
-      f.write(socket.read)
-    ensure
-      socket && socket.close
-    end
-
-    private
-
-    def parse(f)
-      f.seek(0)
-
-      unless f.read(5) == ZABBIX_HEADER
-        @logger.error "Invalid Zabbix request"
-        return
-      end
-
-      length = f.read(8).unpack('q').first
-      body = f.read
-      unless body.size == length
-        @logger.error "Length mismatch"
-        return
-      end
-
-      JSON.parse(body)
-    end
-
-    def respond_with(f, payload)
-      payload = payload.to_json
-      f.write(ZABBIX_HEADER + [payload.bytesize].pack('q') + payload)
-    end
+      logger.info "Listening on #{bind}:#{port}..."
 
-    def validate_options
-      [:host, :port].each do |k|
-        unless @options[:proxy_to][k]
-          raise "options[:proxy_to][:#{k}] is required."
-        end
-      end
+      @sock = TCPServer.open(bind, port)
     end
   end
 end

data/lib/zabbix_receiver/version.rb

@@ -1,3 +1,3 @@
 module ZabbixReceiver
-  VERSION = "0.0.1"
+  VERSION = "0.0.2"
 end

data/lib/zabbix_receiver/worker.rb

@@ -0,0 +1,80 @@
+require 'json'
+
+module ZabbixReceiver
+  module Worker
+    ZABBIX_HEADER = "ZBXD\x01"
+
+    def run
+      @output = config[:output_class].new(logger, config[:output_options])
+
+      until @stop
+        process(server.sock.accept)
+      end
+    end
+
+    def stop
+      @stop = true
+    end
+
+    def process(c)
+      request_body = c.read
+      request = parse(request_body)
+      logger.debug "Request: #{request}"
+      request_type = request['request']
+
+      case request_type
+      when 'active checks'
+        c.write(proxy_request(request_body))
+      when 'sender data'
+        @output.receive_sender_data(request)
+
+        count = request['data'].size
+
+        respond_with(c, {
+          "response" => "success",
+          "info" => "Processed #{count} Failed 0 Total #{count} Seconds spent 0.000000"
+        })
+      else
+        logger.error "Unknown request type (#{request_type})"
+      end
+    ensure
+      c.close
+    end
+
+    def proxy_request(request_body)
+      socket = TCPSocket.open(
+        config[:proxy_to_host],
+        config[:proxy_to_port],
+      )
+      socket.write(request_body)
+      socket.read
+    ensure
+      socket && socket.close
+    end
+
+    private
+
+    def parse(request_body)
+      request = StringIO.new(request_body)
+
+      unless request.read(5) == ZABBIX_HEADER
+        logger.error "Invalid Zabbix request"
+        return
+      end
+
+      length = request.read(8).unpack('q').first
+      body = request.read
+      unless body.size == length
+        logger.error "Length mismatch"
+        return
+      end
+
+      JSON.parse(body)
+    end
+
+    def respond_with(f, payload)
+      payload = payload.to_json
+      f.write(ZABBIX_HEADER + [payload.bytesize].pack('q') + payload)
+    end
+  end
+end

data/lib/zabbix_receiver.rb

@@ -1,4 +1,6 @@
 require "zabbix_receiver/server"
+require "zabbix_receiver/worker"
+require "zabbix_receiver/cli"
 require "zabbix_receiver/version"
 
 module ZabbixReceiver

data/zabbix_receiver.gemspec

@@ -17,6 +17,8 @@ Gem::Specification.new do |spec|
   spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
   spec.require_paths = ["lib"]
 
+  spec.add_development_dependency "serverengine"
+
   spec.add_development_dependency "bundler", "~> 1.7"
   spec.add_development_dependency "rake", "~> 10.0"
   spec.add_development_dependency "rspec"

metadata

@@ -1,15 +1,29 @@
 --- !ruby/object:Gem::Specification
 name: zabbix_receiver
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.2
 platform: ruby
 authors:
 - Ryota Arai
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-01-22 00:00:00.000000000 Z
+date: 2015-01-23 00:00:00.000000000 Z
 dependencies:
+- !ruby/object:Gem::Dependency
+  name: serverengine
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -55,7 +69,8 @@ dependencies:
 description: 
 email:
 - ryota-arai@cookpad.com
-executables: []
+executables:
+- zabbix_receiver
 extensions: []
 extra_rdoc_files: []
 files:
@@ -65,9 +80,13 @@ files:
 - LICENSE.txt
 - README.md
 - Rakefile
+- bin/zabbix_receiver
 - lib/zabbix_receiver.rb
+- lib/zabbix_receiver/cli.rb
+- lib/zabbix_receiver/output/stdout.rb
 - lib/zabbix_receiver/server.rb
 - lib/zabbix_receiver/version.rb
+- lib/zabbix_receiver/worker.rb
 - spec/spec_helper.rb
 - spec/zabbix_receiver/server_spec.rb
 - zabbix_receiver.gemspec