fluent-plugin-logmatic 0.7 → 0.8.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a4a8ae2452e547650e5139666b2e11e16a849552
-  data.tar.gz: 952cf838c0ebd948448569299680347196791456
+  metadata.gz: 832872f431650bee4cecd717357c628e242b35a2
+  data.tar.gz: f62d2ff84f5bc7d3e7626255b8fb7a783a67d3c9
 SHA512:
-  metadata.gz: 7cc21ad106c3f519700cbc4e0b4b2434abe7ed124b2f3ea0bca8c63623499afab82f4288bdbf7cea43235fed946cadaf8f8d34c3ada4b7c5706618f3ee99b521
-  data.tar.gz: 228734eba5ef3240140ac6903d4c18a3764fbefbd3a96f394e2185a399267e64c80e088225fe7b554f6e47d16162b32c722844c737268ebab28aadd862bcb258
+  metadata.gz: ce4c3d94d809bcb6b8dfb56da7b1e56a082bc8a0342a87145595141b190222f8d4e4e0bd34da38d955c303e779662de2acb1fa903cd8f384c287a9fccf5d0597
+  data.tar.gz: 9e916639430b84d386724403c7dada85fd1a5b7f72e5fa2a57d1fb9527529e8a6876920ab2f80826011457aa3b4ecc7140d1db04c84ecb8e0154389a51767397

data/.gitignore

@@ -34,3 +34,8 @@ build/
 
 # unless supporting rvm < 1.11.0 or doing something fancy, ignore this:
 .rvmrc
+
+# Misc
+foo/
+*.iml
+.idea/

data/README.md

@@ -1,5 +1,4 @@
-fluent-plugin-logmatic
-===============
+# fluent-plugin-logmatic
 
 Fluentd output plugin for Logmatic.io.
 
@@ -7,20 +6,16 @@ It mainly contains a proper JSON formatter and a socket handler that
 streams logs directly to Logmatic.io - so no need to use a log shipper
 if you don't wan't to.
 
-Pre-requirements
-================
+## Pre-requirements
 
 To add the plugin to your fluentd agent, use the following command:
 
     gem install fluent-plugin-logmatic
 
-Usage
-=====
+## Usage
+### Configure the output plugin
 
-"match" Tell fluentd how to send to Logmatic.io
---------------------------
-
-To match events tagged logmatic, simply add the following code to your configuration file.
+To match events and send them to logmatic.io, simply add the following code to your configuration file.
 
 ```xml
 # Match events tagged with "logmatic.**" and
@@ -32,49 +27,39 @@ To match events tagged logmatic, simply add the following code to your configura
   
   api_key <your_api_key>
 
+
 </match>
 
 ```
 
-Once this setup is done, any child events tagged with `logmatic` will be ship to your plateform.
+After a restart of FluentD, any child events tagged with `logmatic` are shipped to your plateform.
 
+### Validation
 Let's make a simple test.
 
 ```bash
-echo '{"message":"hello world from fluentd"}' | fluent-cat logmatic.demo
+echo '{"message":"hello Logmatic from fluentd"}' | fluent-cat logmatic.demo
 ```
 
-This will produce the following event:
+Produces the following event:
 
 ```javascript
 { 
-	"custom": {
-    	"message": "hello world from fluentd" 
+    "custom": {
+        "message": "hello Logmatic from fluentd"
      }
 }
 ```
 
-fluent-plugin-logmatic properties
-======
-Let's go deeper on the plugin configuration. 
+### fluent-plugin-logmatic properties
+Let's go deeper on the plugin configuration.
 
 As fluent-plugin-logmatic is an output_buffer, you can set all output_buffer properties like it's describe in the [fluentd documentation](http://docs.fluentd.org/articles/output-plugin-overview#buffered-output-parameters "documentation").
 
-api_key
---------
-This parameter is required in order to authenticate your fluent agent. The agent won't started until set your key.    
-
-use_json 
---------
-If it's set to true, the event will be send to json format. If it's set to false, only the key `message` of the record will be sent to Logmatic.io. Set to true by default.
-
-use_ssl
---------
-If it's set to true, the agent initialize a secure connection to Logmatic. Set to true by default. 
-
-
-max_retries
---------
-The number of retries before raised an error. By default, this parameter is set to 3.
-
 
+|  Property   |  Description                                                             |  Default value |
+|-------------|--------------------------------------------------------------------------|----------------|
+| **api_key** | This parameter is required in order to authenticate your fluent agent.   | nil            |
+| **use_json**| Event format, if true, the event is sent in json format. Othwerwise, in plain text. | true      |
+| **use_ssl** | If true, the agent initializes a secure connection to Logmatic.io. In clear TCP otherwise. | true |
+|**max_retries**| The number of retries before the output plugin stops. Set to -1 for unlimited retries | -1 |

data/fluent-plugin-logmatic.gemspec

@@ -4,14 +4,14 @@ $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 
 Gem::Specification.new do |spec|
   spec.name          = "fluent-plugin-logmatic"
-  spec.version       = "0.7"
+  spec.version       = "0.8.1"
   spec.authors       = ["Logmatic support team"]
   spec.email         = ["support@logmatic.io"]
   spec.summary       = "Logmatic output plugin for Fluent event collector"
