fluent-plugin-systemd 1.0.2 → 1.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 51791abc856b31177f2053533b7d8d3cf31e9d7d
-  data.tar.gz: 5e306cc82ca65d76d69bf71f50208b5d3aaed005
+SHA256:
+  metadata.gz: 5fd5812366214998e6e503dc83b4fa502a5787cb6574ace1a27a0579d5897376
+  data.tar.gz: 9555574c64af76aeb1cc4acfd5ef20a6eda63cea01ce4f5a45d2929707ef4466
 SHA512:
-  metadata.gz: 413d7ff33b0224b0af859e58b58045781fda8dd35139a9b11db5cc37f3a33f9a6f26527de8aa380e78a963049588fb01940d2b4414ac8f3b638b49bb24c3d71f
-  data.tar.gz: 6fcab5af997ce17913cd44e7cd81531fcc399e1a998f39dfebb2c7b7721eda29b32f1b6e9ef7c0cf744809aee1915cea25ec224c8e4b9e04bcdf119b4cfe6bd1
+  metadata.gz: 84eccb26a0d0d9e52c8a257221f0076f1f502d535cfc383ef0e844ccab83a83d928d06fe8085c7fe963b2f10254efa024b290e8c2e7ac73fe9dec4fc7ae72b12
+  data.tar.gz: 3145138bb666f7c2a7f5287a0bd6c93fe8a3ba14741b9d356da00787139307db577e0f3bd5e6f1556c2f97987fad2dc4d501d98f79bb02a1f8befe04c529ba23

data/README.md

@@ -28,11 +28,11 @@ Join the #plugin-systemd channel on the [Fluentd Slack](http://slack.fluentd.org
 
 Simply use RubyGems:
 
-    gem install fluent-plugin-systemd -v 1.0.1
+    gem install fluent-plugin-systemd -v 1.0.3
 
 or
 
-    td-agent-gem install fluent-plugin-systemd -v 1.0.1
+    td-agent-gem install fluent-plugin-systemd -v 1.0.3
 
 ## Upgrading
 
@@ -47,8 +47,9 @@ If you are upgrading to version 1.0 from a previous version of this plugin take
       matches [{ "_SYSTEMD_UNIT": "kubelet.service" }]
       read_from_head true
 
-      <storage kubelet-pos>
+      <storage>
         @type local
+        path /var/log/fluentd-journald-kubelet-cursor.json
       </storage>
 
       <entry>
@@ -84,7 +85,7 @@ description of this property and how to use it.
 
 **`storage`**
 
-Configuration for a [storage plugin](http://docs.fluentd.org/v0.14/articles/storage-plugin-overview) used to store the journald cursor.
+Configuration for a [storage plugin](https://docs.fluentd.org/storage) used to store the journald cursor.
 
 **`read_from_head`**
 

data/lib/fluent/plugin/in_systemd.rb

@@ -92,6 +92,7 @@ module Fluent
       def seek_to(pos)
         @journal.seek(pos)
         return if pos == :head
+
         if pos == :tail
           @journal.move(-2)
         else
@@ -105,6 +106,7 @@ module Fluent
 
       def run
         return unless @journal || init_journal
+
         init_journal if @journal.wait(0) == :invalidate
         watch do |entry|
           emit(entry)
@@ -116,6 +118,7 @@ module Fluent
       rescue Fluent::Plugin::Buffer::BufferOverflowError => e
         retries ||= 0
         raise e if retries > 10
+
         retries += 1
         sleep 1.5**retries + rand(0..3)
         retry
@@ -129,6 +132,8 @@ module Fluent
 
       def watch(&block)
         yield_current_entry(&block) while @journal.move_next
+      rescue Systemd::JournalError => e
+        log.warn("Error moving to next Journal entry: #{e.class}: #{e.message}")
       end
 
       def yield_current_entry

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

@@ -67,6 +67,7 @@ module Fluent
       # Expose config state as read-only instance properties of the mutator.
       def method_missing(sym, *args)
         return @opts[sym] if @opts.members.include?(sym)
+
         super
       end
 
@@ -80,6 +81,7 @@ module Fluent
       def run(entry)
         return entry.to_h if @no_transform
         return map_fields(entry) if @opts.field_map_strict
+
         format_fields(entry, map_fields(entry))
       end
 
@@ -90,6 +92,7 @@ module Fluent
         @map.each_with_object({}) do |(cstm, sysds), mapped|
           vals = sysds.collect { |fld| entry[fld] }.compact
           next if vals.empty? # systemd field does not exist in source entry
+
           mapped[cstm] = join_if_needed(vals)
         end
       end
@@ -103,6 +106,7 @@ module Fluent
         entry.each_with_object(mapped || {}) do |(fld, val), formatted_entry|
           # don't mess with explicitly mapped fields
           next if @map_src_fields.include?(fld)
+
           fld = format_field_name(fld)
           # account for mapping (appending) to an existing systemd field
           formatted_entry[fld] = join_if_needed([val, mapped[fld]])
@@ -111,6 +115,7 @@ module Fluent
 
       def warnings
         return [] unless field_map_strict && field_map.empty?
+
         '`field_map_strict` set to true with empty `field_map`, expect no fields'
       end
 
@@ -119,6 +124,7 @@ module Fluent
       def join_if_needed(values)
         values.compact!
         return values.first if values.length == 1
+
         values.join(' ')
       end
 
@@ -146,7 +152,7 @@ module Fluent
         end
       end
 
-      def validate_all_strings(arr, message, allow_nesting = false)
+      def validate_all_strings(arr, message, allow_nesting = false) # rubocop:disable Style/OptionalBooleanParameter
         valid = arr.all? do |value|
           value.is_a?(String) || allow_nesting && value.is_a?(Array) && value.all? { |key| key.is_a?(String) }
         end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fluent-plugin-systemd
 version: !ruby/object:Gem::Version
-  version: 1.0.2
+  version: 1.0.3
 platform: ruby
 authors:
 - Ed Robinson
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2019-02-07 00:00:00.000000000 Z
+date: 2021-04-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -44,28 +44,28 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.5'
+        version: '3.4'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.5'
+        version: '3.4'
 - !ruby/object:Gem::Dependency
   name: rubocop
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - '='
       - !ruby/object:Gem::Version
-        version: 0.53.0
+        version: 1.13.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - '='
       - !ruby/object:Gem::Version
-        version: 0.53.0
+        version: 1.13.0
 - !ruby/object:Gem::Dependency
   name: fluentd
   requirement: !ruby/object:Gem::Requirement
@@ -92,14 +92,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.3.2
+        version: 1.4.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.3.2
+        version: 1.4.2
 description: This is a fluentd input plugin. It reads logs from the systemd journal.
 email:
 - edward-robinson@cookpad.com
@@ -116,7 +116,7 @@ homepage: https://github.com/reevoo/fluent-plugin-systemd
 licenses:
 - Apache-2.0
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -131,9 +131,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.6.13
-signing_key: 
+rubygems_version: 3.2.15
+signing_key:
 specification_version: 4
 summary: Input plugin to read from systemd journal.
 test_files: []