fluent-plugin-systemd 0.0.2 → 0.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7b6d6e4b40b45d982559089fe27d8bdb85f0939c
-  data.tar.gz: d35ef40bc4cf5d20861b44abb5341846ee064deb
+  metadata.gz: be742762901719c8b1ded7200a0daca9243088db
+  data.tar.gz: 03634c021da0ce9585eb111a52d0b126e86c7a86
 SHA512:
-  metadata.gz: 565a8b206ec54735154ee6a66c53cfdd61fe8ed11d4ffb1c05bbc327b31b17b08c2adfac5e56f3fdcabef55cb50bc2eaf5459ce2256cb4750a5084c025efc56e
-  data.tar.gz: 24deecc1bcc87379fb7e5461cd2ffb51350166a78722c4d4d4d3d4d2120ecda0f15cbfcdd58dc4b849e3cb7e9196a8588618080e1fc2a843cfcf299633121fa6
+  metadata.gz: 36a38856bcc70d5fa68e56f8e6514b8de79bc69719e7b265a8f570c629be5a9196bf9e8f459191b6234ba025ca3bcb47c0921c2ad148647683b1376055a5e415
+  data.tar.gz: 6500153a1b384a79522172abe10977a40a743aa3cd80157928638f4f076fdee2ba0c2c81b84f2e47ab9538b6ed95ee49fc99e28ecc8ba6594e4309bdd8914917

data/Gemfile

@@ -1,3 +1,4 @@
-source 'https://rubygems.org'
+source "https://rubygems.org"
 
 gemspec
+gem "string-scrub", "0.0.5"

data/README.md

@@ -10,15 +10,15 @@
 
 Simply use RubyGems:
 
-    gem install fluent-plugin-systemd
+    gem install fluent-plugin-systemd -v 0.0.3
 
     or
 
-    fluent-gem install fluent-plugin-systemd
+    fluent-gem install fluent-plugin-systemd -v 0.0.3
 
     or
 
-    td-agent-gem install fluent-plugin-systemd
+    td-agent-gem install fluent-plugin-systemd -v 0.0.3
 
 ## Configuration
 
@@ -47,16 +47,20 @@ Path to pos file, stores the journald cursor. File is created if does not exist.
 **read_from_head**
 
 If true reads all available journal from head, otherwise starts reading from tail,
- ignored if pos file exists. Defaults to false.
+ ignored if pos file exists (and is valid). Defaults to false.
 
 **strip_underscores**
 
-If true strips underscores from the beginning of systemds field names.
+If true strips underscores from the beginning of systemd field names.
 May be useful if outputting to kibana, as underscore prefixed fields are unindexed there.
 
 **tag**
 
