fluent-plugin-kubernetes_metadata_filter 2.5.0 → 3.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b1991a6b8cd09f65728588401e697dda36954b94cf75b625789c6e7773d50ccf
-  data.tar.gz: df46f28a113c17aa3e2174d3ad23edb0b5b93fb6d65d5f02787d6ac83ac129a2
+  metadata.gz: b386e5a9f06d9356809efffdf54c368b21a6cdda6a8b1687ce9e60b2352e38c7
+  data.tar.gz: a9cd4f1169c0318ee418943614ba6c80fd8ae99837605d0597e4964ff3dc1dfb
 SHA512:
-  metadata.gz: 1a41d498af8a2e92723c05679608294d07acf2cf7a87dfdf5921fe3a385df6369003eef939dd5aeabf970c67f31eb319ac1485d566ac110bcbe6b79f5acc392a
-  data.tar.gz: e62c355dbdb0ac1e89e43534c5929c80e82b166f5c614b1967d6ff79658835881a9c6803d5072e85a41c83fbefc8db326ba95c6d2f1c5a20ca1b8a0f18ce3cf1
+  metadata.gz: 144b68bc69c03c9d4812b2ff6897dcc5b3f56152e396ff1b2d75217369bb5cf7c94882767b25793a84604e62f62dd98f212d79e03ca7c52942e21d03623b441f
+  data.tar.gz: 2bddc63b3576adfe0a6d0052f8727b3b88635c47dec586f6e5fbaf9785b498564d67205b4c4b0247023ebfe50fa0efec0ad3de6dd6b803aff60a66ae7bdc56ff

data/.circleci/config.yml

@@ -4,7 +4,8 @@ install: &install
   name: Install bundle
   command: |
             gem install bundler
-            bundle install --path vendor/bundle
+            bundle config set --local path vendor/bundle
+            bundle install
 
 missingdeps: &missingdeps
   name: Install missing dependecies
@@ -12,23 +13,20 @@ missingdeps: &missingdeps
             cat /etc/os-release
             printf "deb http://deb.debian.org/debian buster main\ndeb http://security.debian.org buster/updates main\ndeb-src http://security.debian.org buster/updates main" > /tmp/sources.list
             sudo cp /tmp/sources.list /etc/apt/sources.list
-            sudo apt-get update
+            sudo apt-get --allow-releaseinfo-change update
             sudo apt-get install cmake libicu-dev libssl-dev
-  
+
 test: &test
   name: Test bundle
-  command: bundle exec rake test
+  command: bundle exec rake test --trace
 
 executors:
-  ruby-2-4:
-    docker:
-      - image: circleci/ruby:2.4.6
-  ruby-2-5:
-    docker:
-      - image: circleci/ruby:2.5.5
   ruby-2-6:
     docker:
       - image: circleci/ruby:2.6.3
+  ruby-2-7:
+    docker:
+      - image: circleci/ruby:2.7.1
 jobs:
   "ruby-test":
     parameters:
@@ -49,9 +47,7 @@ jobs:
 workflows:
   "test_multiple_ruby_versions":
     jobs:
-      - ruby-test:
-          ruby-version: ruby-2-4
-      - ruby-test:
-          ruby-version: ruby-2-5
       - ruby-test:
           ruby-version: ruby-2-6
+      - ruby-test:
+          ruby-version: ruby-2-7

data/.gitignore

@@ -7,7 +7,6 @@ vendor/
 InstalledFiles
 _yardoc
 coverage
-doc/
 lib/bundler/man
 pkg
 rdoc

data/.rubocop.yml

