fluent-plugin-logdna 0.1.7 → 0.1.8

checksums.yaml

@@ -1,15 +1,7 @@
 ---
-!binary "U0hBMQ==":
-  metadata.gz: !binary |-
-    YjQ0M2E5NzA3ZmUxM2VlMjg0ZTJmMTgyYmM1M2Q5YjI0YjZiZTRiMQ==
-  data.tar.gz: !binary |-
-    YmU2ZmViY2E0MTg4MzI0OTNkZTVjZDhhZDUxMDZjMWE4NTM4YjcxYQ==
+SHA1:
+  metadata.gz: c2936edd3832b6adeec6b66aecd85b3e7535824a
+  data.tar.gz: 331fa28c467e2eaf655a8efb703ea8bf8990f053
 SHA512:
-  metadata.gz: !binary |-
-    MDVlNTBiMDQ1MWRmMzcxMzdiZDg0M2I0OWE4MmVhODRmY2VjZWI5ZjE4YmM1
-    NzBkMTQwMzY3NzliMTVmYzgxMjMyM2Q2NzA2NDA5MDZjNDM0ZDJiZDEwNWU0
-    NzlkY2ExYWYwNTFlZmM0ZTQ0ZDRmZDk2OTAyZGUyNzU0NzBhYzQ=
-  data.tar.gz: !binary |-
-    N2JiZjBkMjAxNGQ2ZTcyYWU0OGJmMTZjYzY3YzhiNzU0NjA5MmUyNjM2NTI0
-    MjA2YzFmNjg4MzRjZDFkYjA1YmI2ZGE5ODlhYjg5MGJhY2FiZWZlNzE3ZjBk
-    OThjN2NjZjA4MWRlN2E5OWJhNjU5ZDEyMWIxNWEwZjA2MThjYWY=
+  metadata.gz: 4043ab49a5f298e32f11a92ce990d39537ab94253498b639d16b809c24ebf69d718f663b55f8071f0f704494c0739d591aedcb393392573785a2b955c75f15c7
+  data.tar.gz: 28a47a041aa02974066142503c478aa2a429b250ed652e65c8246851d6bcbc675c8066935c3cc83e7b06332ba24ae14a1a1985c87dc12aedb1c8d61f0c414e07

data/Gemfile

@@ -0,0 +1,5 @@
+source 'https://rubygems.org'
+
+gemspec
+
+gem "rake", "~> 12.3"

data/Gemfile.lock

@@ -0,0 +1,63 @@
+PATH
+  remote: .
+  specs:
+    fluent-plugin-logdna (0.1.7.1)
+      fluentd (>= 0.12.0, < 2)
+      http (~> 2.0, >= 2.0.3)
+
+GEM
+  remote: https://rubygems.org/
+  specs:
+    addressable (2.5.2)
+      public_suffix (>= 2.0.2, < 4.0)
+    cool.io (1.5.3)
+    dig_rb (1.0.1)
+    domain_name (0.5.20180417)
+      unf (>= 0.0.5, < 1.0.0)
+    fluentd (1.0.2)
+      cool.io (>= 1.4.5, < 2.0.0)
+      dig_rb (~> 1.0.0)
+      http_parser.rb (>= 0.5.1, < 0.7.0)
+      msgpack (>= 0.7.0, < 2.0.0)
+      serverengine (>= 2.0.4, < 3.0.0)
+      sigdump (~> 0.2.2)
+      strptime (~> 0.1)
+      tzinfo (~> 1.0)
+      tzinfo-data (~> 1.0)
+      yajl-ruby (~> 1.0)
+    http (2.2.2)
+      addressable (~> 2.3)
+      http-cookie (~> 1.0)
+      http-form_data (~> 1.0.1)
+      http_parser.rb (~> 0.6.0)
+    http-cookie (1.0.3)
+      domain_name (~> 0.5)
+    http-form_data (1.0.3)
+    http_parser.rb (0.6.0)
+    msgpack (1.2.0)
+    public_suffix (3.0.1)
+    rake (12.3.1)
+    serverengine (2.0.5)
+      sigdump (~> 0.2.2)
+    sigdump (0.2.4)
+    strptime (0.1.9)
+    thread_safe (0.3.6)
+    tzinfo (1.2.4)
+      thread_safe (~> 0.1)
+    tzinfo-data (1.2017.3)
+      tzinfo (>= 1.0.0)
+    unf (0.1.4)
+      unf_ext
+    unf_ext (0.0.7.5)
+    yajl-ruby (1.3.1)
+
+PLATFORMS
+  ruby
+
+DEPENDENCIES
+  bundler (~> 1.16)
+  fluent-plugin-logdna!
+  rake (~> 12.3)
+
+BUNDLED WITH
+   1.16.0

data/Makefile

