zabbix_receiver 0.0.3 → 0.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6bb55e93057af6f74f3a28e11eeea044c38b78d0
-  data.tar.gz: 5369d40a344d0973b03fffcba444af51de44b6ee
+  metadata.gz: 16d7639b10ddad739cc71e5027b0093fc3ea50cc
+  data.tar.gz: 1344cfc43519e4993c99a2cc12bc7a380b50360e
 SHA512:
-  metadata.gz: 6ece7c04f1eb7379f87d570d915f1f8989d327c96ddc481ed8c637ee49bf2af4d7adc6733bbca81ca0c4fb834aa6615431aa09ea2a92b83521b04f8a7fb1c920
-  data.tar.gz: 8638037e040dcd4bcbf6050ddac7e841d32f363918fc684fde44030dbee39061a0bf27ee703eec827aeb32c1873cc082c8b3295a121baf625708995e57fcdcd5
+  metadata.gz: 02f603fa3f485493b43bcdbbb880d44aadb31c57d860c63f315f1a984db94a5fc158c80a441b985aed028dc51ee904f4efb31c3e6bda73e3e5514b0af775b1f0
+  data.tar.gz: 46a7bb932afd96a319448ed2bb725e3a2ee0a2d97e9a6383ae16b6b0da4f69b6999ef762a2e7eade89bccee870411f8962202746d1940d41e40866cbb171fb63

data/README.md

@@ -1,26 +1,24 @@
 # ZabbixReceiver
 