@@ -0,0 +1,57 @@
+AllCops:
+  TargetRubyVersion: 2.5 # keep in sync with .circleci/config.yml and gemspec
+  NewCops: enable
+
+Style/EmptyMethod:
+  Enabled: false
+
+Metrics:
+  Enabled: false
+
+# not safe ... needs require 'English'
+Style/SpecialGlobalVars:
+  Enabled: false
+
+Layout/LineLength:
+  Max: 205 # TODO: lower
+
+Style/Documentation:
+  Enabled: false
+
+Naming/AccessorMethodName:
+  Enabled: false
+
+Naming/MethodParameterName:
+  Enabled: false
+
+Style/IfInsideElse:
+  Enabled: false
+
+Style/GuardClause:
+  Enabled: false
+
+Lint/NestedMethodDefinition:
+  Enabled: false
+
+# TODO: fix
+Style/StringConcatenation:
+  Enabled: false
+
+Style/NumericPredicate:
+  EnforcedStyle: comparison
+
+Style/IfUnlessModifier:
+  Enabled: false
+
+Style/ClassAndModuleChildren:
+  Enabled: false
+
+# TODO: enable ... somehow breaks tests
+Style/HashEachMethods:
+  Enabled: false
+
+Style/WordArray:
+  EnforcedStyle: brackets
+
+Style/SymbolArray:
+  EnforcedStyle: brackets

data/Gemfile

@@ -1,7 +1,9 @@
+# frozen_string_literal: true
+
 source 'https://rubygems.org'
 
-gem 'codeclimate-test-reporter', '<1.0.0', :group => :test, :require => nil
-gem 'rubocop', require: false
+gem 'codeclimate-test-reporter', '<1.0.0', group: :test, require: nil
+gem 'rubocop'
 
 # Specify your gem's dependencies in fluent-plugin-add.gemspec
 gemspec

data/Gemfile.lock

@@ -1,132 +1,141 @@
 PATH
   remote: .
   specs:
-    fluent-plugin-kubernetes_metadata_filter (2.5.0)
-      fluentd (>= 0.14.0, < 1.12)
-      kubeclient (< 5)
+    fluent-plugin-kubernetes_metadata_filter (3.2.0)
+      fluentd (>= 0.14.0, < 1.17)
+      kubeclient (>= 4.0.0, < 5.0.0)
       lru_redux
 
 GEM
   remote: https://rubygems.org/
   specs:
-    addressable (2.7.0)
+    addressable (2.8.0)
       public_suffix (>= 2.0.2, < 5.0)
-    ast (2.4.1)
-    bump (0.9.0)
+    ast (2.4.2)
+    bump (0.10.0)
     charlock_holmes (0.7.7)
     codeclimate-test-reporter (0.6.0)
       simplecov (>= 0.7.1, < 1.0.0)
-    concurrent-ruby (1.1.6)
-    cool.io (1.6.0)
+    concurrent-ruby (1.2.2)
+    cool.io (1.7.1)
     copyright-header (1.0.22)
       github-linguist
-    crack (0.4.3)
-      safe_yaml (~> 1.0.0)
-    docile (1.3.2)
+    crack (0.4.5)
+      rexml
+    docile (1.4.0)
     domain_name (0.5.20190701)
       unf (>= 0.0.5, < 1.0.0)
-    escape_utils (1.2.1)
-    ffi (1.13.1)
+    escape_utils (1.2.2)
+    ffi (1.15.5)
     ffi-compiler (1.0.1)
       ffi (>= 1.0.0)
       rake
-    fluentd (1.11.1)
+    fluentd (1.16.0)
+      bundler
       cool.io (>= 1.4.5, < 2.0.0)
-      http_parser.rb (>= 0.5.1, < 0.7.0)
+      http_parser.rb (>= 0.5.1, < 0.9.0)
       msgpack (>= 1.3.1, < 2.0.0)
-      serverengine (>= 2.0.4, < 3.0.0)
+      serverengine (>= 2.3.2, < 3.0.0)
       sigdump (~> 0.2.2)
-      strptime (>= 0.2.2, < 1.0.0)
+      strptime (>= 0.2.4, < 1.0.0)
       tzinfo (>= 1.0, < 3.0)
       tzinfo-data (~> 1.0)
+      webrick (~> 1.4)
       yajl-ruby (~> 1.0)
-    github-linguist (7.9.0)
-      charlock_holmes (~> 0.7.6)
+    github-linguist (7.21.0)
+      charlock_holmes (~> 0.7.7)
       escape_utils (~> 1.2.0)
       mini_mime (~> 1.0)
-      rugged (>= 0.25.1)
+      rugged (~> 1.0)
     hashdiff (1.0.1)