@@ -0,0 +1,62 @@
+# Generate a debian package for fluent-plugin-logdna
+#
+# This assumes that you have the td-agent package already installed
+# https://docs.fluentd.org/v1.0/articles/install-by-deb
+#
+# The package is created with fpm (it does not necessarily need to be
+# installed into the td-agent embedded ruby). To install fpm run:
+# $ sudo gem install --no-ri --no-rdoc fpm
+#
+# The td-agent package installs an embedded ruby distribution in
+# /opt/td-agent/embedded which has its own list of gems. Our built package
+# cannot conflict with those gems so we will elect to bundle a subset of gems
+# with our package. This may conflict with other packages and this package is
+# not intended to be a general purpose package.
+
+# Paths to td-agent specific versions of bundle and gem
+BUNDLE=/opt/td-agent/embedded/bin/bundle
+GEM=/opt/td-agent/embedded/bin/gem
+RUBY=/opt/td-agent/embedded/bin/ruby
+RAKE=/opt/td-agent/embedded/bin/rake
+FPM=fpm
+
+# Bundle will unpack gems into the bundle directory
+BUNDLE_DIR=./vendor/bundle
+# Bundle will save gems in the cache directory
+CACHE_DIR=./vendor/cache
+PKG_DIR=pkg
+# Bundle will store settings and locks in the dot_bundle directory
+DOT_BUNDLE=./.bundle
+
+GEMSPEC := ${wildcard *.gemspec}
+NAME    := ${shell $(RUBY) -e 'puts Gem::Specification::load("$(GEMSPEC)").name'}
+VERSION := ${shell $(RUBY) -e 'puts Gem::Specification::load("$(GEMSPEC)").version.to_s'}
+GEMFILE := ${shell $(RUBY) -e 'puts Gem::Specification::load("$(GEMSPEC)").file_name'}
+DEBFILE := $(NAME)_$(VERSION)_all.deb
+
+all: $(DEBFILE)
+
+$(BUNDLE_DIR): Gemfile.lock
+	$(BUNDLE) install --frozen --path $(BUNDLE_DIR)
+
+$(CACHE_DIR): $(BUNDLE_DIR) Gemfile.lock
+	$(BUNDLE) package --no-install
+
+$(GEMFILE): $(BUNDLE_DIR)
+	$(BUNDLE) exec $(GEM) build -V $(GEMSPEC)
+
+$(DEBFILE): $(GEMFILE) $(CACHE_DIR)
+	$(BUNDLE) exec $(RAKE) gemdep:minimal
+	$(FPM) --input-type gem --output-type deb \
+	  --no-auto-depends \
+	  --no-gem-fix-name \
+	  --gem-gem $(GEM) \
+	  --depends 'td-agent > 2' \
+	  --deb-build-depends 'td-agent > 2' \
+	  pkg/*.gem $(GEMFILE)
+
+clean:
+	-$(BUNDLE) exec $(RAKE) clobber
+	rm -rf $(BUNDLE_DIR) $(CACHE_DIR) $(DOT_BUNDLE) $(GEMFILE) $(DEBFILE)
+
+.PHONY: all clean

data/README.md

@@ -52,6 +52,20 @@ logdna register <email>
 
 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.
 
+## Building a debian package for td-agent
+If you use td-agent you can build a debian package instead of installing via
+td-agent-gem. This requires that td-agent is already installed and that you've
+installed [fpm](http://fpm.readthedocs.io/en/latest/index.html). Then just run
+`make` in your git directory.
+
+```
+gem install --no-ri --no-rdoc fpm
+git clone https://github.com/logdna/fluent-plugin-logdna
+cd fluent-plugin-logdna
+make
+sudo dpkg -i fluent-plugin-logdna*.deb
+```
+
 ## 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)

data/Rakefile

@@ -0,0 +1,48 @@
+require "set"
+
+# Directory to place gems to bundle with our main gem
+PACKAGE_DIR = "pkg"
+require "rake/clean"
+CLOBBER.include PACKAGE_DIR
+
+desc "Copies gem dependencies to the #{PACKAGE_DIR} folder"
+task "gemdep" do
+  gem_copy gen_gem_list
+end
+
+desc "Copies gem dependencies which don't overlap with td-agent to the #{PACKAGE_DIR} folder"
+task "gemdep:minimal" do
+  MINIMAL_GEMS = %W[
+    unf_ext
+    unf
+    domain_name
+    http-cookie
+    http-form_data
+    http
+  ]
+  gem_copy gen_gem_list MINIMAL_GEMS
+end
+
+def gen_gem_list(subset = [])
+  myself = Bundler.load_gemspec(Dir[File.join(Bundler::SharedHelpers.pwd, "{,*}.gemspec")].first)
+  to_pull = Set[]
+  Bundler.locked_gems.specs.each do |spec|
+    next if spec.name == myself.name
+    if subset.empty?
+      to_pull.add(spec)
+    else
+      if subset.include? spec.name
+        to_pull.add(spec)
+      end
+    end
+  end
+  to_pull
+end
+
+# This assumes that bundle install has already been run (which populates
+# Bundler.app_cache with the gems of dependencies).
+def gem_copy(specs)
+  Bundler.mkdir_p PACKAGE_DIR
+  sources = specs.collect { |s| Bundler.app_cache.join "#{s.full_name}.gem" }
+  FileUtils.cp sources, PACKAGE_DIR, :verbose => true
+end

data/fluent-plugin-logdna.gemspec

@@ -3,12 +3,12 @@ require 'date'
 
 Gem::Specification.new do |s|
   s.name        = 'fluent-plugin-logdna'
-  s.version     = '0.1.7'
+  s.version     = '0.1.8'
   s.date        = Date.today.to_s
   s.summary     = 'LogDNA plugin for Fluentd'
   s.description = 'Fluentd plugin for supplying output to LogDNA.'
-  s.authors     = ['Edwin Lai']
-  s.email       = 'edwin@logdna.com'
+  s.authors     = ['LogDNA']
+  s.email       = 'support@logdna.com'
   s.files       = ['lib/fluent/plugin/out_logdna.rb']
   s.homepage    = 'https://github.com/logdna/fluent-plugin-logdna'
   s.license     = 'MIT'
@@ -17,6 +17,7 @@ Gem::Specification.new do |s|
   s.files         = `git ls-files -z`.split("\x0")
   s.executables   = s.files.grep(%r{^bin/}) { |f| File.basename(f) }
   s.required_ruby_version = Gem::Requirement.new('>= 2.0.0')
+  s.add_development_dependency "bundler", "~> 1.16"
   s.add_runtime_dependency 'fluentd', '>= 0.12.0', '< 2'
   s.add_runtime_dependency 'http', '~> 2.0', '>= 2.0.3'
 end

data/lib/fluent/plugin/out_logdna.rb

@@ -4,7 +4,6 @@ module Fluent
   class LogDNAOutput < Fluent::BufferedOutput
     Fluent::Plugin.register_output('logdna', self)
 
-    INGESTER_DOMAIN = 'https://logs.logdna.com'.freeze
     MAX_RETRIES = 5
 
     config_param :api_key, :string, secret: true
@@ -12,6 +11,8 @@ module Fluent
     config_param :mac, :string, default: nil
     config_param :ip, :string, default: nil
     config_param :app, :string, default: nil
+    config_param :file, :string, default: nil
+    config_param :ingester_domain, :string, default: 'https://logs.logdna.com'
 
     def configure(conf)
       super
@@ -24,7 +25,7 @@ module Fluent
       require 'base64'
       require 'http'
       HTTP.default_options = { :keep_alive_timeout => 60 }
-      @ingester = HTTP.persistent INGESTER_DOMAIN
+      @ingester = HTTP.persistent @ingester_domain
       @requests = Queue.new
     end
 
@@ -61,11 +62,19 @@ module Fluent
       line = {
         level: record['level'] || record['severity'] || tag.split('.').last,
         timestamp: time,
-        line: record['message'] || record.to_json
+        line: record.to_json
       }
+      # At least one of "file" or "app" is required.
+      line[:file] = record['file']
+      line[:file] ||= @file if @file
+      line.delete(:file) if line[:file].nil?
       line[:app] = record['_app'] || record['app']
       line[:app] ||= @app if @app
       line.delete(:app) if line[:app].nil?
+      line[:env] = record['env']
+      line.delete(:env) if line[:env].nil?
+      line[:meta] = record['meta']
+      line.delete(:meta) if line[:meta].nil?
       line
     end
 

metadata

@@ -1,65 +1,83 @@
 --- !ruby/object:Gem::Specification
 name: fluent-plugin-logdna
 version: !ruby/object:Gem::Version
-  version: 0.1.7
+  version: 0.1.8
 platform: ruby
 authors:
-- Edwin Lai
+- LogDNA
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-04-20 00:00:00.000000000 Z
+date: 2019-03-20 00:00:00.000000000 Z
 dependencies:
+- !ruby/object:Gem::Dependency
+  name: bundler
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.16'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.16'
 - !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.
-email: edwin@logdna.com
+email: support@logdna.com
 executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- .gitignore
-- .ruby-version
+- ".gitignore"
+- ".ruby-version"
+- Gemfile
+- Gemfile.lock
 - LICENSE
+- Makefile
 - README.md
+- Rakefile
 - fluent-plugin-logdna.gemspec
 - lib/fluent/plugin/out_logdna.rb
 homepage: https://github.com/logdna/fluent-plugin-logdna
@@ -72,17 +90,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.6.11
+rubygems_version: 2.5.2.3
 signing_key: 
 specification_version: 4
 summary: LogDNA plugin for Fluentd