fluent-plugin-logmatic 0.8.3 → 0.9.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2a0dcd21af7bb308134c3c5d993cc2aae9900ed6
-  data.tar.gz: 9731743d33d1056d9123c0306f65bcfb5d188849
+  metadata.gz: 49374af53808bfdd30a59f976c71fb1e161ceecb
+  data.tar.gz: 776691802f58b23f15ee374916b7e9b594796253
 SHA512:
-  metadata.gz: 07d7ecbbec57ee7129f11c9e923a79f402b31cefbbb6d90b2a7e55cd4c337f1cab52591900e7eb1adf53af681aa101e2470cbea7e6244ca80be3b0806171ddc0
-  data.tar.gz: 21c4a44a42b35ac0f38ac07bf5cef2cad251b97d8be17442ac58fe68f3a3b832216c3696450d9e312d713804a1e9ecfda96f7a317ab0505e66573ae78e79ff77
+  metadata.gz: 845f4a9a04e4ee16e8b3a2386cc452b990aa437c5be54eb9960ed8ea1a2384ac12770b09cd3caace07f31ac74da5c984bfc3b291821ac35dc5fb809a5945fcb8
+  data.tar.gz: 7c177051f77ae73a8f4f58912763a69547cdbe362e7db1e2c43c3aedeafc67347e880454e9e68e7caed6d82f0b4dc192bc83961d72a587dfc737854ecf320984

data/README.md

@@ -24,10 +24,12 @@ To match events and send them to logmatic.io, simply add the following code to y
 
   @type logmatic
   @id awesome_agent
-  
   api_key <your_api_key>
 
-
+  # Optional
+  include_tag_key true
+  tag_key 'tag'
+  
 </match>
 
 ```

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.8.3"
+  spec.version       = "0.9.0"
   spec.authors       = ["Logmatic support team"]
   spec.email         = ["support@logmatic.io"]
   spec.summary       = "Logmatic output plugin for Fluent event collector"
   spec.homepage      = "http://logmatic.io"
   spec.license       = "MIT"
 
-  spec.files         = [".gitignore", "Gemfile", "LICENSE", "README.md", "Rakefile", "fluent-plugin-logmatic.gemspec", "lib/fluent/plugin/out_logmatic.rb"]
+  spec.files         = [".gitignore", "Gemfile", "LICENSE", "README.md", "Rakefile", "fluent-plugin-logmatic.gemspec", "lib/fluent/plugin/out_logmatic.rb", "lib/fluent/plugin/out_logmatic_http.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_http.rb

@@ -0,0 +1,101 @@
+class Fluent::LogmaticOutput < Fluent::BufferedOutput
+  class ConnectionFailure < StandardError;
+  end
+
+  # Register the plugin
+  Fluent::Plugin.register_output('logmatic_http', self)
+
+  # Output settings
+  config_param :use_json, :bool, :default => true
+  config_param :include_tag_key, :bool, :default => false
+  config_param :tag_key, :string, :default => 'tag'
+
+  # API Settings
+  config_param :api_key, :string
+
+  #  Connection settings
+  config_param :max_retries, :integer, :default => -1
+  config_param :endpoint, :string, :default => "https://api.logmatic.io/v1/input/"
+
+
+  def initialize
+    super
+    require 'net/http'
+    require 'net/https'
+    require 'uri'
+  end
+
+  def configure(conf)
+    super(conf)
+    # Http client
+    @uri = URI.parse(@endpoint + @api_key)
+    @https = Net::HTTP.new(@uri.host, @uri.port)
+    @https.use_ssl = true
+    log.trace("Setting new connection to https://#{@uri.host}:#{@uri.port}")
+  end
+
+  def start
+    super
+  end
+
+  def shutdown
+    super
+  end
+
+
+  # This method is called when an event reaches Fluentd.
+  def format(tag, time, record)
+    return [tag, record].to_msgpack
+  end
+
+  # 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
+
+    # Pack messages
+    chunk.msgpack_each do |tag, record|
+      next unless record.is_a? Hash
+      next unless @use_json or record.has_key? "message"
+
+      if @include_tag_key
+        record[@tag_key] = tag
+      end
+      messages.push record.to_json
+    end
+
+    # Send them
+    log.trace("Sending #{messages.length} messages")
+    retries = 0
+    begin
+
+      req = Net::HTTP::Post.new(@uri.path)
+      req['Content-Type'] = 'application/json'
+      req.body = data
+      log.trace("Posting data")
+      res = @https.request(messages.to_json)
+      log.trace("Status code: #{res.code}")
+
+      if (res.code != 0 && res.code != 400)
+        if retries < @max_retries || max_retries == -1
+
+          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=#{res.code}"
+
+          sleep a_couple_of_seconds
+
+          raise "Status code: #{res.code}"
+
+        end
+      end
+    rescue => e
+      # Handle some failures
+      retry
+      raise ConnectionFailure, "Could not push logs to Logmatic after #{retries} retries, #{e.message}"
+    end
+  end
+
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fluent-plugin-logmatic
 version: !ruby/object:Gem::Version
-  version: 0.8.3
+  version: 0.9.0
 platform: ruby
 authors:
 - Logmatic support team
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-12-06 00:00:00.000000000 Z
+date: 2017-05-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -52,6 +52,7 @@ files:
 - Rakefile
 - fluent-plugin-logmatic.gemspec
 - lib/fluent/plugin/out_logmatic.rb
+- lib/fluent/plugin/out_logmatic_http.rb
 homepage: http://logmatic.io
 licenses:
 - MIT
@@ -72,7 +73,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.1
+rubygems_version: 2.6.8
 signing_key: 
 specification_version: 4
 summary: Logmatic output plugin for Fluent event collector