-  spec.homepage      = "https://github.com/logmatic/fluent-plugin-logmatic"
+  spec.homepage      = "http://logmatic.io"
   spec.license       = "MIT"
 
-  spec.files         = `git ls-files -z`.split("\x0")
+  spec.files         = [".gitignore", "Gemfile", "LICENSE", "README.md", "Rakefile", "fluent-plugin-logmatic.gemspec", "lib/fluent/plugin/out_logmatic.rb"]
   spec.executables   = spec.files.grep(%r{^bin/}) { |f| File.basename(f) }
   spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
   spec.require_paths = ["lib"]

data/lib/fluent/plugin/out_logmatic.rb

@@ -6,7 +6,6 @@ class Fluent::LogmaticOutput < Fluent::BufferedOutput
 
   # Register the plugin
   Fluent::Plugin.register_output('logmatic', self)
-
   # Output settings
   config_param :use_json,       :bool,    :default => true
 
@@ -15,14 +14,22 @@ class Fluent::LogmaticOutput < Fluent::BufferedOutput
   config_param :use_ssl,        :bool,    :default => true
   config_param :port,           :integer, :default => 10514
   config_param :ssl_port,       :integer, :default => 10515
-  config_param :max_retries,    :integer, :default => 3
+  config_param :max_retries,    :integer, :default => -1
   
   # API Settings
   config_param :api_key,  :string
   
+  def initialize
+    super
+  end
+
+  # Define `log` method for v0.10.42 or earlier
+  unless method_defined?(:log)
+    define_method("log") { $log }
+  end
+
   def configure(conf)
     super
-    @last_edit = Time.at(0)
   end
 
   def start
@@ -43,7 +50,14 @@ class Fluent::LogmaticOutput < Fluent::BufferedOutput
     else
       TCPSocket.new @host, @port
     end
-    
+
+    @_socket.setsockopt(Socket::SOL_SOCKET, Socket::SO_KEEPALIVE, true)
+    @_socket.setsockopt(Socket::SOL_TCP, Socket::TCP_KEEPIDLE, 10)
+    @_socket.setsockopt(Socket::SOL_TCP, Socket::TCP_KEEPINTVL, 3)
+    @_socket.setsockopt(Socket::SOL_TCP, Socket::TCP_KEEPCNT, 3)
+
+    return @_socket
+
   end
 
   # This method is called when an event reaches Fluentd.
@@ -54,31 +68,47 @@ class Fluent::LogmaticOutput < Fluent::BufferedOutput
   # NOTE! This method is called by internal thread, not Fluentd's main thread.
   # 'chunk' is a buffer chunk that includes multiple formatted events.
   def write(chunk)
-    
+
+    messages = Array.new
     chunk.msgpack_each do |tag, record|
       next unless record.is_a? Hash
       next unless @use_json or record.has_key? "message"
-      message = @use_json ? record.to_json : record["message"].rstrip()
-      send_to_logmatic(message)
+      if @use_json
+        messages.push "#{api_key} " + record.to_json + "\n"
+      else
+        messages.push "#{api_key} " + record["message"].rstrip() + "\n"
+      end
     end
+    send_to_logmatic(messages)
 
   end
 
   def send_to_logmatic(data)
 
+
     retries = 0
 
     begin
 
-      client.write("#{api_key} #{data}\n")
+      # Check the connectivity and write messages
+      #connected,x = client.recv(0)
+      #log.trace  "Connected=#{connected},#{x}"
+      #raise Errno::ECONNREFUSED, "Client has lost server connection" if connected == 0
+      log.trace "New attempt to Logmatic attempt=#{retries}" if retries > 0
+      log.trace "Send nb_event=#{data.size} events to Logmatic"
+      data.each do |event|
+        client.write(event)
+      end
+
 
     # Handle some failures
-    rescue Errno::ECONNREFUSED, Errno::ETIMEDOUT, Errno::EPIPE => e
+    rescue Errno::EHOSTUNREACH, Errno::ECONNREFUSED, Errno::ETIMEDOUT, Errno::EPIPE => e
 
-      if retries < @max_retries
-        retries += 1
+      if retries < @max_retries || max_retries == -1
         @_socket = nil
-        a_couple_of_seconds = 5**retries 
+        a_couple_of_seconds = retries ** 2
+        a_couple_of_seconds = 30 unless a_couple_of_seconds < 30
+        retries += 1
         log.warn "Could not push logs to Logmatic, attempt=#{retries} max_attempts=#{max_retries} wait=#{a_couple_of_seconds}s error=#{e.message}"
         sleep a_couple_of_seconds
         retry

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fluent-plugin-logmatic
 version: !ruby/object:Gem::Version
-  version: '0.7'
+  version: 0.8.1
 platform: ruby
 authors:
 - Logmatic support team
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-03-03 00:00:00.000000000 Z
+date: 2016-03-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -52,7 +52,7 @@ files:
 - Rakefile
 - fluent-plugin-logmatic.gemspec
 - lib/fluent/plugin/out_logmatic.rb
-homepage: https://github.com/logmatic/fluent-plugin-logmatic
+homepage: http://logmatic.io
 licenses:
 - MIT
 metadata: {}
@@ -72,7 +72,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.1
+rubygems_version: 2.6.1
 signing_key: 
 specification_version: 4
 summary: Logmatic output plugin for Fluent event collector