-    http (4.4.1)
-      addressable (~> 2.3)
+    http (5.1.1)
+      addressable (~> 2.8)
       http-cookie (~> 1.0)
       http-form_data (~> 2.2)
-      http-parser (~> 1.2.0)
+      llhttp-ffi (~> 0.4.0)
     http-accept (1.7.0)
-    http-cookie (1.0.3)
+    http-cookie (1.0.5)
       domain_name (~> 0.5)
     http-form_data (2.3.0)
-    http-parser (1.2.1)
-      ffi-compiler (>= 1.0, < 2.0)
-    http_parser.rb (0.6.0)
-    kubeclient (4.7.0)
-      http (>= 3.0, < 5.0)
+    http_parser.rb (0.8.0)
+    jsonpath (1.1.2)
+      multi_json
+    kubeclient (4.11.0)
+      http (>= 3.0, < 6.0)
+      jsonpath (~> 1.0)
       recursive-open-struct (~> 1.1, >= 1.1.1)
       rest-client (~> 2.0)
+    llhttp-ffi (0.4.0)
+      ffi-compiler (~> 1.0)
+      rake (~> 13.0)
     lru_redux (1.1.0)
-    mime-types (3.3.1)
+    mime-types (3.4.1)
       mime-types-data (~> 3.2015)
-    mime-types-data (3.2020.0512)
-    mini_mime (1.0.2)
+    mime-types-data (3.2023.0218.1)
+    mini_mime (1.1.2)
     minitest (4.7.5)
-    msgpack (1.3.3)
+    msgpack (1.7.0)
+    multi_json (1.15.0)
     netrc (0.11.0)
-    parallel (1.19.2)
-    parser (2.7.1.4)
+    parallel (1.22.1)
+    parser (3.1.2.0)
       ast (~> 2.4.1)
-    power_assert (1.2.0)
-    public_suffix (4.0.5)
-    rainbow (3.0.0)
-    rake (13.0.1)
-    recursive-open-struct (1.1.2)
-    regexp_parser (1.7.1)
+    power_assert (2.0.2)
+    public_suffix (4.0.7)
+    rainbow (3.1.1)
+    rake (13.0.6)
+    recursive-open-struct (1.1.3)
+    regexp_parser (2.5.0)
     rest-client (2.1.0)
       http-accept (>= 1.7.0, < 2.0)
       http-cookie (>= 1.0.2, < 2.0)
       mime-types (>= 1.16, < 4.0)
       netrc (~> 0.8)
-    rexml (3.2.4)
-    rr (1.2.1)
-    rubocop (0.86.0)
+    rexml (3.2.5)
+    rr (3.0.9)
+    rubocop (1.28.2)
       parallel (~> 1.10)
-      parser (>= 2.7.0.1)
+      parser (>= 3.1.0.0)
       rainbow (>= 2.2.2, < 4.0)
-      regexp_parser (>= 1.7)
+      regexp_parser (>= 1.8, < 3.0)
       rexml
-      rubocop-ast (>= 0.0.3, < 1.0)
+      rubocop-ast (>= 1.17.0, < 2.0)
       ruby-progressbar (~> 1.7)
-      unicode-display_width (>= 1.4.0, < 2.0)
-    rubocop-ast (0.1.0)
-      parser (>= 2.7.0.1)
-    ruby-progressbar (1.10.1)
-    rugged (1.0.1)
-    safe_yaml (1.0.5)
-    serverengine (2.2.1)
+      unicode-display_width (>= 1.4.0, < 3.0)
+    rubocop-ast (1.17.0)
+      parser (>= 3.1.1.0)
+    ruby-progressbar (1.11.0)
+    rugged (1.4.3)
+    serverengine (2.3.2)
       sigdump (~> 0.2.2)
     sigdump (0.2.4)
-    simplecov (0.18.5)
+    simplecov (0.21.2)
       docile (~> 1.1)
       simplecov-html (~> 0.11)