-TODO: Write a gem description
-
-## Installation
-
-Add this line to your application's Gemfile:
-
-```ruby
-gem 'zabbix_receiver'
+```
++--------------+       +-----------------+             +-----------------------+
+|              |       |                 |             |                       |
+| Zabbix Agent +-------> zabbix_receiver +-------------> Output (like Fluentd) |
+|              |       |                 | sender data |                       |
++--------------+       +----------+------+             +-----------------------+
+                                  |                                             
+                                  |      +---------------+                      
+                                  |      |               |                      
+                                  +------> Zabbix Server |                      
+                           active checks |               |                      
+                                         +---------------+                      
 ```
 
-And then execute:
-
-    $ bundle
-
-Or install it yourself as:
-
-    $ gem install zabbix_receiver
+## Installation and Usage
 
-## Usage
+See:
 
-TODO: Write usage instructions here
+- https://github.com/ryotarai/zabbix_receiver-fluentd
 
 ## Contributing
 

data/lib/zabbix_receiver/version.rb

@@ -1,3 +1,3 @@
 module ZabbixReceiver
-  VERSION = "0.0.3"
+  VERSION = "0.0.4"
 end

data/lib/zabbix_receiver/worker.rb

@@ -4,8 +4,11 @@ module ZabbixReceiver
   module Worker
     ZABBIX_HEADER = "ZBXD\x01"
 
+    def output
+      @output ||= config[:output_class].new(logger, config)
+    end
+
     def run
-      @output = config[:output_class].new(logger, config)
 
       until @stop
         process(server.sock.accept)
@@ -26,7 +29,7 @@ module ZabbixReceiver
       when 'active checks'
         c.write(proxy_request(request_body))
       when 'sender data'
-        @output.receive_sender_data(request)
+        output.receive_sender_data(request)
 
         count = request['data'].size
 
@@ -36,6 +39,10 @@ module ZabbixReceiver
         })
       else
         logger.error "Unknown request type (#{request_type})"
+        respond_with(c, {
+          "response" => "success",
+          "info" => ""
+        })
       end
     ensure
       c.close

data/spec/zabbix_receiver/{server_spec.rb → worker_spec.rb}

@@ -1,57 +1,55 @@
 require 'spec_helper'
+require 'logger'
 
-describe ZabbixReceiver::Server do
-  let(:options) { {
-    proxy_to: {
-      host: 'zabbix-server',
-      port: 'port',
-    }
+describe ZabbixReceiver::Worker do
+  subject(:worker) do
+    double(:worker).extend(described_class)
+  end
+
+  let(:output) { double(:output) }
+  let(:config) { {
+    proxy_to_host: 'zabbix-server',
+    proxy_to_port: 'port',
   } }
-  subject(:server) { described_class.new(options) }
 
-  describe '#accept' do
-    context 'with sender data' do
+  before do
+    allow(worker).to receive(:logger).and_return(Logger.new(open('/dev/null', 'w')))
+    allow(worker).to receive(:output).and_return(output)
+    allow(worker).to receive(:config).and_return(config)
+  end
+
+  describe "#process" do
+    context "with sender data" do
       let(:request) { "ZBXD\u0001b\u0000\u0000\u0000\u0000\u0000\u0000\u0000{\n\t\"request\":\"sender data\",\n\t\"data\":[\n\t\t{\n\t\t\t\"host\":\"hello\",\n\t\t\t\"key\":\"key\",\n\t\t\t\"value\":\"value\"}]}" }
+      it "receives sender data" do
+        expect(output).to receive(:receive_sender_data).with({"request"=>"sender data", "data"=>[{"host"=>"hello", "key"=>"key", "value"=>"value"}]})
 
-      it 'receives sender data' do
         io = StringIO.new(request.dup)
 
-        received_data = nil
-        server.on_receive_sender_data do |data|
-          received_data = data
-        end
-
-        server.accept(io)
+        worker.process(io)
         expected_response = "ZBXD\u0001S\u0000\u0000\u0000\u0000\u0000\u0000\u0000{\"response\":\"success\",\"info\":\"Processed 1 Failed 0 Total 1 Seconds spent 0.000000\"}"
         expect(io.string).to eq(request + expected_response)
-        expect(received_data).to eq({
-          'request' => 'sender data',
-          'data' => [{
-            'host'  => 'hello',
-            'key'   => 'key',
-            'value' => 'value',
-          }],
-        })
       end
     end
 
-    context 'with active checks' do
+    context "with active checks" do
       let(:socket_to_zabbix_server) { double(:socket) }
       let(:request) { "ZBXD\u0001)\x00\x00\x00\x00\x00\x00\x00{\"request\":\"active checks\",\"key\":\"value\"}" }
       let(:response) { "response_from_zabbix_server" }
 
-      it 'proxies a request to zabbix server' do
-        allow(socket_to_zabbix_server).to receive(:seek)
+      it "proxies a request to zabbix server" do
+        io = StringIO.new(request.dup)
 
-        expect(TCPSocket).to receive(:open).with('zabbix-server', 'port').and_return(socket_to_zabbix_server)
+        expect(TCPSocket).to receive(:open).
+          with('zabbix-server', 'port').
+          and_return(socket_to_zabbix_server)
         expect(socket_to_zabbix_server).to receive(:close)
         expect(socket_to_zabbix_server).to receive(:write).with(request)
         expect(socket_to_zabbix_server).to receive(:read).and_return(response)
 
-        io = StringIO.new(request.dup)
-        server.accept(io)
-        expect(io.string).to eq(request + response)
+        worker.process(io)
       end
     end
   end
 end
+

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: zabbix_receiver
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: 0.0.4
 platform: ruby
 authors:
 - Ryota Arai
@@ -102,7 +102,7 @@ files:
 - lib/zabbix_receiver/version.rb
 - lib/zabbix_receiver/worker.rb
 - spec/spec_helper.rb
-- spec/zabbix_receiver/server_spec.rb
+- spec/zabbix_receiver/worker_spec.rb
 - zabbix_receiver.gemspec
 homepage: ''
 licenses:
@@ -130,4 +130,4 @@ specification_version: 4
 summary: Server to receive sender data from zabbix-agent.
 test_files:
 - spec/spec_helper.rb
-- spec/zabbix_receiver/server_spec.rb
+- spec/zabbix_receiver/worker_spec.rb