-Required the tag for events generated by this input plugin.
+_Required_ A tag that will be added to events generated by this input.
+
+## Example
+
+For an example of a full working setup including the plugin, [take a look at](https://github.com/assemblyline/fluentd)
 
 ## Dependencies
 
@@ -64,9 +68,9 @@ This plugin depends on libsystemd
 
 ## Running the tests
 
-To run the tests simply run `rake test`
+To run the tests with docker on several distros simply run `rake`
 
-For systems without systemd the tests are run in a docker container. So you will need docker or systemd installed to work on this.
+For systems with systemd installed you can run the tests against your installed libsystemd with `rake test`
 
 ## Licence etc
 

data/Rakefile

@@ -1,27 +1,31 @@
-require 'bundler/gem_tasks'
-require 'rake/testtask'
-require 'reevoocop/rake_task'
+require "bundler/gem_tasks"
+require "rake/testtask"
+require "reevoocop/rake_task"
+require "fileutils"
 
 ReevooCop::RakeTask.new(:reevoocop)
 
-Rake::TestTask.new(:tests) do |t|
-  t.test_files = Dir['test/**/test_*.rb']
+Rake::TestTask.new(:test) do |t|
+  t.test_files = Dir["test/**/test_*.rb"]
 end
 
-task default: :test
-task build: :test
-task tests: :reevoocop
+task default: "docker:test"
+task build: "docker:test"
+task test: :reevoocop
 
 namespace :docker do
-  task :test do
-    sh 'docker build .'
-  end
-end
+  distros = [:ubuntu, :"tdagent-ubuntu", :centos, :"tdagent-centos"]
+  task test: distros
 
-task :test do
-  if system('which journalctl')
-    Rake::Task['tests'].invoke
-  else
-    Rake::Task['docker:test'].invoke
+  distros.each do |distro|
+    task distro do
+      puts "testing on #{distro}"
+      begin
+        FileUtils.cp("test/docker/Dockerfile.#{distro}", "Dockerfile")
+        sh "docker build ."
+      ensure
+        FileUtils.rm("Dockerfile")
+      end
+    end
   end
 end

data/fluent-plugin-systemd.gemspec

@@ -1,29 +1,28 @@
 # -*- encoding: utf-8 -*-
 
-lib = File.expand_path('../lib', __FILE__)
+lib = File.expand_path("../lib", __FILE__)
 $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 
 Gem::Specification.new do |spec|
-  spec.name          = 'fluent-plugin-systemd'
-  spec.version       = '0.0.2'
-  spec.authors       = ['Ed Robinson']
-  spec.email         = ['ed@reevoo.com']
+  spec.name          = "fluent-plugin-systemd"
+  spec.version       = "0.0.3"
+  spec.authors       = ["Ed Robinson"]
+  spec.email         = ["ed@reevoo.com"]
 
-  spec.summary       = 'Input plugin to read from systemd journal.'
-  spec.description   = 'This is a fluentd input plugin. It reads logs from the systemd journal.'
-  spec.homepage      = 'https://github.com/assemblyline/fluent-plugin-systemd'
-  spec.license       = 'MIT'
+  spec.summary       = "Input plugin to read from systemd journal."
+  spec.description   = "This is a fluentd input plugin. It reads logs from the systemd journal."
+  spec.homepage      = "https://github.com/assemblyline/fluent-plugin-systemd"
+  spec.license       = "MIT"
 
 
-  spec.files         = `git ls-files -z`.split("\x0").reject { |f| f.match(/^(test|spec|features)\//) }
-  spec.executables   = spec.files.grep(/^exe\//) { |f| File.basename(f) }
-  spec.require_paths = ['lib']
+  spec.files         = Dir["**/**"].reject { |f| f.match(/^(test|spec|features)\//) }
+  spec.require_paths = ["lib"]
 
-  spec.add_development_dependency 'bundler', '~> 1.10'
-  spec.add_development_dependency 'rake', '~> 10.4'
-  spec.add_development_dependency 'test-unit', '~> 3.1'
-  spec.add_development_dependency 'reevoocop'
+  spec.add_development_dependency "bundler", "~> 1.10"
+  spec.add_development_dependency "rake", "~> 10.4"
+  spec.add_development_dependency "test-unit", "~> 2.5"
+  spec.add_development_dependency "reevoocop"
 
-  spec.add_runtime_dependency 'fluentd', '~> 0.12'
-  spec.add_runtime_dependency 'systemd-journal', '~> 1.2'
+  spec.add_runtime_dependency "fluentd", "~> 0.12"
+  spec.add_runtime_dependency "systemd-journal", "~> 1.2"
 end

data/lib/fluent/plugin/in_systemd.rb

@@ -1,11 +1,11 @@
-require 'systemd/journal'
-require 'fluent/plugin/systemd/pos_writer'
+require "systemd/journal"
+require "fluent/plugin/systemd/pos_writer"
 
 module Fluent
   class SystemdInput < Input
-    Fluent::Plugin.register_input('systemd', self)
+    Fluent::Plugin.register_input("systemd", self)
 
-    config_param :path, :string, default: '/var/log/journal'
+    config_param :path, :string, default: "/var/log/journal"
     config_param :filters, :array, default: []
     config_param :pos_file, :string, default: nil
     config_param :read_from_head, :bool, default: false
@@ -16,11 +16,11 @@ module Fluent
 
     def configure(conf)
       super
-      @pos_writer = PosWriter.new(conf['pos_file'])
+      @pos_writer = PosWriter.new(conf["pos_file"])
       @journal = Systemd::Journal.new(path: path)
+      @read_from_head = conf["read_from_head"]
       journal.filter(*filters)
-      read_from = @pos_writer.cursor || (conf['read_from_head'] ? :head : :tail)
-      journal.seek(read_from)
+      seek
     end
 
     def start
@@ -38,7 +38,18 @@ module Fluent
 
     private
 
-    attr_reader :journal, :running, :lock, :cursor, :path, :pos_writer, :strip_underscores
+    attr_reader :journal, :running, :lock, :cursor, :path, :pos_writer, :strip_underscores, :read_from_head
+
+    def seek
+      journal.seek(@pos_writer.cursor || read_from)
+    rescue Systemd::JournalError
+      log.warn("Could not seek to cursor #{@pos_writer.cursor} found in pos file: #{@pos_writer.path}")
+      journal.seek(read_from)
+    end
+
+    def read_from
+      read_from_head ? :head : :tail
+    end
 
     def run
       watch do |entry|
@@ -48,7 +59,7 @@ module Fluent
 
     def formatted(entry)
       return entry.to_h unless strip_underscores
-      Hash[entry.to_h.map { |k, v| [k.gsub(/\A_+/, ''), v] }]
+      Hash[entry.to_h.map { |k, v| [k.gsub(/\A_+/, ""), v] }]
     end
 
     def watch

data/lib/fluent/plugin/systemd/pos_writer.rb

@@ -6,7 +6,7 @@ module Fluent
         setup
       end
 
-      attr_reader :cursor
+      attr_reader :cursor, :path
 
       def start
         return unless path
@@ -28,7 +28,7 @@ module Fluent
 
       private
 
-      attr_reader :path, :lock, :thread, :running
+      attr_reader :lock, :thread, :running
 
       def setup
         return unless path
@@ -46,7 +46,7 @@ module Fluent
       def write_pos
         lock.synchronize do
           if @written_cursor != cursor
-            file = File.open(path, 'w+')
+            file = File.open(path, "w+")
             file.print cursor
             file.close
             @written_cursor = cursor

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fluent-plugin-systemd
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.3
 platform: ruby
 authors:
 - Ed Robinson
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-11-10 00:00:00.000000000 Z
+date: 2016-05-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -44,14 +44,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.1'
+        version: '2.5'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.1'
+        version: '2.5'
 - !ruby/object:Gem::Dependency
   name: reevoocop
   requirement: !ruby/object:Gem::Requirement
@@ -101,9 +101,6 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- ".gitignore"
-- ".travis.yml"
-- Dockerfile
 - Gemfile
 - LICENCE
 - README.md
@@ -131,8 +128,9 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.3
+rubygems_version: 2.4.5.1
 signing_key: 
 specification_version: 4
 summary: Input plugin to read from systemd journal.
 test_files: []
+has_rdoc: 

data/.gitignore

@@ -1 +0,0 @@
-Gemfile.lock

data/.travis.yml

@@ -1,4 +0,0 @@
-language: ruby
-sudo: required
-services:
-  - docker

data/Dockerfile

@@ -1,21 +0,0 @@
-FROM quay.io/assemblyline/buildpack_deps:15.10
-
-RUN echo "deb http://ppa.launchpad.net/brightbox/ruby-ng/ubuntu vivid main" | tee /etc/apt/sources.list.d/ruby-ng.list \
-      && echo "deb-src http://ppa.launchpad.net/brightbox/ruby-ng/ubuntu vivid main" | tee -a /etc/apt/sources.list.d/ruby-ng.list \
-      && apt-key adv --keyserver keyserver.ubuntu.com --recv-keys C3173AA6 \
-      && apt-get update -q && apt-get install -qy --no-install-recommends \
-        ruby2.2 \
-        ruby2.2-dev \
-        libsystemd-dev \
-      && apt-get clean \
-      && rm -rf /var/lib/apt/lists/* \
-      && truncate -s 0 /var/log/*log \
-      && gem install bundler
-
-WORKDIR /usr/local/src
-
-COPY Gemfile ./
-COPY fluent-plugin-systemd.gemspec ./
-RUN bundle install -j4 -r3
-COPY . .
-RUN bundle exec rake