-    simplecov-html (0.12.2)
-    strptime (0.2.4)
-    test-unit (3.0.9)
+      simplecov_json_formatter (~> 0.1)
+    simplecov-html (0.12.3)
+    simplecov_json_formatter (0.1.4)
+    strptime (0.2.5)
+    test-unit (3.5.5)
       power_assert
     test-unit-rr (1.0.5)
       rr (>= 1.1.1)
       test-unit (>= 2.5.2)
-    tzinfo (2.0.2)
+    tzinfo (2.0.6)
       concurrent-ruby (~> 1.0)
-    tzinfo-data (1.2020.1)
+    tzinfo-data (1.2023.3)
       tzinfo (>= 1.0.0)
     unf (0.1.4)
       unf_ext
-    unf_ext (0.0.7.7)
-    unicode-display_width (1.7.0)
+    unf_ext (0.0.8.2)
+    unicode-display_width (2.2.0)
     vcr (6.0.0)
-    webmock (3.8.3)
-      addressable (>= 2.3.6)
+    webmock (3.14.0)
+      addressable (>= 2.8.0)
       crack (>= 0.3.2)
       hashdiff (>= 0.4.0, < 2.0.0)
-    yajl-ruby (1.4.1)
+    webrick (1.8.1)
+    yajl-ruby (1.4.3)
 
 PLATFORMS
   ruby
@@ -140,11 +149,11 @@ DEPENDENCIES
   minitest (~> 4.0)
   rake
   rubocop
-  test-unit (~> 3.0.2)
+  test-unit (~> 3.5.5)
   test-unit-rr (~> 1.0.3)
   vcr
   webmock
   yajl-ruby
 
 BUNDLED WITH
-   2.1.4
+   2.3.16

data/README.md

