fluent-plugin-logdna 0.1.5 → 0.1.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 14b55b11f2a8e65f520848e562af9c9b35c5fcc7
-  data.tar.gz: 2d37a86e2329cfd1b24850f362cd90b9c30f07d0
+  metadata.gz: '0398268bf9892c432c3967e42597f632f7ee7649'
+  data.tar.gz: 8af44955e3a216ee649e5f24a4f0f9704895fe73
 SHA512:
-  metadata.gz: 4af3c7d17e7aef3a6b62f1ca890bb32ebf6f6ce9a768aa2bc6dc6169d2d8ae0a057aab8a0592cb9470a38cc9b0755c4d58ed751c9dd17bcf21f334547209a382
-  data.tar.gz: c37bc197d3799956743d4596f1c8b37ea7a13f10c4053c9ffd62a54a6366115aa9c149e949a46f6ab19079b2ccb4e1a555e402eff813ea00b7c495234dfbadcc
+  metadata.gz: 417514d84e3013f733980cfb9246a0b24b185edc7a01a90fad0f6a7ed2ad5b4ac2ac23aacb26e8481ba896072a3cfdebd07c9f48b01c108d1a6204b5f52552d6
+  data.tar.gz: fc8bb95df974512ce1e1dc46bdeda3a0b3e78f26cc20467858ead062784591fa3ef28c0022bd17cccbad8acce20b4c800d1480a7ff3d17ed419b805b71b0931e

data/README.md

@@ -8,21 +8,52 @@ Using fluent-plugin-logdna, you can send the logs you collect with Fluentd to Lo
 
 * Install [Fluentd](http://www.fluentd.org/download)
 * `gem install fluent-plugin-logdna` or `td-agent-gem install fluent-plugin-logdna` if you are using td-agent.
-* Make sure you have a LogDNA account.
-* Configure Fluentd like the following:
+* Add the contents below to `/etc/fluent/fluent.conf`. For td-agent, use `/etc/td-agent/td-agent.conf`:
 
 ~~~~~
 <match your_match>
   @type logdna
-  api_key xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx # paste your api key here (required)
-  hostname my_host                         # replace with your hostname (required)
-  mac C0:FF:EE:C0:FF:EE                    # replace with host mac address
-  ip 127.0.0.1                             # replace with host ip address
-  app my_app                               # replace with your app name
+  api_key xxxxxxxxxxxxxxxxxxxxxxxxxxx        # paste your api key here (required)
+  hostname "#{Socket.gethostname}"           # your hostname (required)
+  app my_app                                 # replace with your app name
+  #mac C0:FF:EE:C0:FF:EE                     # optional mac address
+  #ip 127.0.0.1                              # optional ip address
+  buffer_chunk_limit 1m                      # do not increase past 10m (10MB) or your logs will be rejected by our server.
+  flush_at_shutdown true                     # only needed with file buffer
 </match>
 ~~~~~
 * Restart fluentd to pick up the configuration changes.
 
-For advanced configuration options, refer to the [buffered output parameters documentation.](http://docs.fluentd.org/articles/output-plugin-overview#buffered-output-parameters)
+### Recommended Configuration Parameters
+
+* buffer_type
+  - We recommend setting this to memory for development and file for production (file setting requires a buffer_path).
+* buffer_queue_limit, buffer_chunk_limit
+  - We do not recommend increasing buffer_chunk_limit past 10MB.
+* flush_interval
+  - Default is 60s. We recommend keeping this well above 5s.
+* retry_wait, max_retry_wait, retry_limit, disable_retry_limit
+  - We recommend increasing these values if you are encountering problems.
+
+### Options
+
+* App name and log level can also be provided on a line-by-line basis over JSON:
+* `_app` and `level` will override the config
+
+If you don't have a LogDNA account, you can create one on https://logdna.com or if you're on macOS w/[Homebrew](https://brew.sh) installed:
+
+```
+brew cask install logdna-cli
+logdna register <email>
+# now paste the api key above
+```
+
+### LogDNA Pay-per-gig Pricing
+
+Our [paid plans](https://logdna.com/#pricing) start at $1.25/GB per month, pay for what you use / no fixed data buckets / all paid plans include all features.
+
+## Additional Options
+
+For advanced configuration options, please refer to the [buffered output parameters documentation.](http://docs.fluentd.org/articles/output-plugin-overview#buffered-output-parameters)
 
 Questions or concerns? Contact [support@logdna.com](mailto:support@logdna.com).

data/fluent-plugin-logdna.gemspec

@@ -3,7 +3,7 @@ require 'date'
 
 Gem::Specification.new do |s|
   s.name        = 'fluent-plugin-logdna'
-  s.version     = '0.1.5'
+  s.version     = '0.1.6'
   s.date        = Date.today.to_s
   s.summary     = 'LogDNA plugin for Fluentd'
   s.description = 'Fluentd plugin for supplying output to LogDNA.'

data/lib/fluent/plugin/out_logdna.rb

@@ -5,6 +5,7 @@ module Fluent
     Fluent::Plugin.register_output('logdna', self)
 
     INGESTER_DOMAIN = 'https://logs.logdna.com'.freeze
+    MAX_RETRIES = 5
 
     config_param :api_key, :string, secret: true
     config_param :hostname, :string
@@ -22,7 +23,9 @@ module Fluent
       require 'json'
       require 'base64'
       require 'http'
+      HTTP.default_options = { :keep_alive_timeout => 60 }
       @ingester = HTTP.persistent INGESTER_DOMAIN
+      @requests = Queue.new
     end
 
     def shutdown
@@ -37,7 +40,8 @@ module Fluent
     def write(chunk)
       body = chunk_to_body(chunk)
       response = send_request(body)
-      handle(response)
+      raise 'Encountered server error' if response.code >= 400
+      response.flush
     end
 
     private
@@ -65,17 +69,6 @@ module Fluent
       line
     end
 
-    def handle(response)
-      if response.code >= 400
-        print "Error connecting to LogDNA ingester. \n"
-        print "Details: #{response}"
-      else
-        print "Success! #{response}"
-      end
-
-      response.flush
-    end
-
     def send_request(body)
       now = Time.now.to_i
       url = "/logs/ingest?hostname=#{@host}&mac=#{@mac}&ip=#{@ip}&now=#{now}"

metadata

@@ -1,53 +1,53 @@
 --- !ruby/object:Gem::Specification
 name: fluent-plugin-logdna
 version: !ruby/object:Gem::Version
-  version: 0.1.5
+  version: 0.1.6
 platform: ruby
 authors:
 - Edwin Lai
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-03-16 00:00:00.000000000 Z
+date: 2017-03-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: fluentd
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 0.12.0
-    - - <
+    - - "<"
       - !ruby/object:Gem::Version
         version: '2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 0.12.0
-    - - <
+    - - "<"
       - !ruby/object:Gem::Version
         version: '2'
 - !ruby/object:Gem::Dependency
   name: http
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '2.0'
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 2.0.3
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '2.0'
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 2.0.3
 description: Fluentd plugin for supplying output to LogDNA.
@@ -56,8 +56,8 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- .gitignore
-- .ruby-version
+- ".gitignore"
+- ".ruby-version"
 - LICENSE
 - README.md
 - fluent-plugin-logdna.gemspec
@@ -72,17 +72,17 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: 2.0.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.14.1
+rubygems_version: 2.6.8
 signing_key: 
 specification_version: 4
 summary: LogDNA plugin for Fluentd