@@ -2,11 +2,12 @@
 [![Circle CI](https://circleci.com/gh/fabric8io/fluent-plugin-kubernetes_metadata_filter.svg?style=svg)](https://circleci.com/gh/fabric8io/fluent-plugin-kubernetes_metadata_filter)
 [![Code Climate](https://codeclimate.com/github/fabric8io/fluent-plugin-kubernetes_metadata_filter/badges/gpa.svg)](https://codeclimate.com/github/fabric8io/fluent-plugin-kubernetes_metadata_filter)
 [![Test Coverage](https://codeclimate.com/github/fabric8io/fluent-plugin-kubernetes_metadata_filter/badges/coverage.svg)](https://codeclimate.com/github/fabric8io/fluent-plugin-kubernetes_metadata_filter)
+[![Ruby Style Guide](https://img.shields.io/badge/code_style-rubocop-brightgreen.svg)](https://github.com/rubocop-hq/rubocop)
+[![Ruby Style Guide](https://img.shields.io/badge/code_style-community-brightgreen.svg)](https://rubystyle.guide)
 
 The Kubernetes metadata plugin filter enriches container log records with pod and namespace metadata.
 
-This plugin derives basic metadata about the container that emitted a given log record using the source of the log record. Records from journald provide metadata about the
-container environment as named fields. Records from JSON files encode metadata about the container in the file name.  The initial metadata derived from the source is used
+This plugin derives basic metadata about the container that emitted a given log record using the source of the log record. Records from kubernetes containers encode metadata about the container in the file name.  The initial metadata derived from the source is used
 to lookup additional metadata about the container's associated pod and namespace (e.g. UUIDs, labels, annotations) when the kubernetes_url is configured.  If the plugin cannot
 authoritatively determine the namespace of the container emitting a log record, it will use an 'orphan' namespace ID in the metadata. This behaviors supports multi-tenant systems
 that rely on the authenticity of the namespace for proper log isolation.
@@ -15,6 +16,7 @@ that rely on the authenticity of the namespace for proper log isolation.
 
 | fluent-plugin-kubernetes_metadata_filter  | fluentd | ruby |
 |-------------------|---------|------|
+| >= 2.10.0 | >= v1.10.0 | >= 2.6 |
 | >= 2.5.0 | >= v1.10.0 | >= 2.5 |
 | >= 2.0.0 | >= v0.14.20 | >= 2.1 |
 |  < 2.0.0 | >= v0.12.0 | >= 1.9 |
@@ -39,16 +41,10 @@ Configuration options for fluent.conf are:
 * `client_key` - path to a client key file to authenticate to the API server
 * `bearer_token_file` - path to a file containing the bearer token to use for authentication
 * `tag_to_kubernetes_name_regexp` - the regular expression used to extract kubernetes metadata (pod name, container name, namespace) from the current fluentd tag.
-This must used named capture groups for `container_name`, `pod_name` & `namespace` (default: `\.(?<pod_name>[^\._]+)_(?<namespace>[^_]+)_(?<container_name>.+)-(?<docker_id>[a-z0-9]{64})\.log$</pod>)`)
+This must use named capture groups for `container_name`, `pod_name`, `namespace`, and either `pod_uuid (/var/log/pods)` or `docker_id (/var/log/containers)`
 * `cache_size` - size of the cache of Kubernetes metadata to reduce requests to the API server (default: `1000`)
 * `cache_ttl` - TTL in seconds of each cached element. Set to negative value to disable TTL eviction (default: `3600` - 1 hour)
 * `watch` - set up a watch on pods on the API server for updates to metadata (default: `true`)
-* `de_dot` - replace dots in labels and annotations with configured `de_dot_separator`, required for ElasticSearch 2.x compatibility (default: `true`)
-* `de_dot_separator` - separator to use if `de_dot` is enabled (default: `_`)
-* *DEPRECATED* `use_journal` - If false, messages are expected to be formatted and tagged as if read by the fluentd in\_tail plugin with wildcard filename.  If true, messages are expected to be formatted as if read from the systemd journal.  The `MESSAGE` field has the full message.  The `CONTAINER_NAME` field has the encoded k8s metadata (see below).  The `CONTAINER_ID_FULL` field has the full container uuid.  This requires docker to use the `--log-driver=journald` log driver.  If unset (the default), the plugin will use the `CONTAINER_NAME` and `CONTAINER_ID_FULL` fields
-if available, otherwise, will use the tag in the `tag_to_kubernetes_name_regexp` format.
-* `container_name_to_kubernetes_regexp` - The regular expression used to extract the k8s metadata encoded in the journal `CONTAINER_NAME` field (default: `'^(?<name_prefix>[^_]+)_(?<container_name>[^\._]+)(\.(?<container_hash>[^_]+))?_(?<pod_name>[^_]+)_(?<namespace>[^_]+)_[^_]+_[^_]+$'`
-  * This corresponds to the definition [in the source](https://github.com/kubernetes/kubernetes/blob/release-1.6/pkg/kubelet/dockertools/docker.go#L317)
 * `annotation_match` - Array of regular expressions matching annotation field names. Matched annotations are added to a log record.
 * `allow_orphans` - Modify the namespace and namespace id to the values of `orphaned_namespace_name` and `orphaned_namespace_id`
 when true (default: `true`)
@@ -62,27 +58,13 @@ when true (default: `true`)
 * `skip_container_metadata` - Skip some of the container data of the metadata. The metadata will not contain the container_image and container_image_id fields.
 * `skip_master_url` - Skip the master_url field from the metadata.
 * `skip_namespace_metadata` - Skip the namespace_id field from the metadata. The fetch_namespace_metadata function will be skipped. The plugin will be faster and cpu consumption will be less.
+* `stats_interval` - The interval to display cache stats (default: 30s).  Set to 0 to disable stats collection and logging
 * `watch_retry_interval` - The time interval in seconds for retry backoffs when watch connections fail. (default: `10`)
+* `open_timeout` - The time in seconds to wait for a connection to kubernetes service. (default: `3`)
+* `read_timeout` - The time in seconds to wait for a read from kubernetes service. (default: `10`)
 
-**NOTE:** As of the release 2.1.x of this plugin, it no longer supports parsing the source message into JSON and attaching it to the
-payload.  The following configuration options are removed:
 
-* `merge_json_log`
-* `preserve_json_log`
-
-One way of preserving JSON logs can be through the [parser plugin](https://docs.fluentd.org/filter/parser)
-
-**NOTE** As of this release, the use of `use_journal` is **DEPRECATED**.  If this setting is not present, the plugin will
-attempt to figure out the source of the metadata fields from the following:
-- If `lookup_from_k8s_field true` (the default) and the following fields are present in the record:
-`docker.container_id`, `kubernetes.namespace_name`, `kubernetes.pod_name`, `kubernetes.container_name`,
-then the plugin will use those values as the source to use to lookup the metadata
-- If `use_journal true`, or `use_journal` is unset, and the fields `CONTAINER_NAME` and `CONTAINER_ID_FULL` are present in the record,
-then the plugin will parse those values using `container_name_to_kubernetes_regexp` and use those as the source to lookup the metadata
-- Otherwise, if the tag matches `tag_to_kubernetes_name_regexp`, the plugin will parse the tag and use those values to
-lookup the metdata
-
-Reading from the JSON formatted log files with `in_tail` and wildcard filenames while respecting the CRI-o log format with the same config you need the fluent-plugin "multi-format-parser":
+Reading from a JSON formatted log files with `in_tail` and wildcard filenames while respecting the CRI-o log format with the same config you need the fluent-plugin "multi-format-parser":
 
 ```
 fluent-gem install fluent-plugin-multi-format-parser
@@ -123,50 +105,6 @@ The config block could look like this:
 </match>
 ```
 
-Reading from the systemd journal (requires the fluentd `fluent-plugin-systemd` and `systemd-journal` plugins, and requires docker to use the `--log-driver=journald` log driver):
-```
-<source>
-  @type systemd
-  path /run/log/journal
-  pos_file journal.pos
-  tag journal
-  read_from_head true
-</source>
-
-# probably want to use something like fluent-plugin-rewrite-tag-filter to
-# retag entries from k8s
-<match journal>
-  @type rewrite_tag_filter
-  rewriterule1 CONTAINER_NAME ^k8s_ kubernetes.journal.container
-  ...
-</match>
-
-<filter kubernetes.**>
-  @type kubernetes_metadata
-  use_journal true
-</filter>
-
-<match **>
-  @type stdout
-</match>
-```
-## Log content as JSON
-In former versions this plugin parsed the value of the key log as JSON. In the current version this feature was removed, to avoid duplicate features in the fluentd plugin ecosystem. It can parsed with the parser plugin like this:
-```
-<filter kubernetes.**>
-  @type parser
-  key_name log
-  <parse>
-    @type json
-    json_parser json
-  </parse>
-  replace_invalid_sequence true
-  reserve_data true # this preserves unparsable log lines
-  emit_invalid_record_to_error false # In case of unparsable log lines keep the error log clean
-  reserve_time # the time was already parsed in the source, we don't want to overwrite it with current time.
-</filter>
-```
-
 ## Environment variables for Kubernetes
 
 If the name of the Kubernetes node the plugin is running on is set as
@@ -226,18 +164,6 @@ Then output becomes as belows
 }
 ```
 
-If using journal input, from docker configured with `--log-driver=journald`, the input looks like the `journalctl -o export` format:
-```
-# The stream identification is encoded into the PRIORITY field as an
-# integer: 6, or github.com/coreos/go-systemd/journal.Info, marks stdout,
-# while 3, or github.com/coreos/go-systemd/journal.Err, marks stderr.
-PRIORITY=6
-CONTAINER_ID=b6cbb6e73c0a
-CONTAINER_ID_FULL=b6cbb6e73c0ad63ab820e4baa97cdc77cec729930e38a714826764ac0491341a
-CONTAINER_NAME=k8s_registry.a49f5318_docker-registry-1-hhoj0_default_ae3a9bdc-1f66-11e6-80a2-fa163e2fff3a_799e4035
-MESSAGE=172.17.0.1 - - [21/May/2016:16:52:05 +0000] "GET /healthz HTTP/1.1" 200 0 "" "Go-http-client/1.1"
-```
-
 ## Contributing
 
 1. Fork it

data/Rakefile

@@ -1,10 +1,15 @@
+# frozen_string_literal: true
+
+require 'bundler/setup'
 require 'bundler/gem_tasks'
 require 'rake/testtask'
 require 'bump/tasks'
+require 'rubocop/rake_task'
 
-task :test => [:base_test]
+task test: [:base_test]
+task default: [:test, :build, :rubocop]
 
-task :default => [:test, :build]
+RuboCop::RakeTask.new
 
 desc 'Run test_unit based test'
 Rake::TestTask.new(:base_test) do |t|
@@ -13,7 +18,6 @@ Rake::TestTask.new(:base_test) do |t|
   #  $ bundle exec rake base_test TEST=test/test_*.rb
   t.libs << 'test'
   t.test_files = Dir['test/**/test_*.rb'].sort
-  #t.verbose = true
   t.warning = false
 end
 
@@ -23,15 +27,15 @@ task :headers do
   require 'copyright_header'
 
   args = {
-    :license => 'Apache-2.0',
-    :copyright_software => 'Fluentd Kubernetes Metadata Filter Plugin',
-    :copyright_software_description => 'Enrich Fluentd events with Kubernetes metadata',
-    :copyright_holders => ['Red Hat, Inc.'],
-    :copyright_years => ['2015-2017'],
-    :add_path => 'lib:test',
-    :output_dir => '.'
+    license: 'Apache-2.0',
+    copyright_software: 'Fluentd Kubernetes Metadata Filter Plugin',
+    copyright_software_description: 'Enrich Fluentd events with Kubernetes metadata',
+    copyright_holders: ['Red Hat, Inc.'],
+    copyright_years: ['2015-2021'],
+    add_path: 'lib:test',
+    output_dir: '.'
   }
 
-  command_line = CopyrightHeader::CommandLine.new( args )
+  command_line = CopyrightHeader::CommandLine.new(args)
   command_line.execute
 end

data/doc/benchmark/5m-1-2500lps-256b-baseline-01/readme.md

@@ -0,0 +1,88 @@
+
+# collector Functionl Benchmark Results
+## Options
+* Image: quay.io/openshift-logging/fluentd:1.14.6
+* Total Log Stressors: 1
+* Lines Per Second: 2500
+* Run Duration: 5m
+* Payload Source: synthetic
+
+## Latency of logs collected based on the time the log was generated and ingested
+
+Total Msg| Size | Elapsed (s) | Mean (s)| Min(s) | Max (s)| Median (s)
+---------|------|-------------|---------|--------|--------|---
+705733|256|5m0s|16.929|1.826|36.399|14.956
+
+![](cpu.png)
+
+![](mem.png)
+
+![](latency.png)
+
+![](loss.png)
+
+## Percent logs lost between first and last collected sequence ids
+Stream |  Min Seq | Max Seq | Purged | Collected | Percent Collected |
+-------| ---------| --------| -------|-----------|--------------|
+| functional.0.0000000000000000DBCED7977B8F643F|0|716850|0|705733|98.4%
+
+
+## Config
+
+```
+
+<system>
+  log_level debug
+</system>
+
+<source>
+  @type tail
+  @id container-input
+  path /var/log/pods/testhack-clwn63sc_*/loader-*/*
+  exclude_path ["/var/log/pods/**/*/*.gz","/var/log/pods/**/*/*.tmp"]
+  pos_file "/var/lib/fluentd/pos/containers-app"
+  refresh_interval 5
+  rotate_wait 5
+  tag kubernetes.*
+  read_from_head "true"
+  <parse>
+    @type regexp
+    expression /^(?<@timestamp>[^\s]+) (?<stream>stdout|stderr) (?<logtag>[F|P]) (?<message>.*)$/
+    time_format '%Y-%m-%dT%H:%M:%S.%N%:z'
+    keep_time_key true
+  </parse>
+</source>
+
+<filter kubernetes.**>
+	@type concat
+	key message
+	partial_key logtag
+	partial_value P
+	separator ''
+</filter>
+
+<match **>
+	@type forward
+	heartbeat_type none
+	keepalive true
+	
+	<buffer>
+	  flush_mode interval
+	  flush_interval 5s
+	  flush_at_shutdown true
+	  flush_thread_count 2
+	  retry_type exponential_backoff
+	  retry_wait 1s
+	  retry_max_interval 60s
+	  retry_forever true
+	  overflow_action block
+	</buffer>
+	
+	<server>
+	  host 0.0.0.0
+	  port 24224
+	</server>
+</match>
+
+```
+