fluent-plugin-kubernetes_metadata_filter 1.0.1 → 1.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ef179686ef1088fb46084410bdeb0a2c4b07c3f6
-  data.tar.gz: 02b2dfe0880adb892922876f5dfd123a54922d76
+  metadata.gz: 8917464fdb9accec2996bb272aa99b5e5c78b8e1
+  data.tar.gz: 015f9f5e3ece31d4b279f0a536fa562fea6f8787
 SHA512:
-  metadata.gz: 5972e28a29443b1e11fd7071ee1b7df5ee5b93be0f406a3bac51979058c49651777515acdc12c63ea2d4f9f84f632668a7d2fef592b9aa4d0249def6b54bdf2b
-  data.tar.gz: b079681eceb4fd3e1e182c133fd529e9820137cb7b139ffcf63a85b082b8fdeda0ee735ff271e28fa081f348451f2684279aeee8565928d5bd33ba4fc178b851
+  metadata.gz: 2d0c7cb0ddf63a3a3e529c3bd02ad6895a8a58f72b3f06917cd116591eea5b13ef73f7b736ac0725c308ff511a30b19cb71e8f1e772971fc391049120794b0a5
+  data.tar.gz: b579ec0cead5c9fcdaba5746e1f9c1f241ebfbe156e2bc36b609d17cac0bf7bff4653a6e072b7d565ec5d97d0edea80c4e1459a4b04627d133b2c094d3a02522

data/README.md

@@ -11,6 +11,17 @@ to lookup additional metadata about the container's associated pod and namespace
 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.
 
+## Requirements
+
+| fluent-plugin-kubernetes_metadata_filter  | fluentd | ruby |
+|-------------------|---------|------|
+| >= 2.0.0 | >= v0.14.20 | >= 2.1 |
+|  < 2.0.0 | >= v0.12.0 | >= 1.9 |
+
+NOTE: For v0.12 version, you should use 1.x.y version. Please send patch into v0.12 branch if you encountered 1.x version's bug.
+
+NOTE: This documentation is for fluent-plugin-kubernetes_metadata_filter-plugin-elasticsearch 2.x or later. For 1.x documentation, please see [v0.12 branch](https://github.com/fabric8io/fluent-plugin-kubernetes_metadata_filter/tree/v0.12).
+
 ## Installation
 
     gem install fluent-plugin-kubernetes_metadata_filter
@@ -38,8 +49,6 @@ This must used named capture groups for `container_name`, `pod_name` & `namespac
 * `use_journal` - If false (default), 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.
 * `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/master/pkg/kubelet/dockertools/docker.go#L317)
-* `include_namespace_metadata` - Collect metadata about namespace such as uid, labels and annotations (default: `false`).  
-  Note that when this option is enabled, all label from namespace are collected, but annotations are collected according to `annotation_match` value. If `annotation_match` is not presented, no annotations will be collected from the namespace.
 * `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`)

data/fluent-plugin-kubernetes_metadata_filter.gemspec

@@ -4,7 +4,7 @@ $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 
 Gem::Specification.new do |gem|
   gem.name          = "fluent-plugin-kubernetes_metadata_filter"
-  gem.version       = "1.0.1"
+  gem.version       = "1.0.2"
   gem.authors       = ["Jimmi Dyson"]
   gem.email         = ["jimmidyson@gmail.com"]
   gem.description   = %q{Filter plugin to add Kubernetes metadata}

data/lib/fluent/plugin/filter_kubernetes_metadata.rb

@@ -284,6 +284,7 @@ module Fluent
     end
 
     def filter_stream_from_files(tag, es)
+      return es if es.empty?
       new_es = MultiEventStream.new
 
       match_data = tag.match(@tag_to_kubernetes_name_regexp_compiled)

data/test/plugin/test_filter_kubernetes_metadata.rb

@@ -34,22 +34,6 @@ class KubernetesMetadataFilterTest < Test::Unit::TestCase
     Test::FilterTestDriver.new(KubernetesMetadataFilter, 'var.log.containers.fabric8-console-controller-98rqc_default_fabric8-console-container-49095a2894da899d3b327c5fde1e056a81376cc9a8f8b09a195f2a92bceed459.log').configure(conf, true)
   end
 
-  sub_test_case 'dump_stats' do
-
-    test 'dump stats with include_namespace_metadata' do
-      VCR.use_cassette('kubernetes_docker_metadata') do
-        d = create_driver('
-          kubernetes_url https://localhost:8443
-          watch false
-          cache_size 1
-          include_namespace_metadata false
-          stats_interval 0
-        ')
-        d.instance.dump_stats
-      end
-    end
-
-  end
   sub_test_case 'configure' do
     test 'check default' do
       d = create_driver
@@ -151,7 +135,6 @@ class KubernetesMetadataFilterTest < Test::Unit::TestCase
           kubernetes_url https://localhost:8443
           watch false
           cache_size 1
-          include_namespace_metadata true
         ', d: nil)
       d = create_driver(config) if d.nil?
       if ENV['LOGLEVEL'] 
@@ -182,7 +165,6 @@ class KubernetesMetadataFilterTest < Test::Unit::TestCase
           kubernetes_url https://localhost:8443
           watch false
           cache_size 1
-          include_namespace_metadata true
         ')
         cache = driver.instance.instance_variable_get(:@id_cache)
         cache['49095a2894da899d3b327c5fde1e056a81376cc9a8f8b09a195f2a92bceed459'] = {
@@ -216,7 +198,6 @@ class KubernetesMetadataFilterTest < Test::Unit::TestCase
           kubernetes_url https://localhost:8443
           watch false
           cache_size 1
-          include_namespace_metadata true
         ')
         cache = driver.instance.instance_variable_get(:@id_cache)
         cache['49095a2894da899d3b327c5fde1e056a81376cc9a8f8b09a195f2a92bceed459'] = {
@@ -279,7 +260,6 @@ class KubernetesMetadataFilterTest < Test::Unit::TestCase
           kubernetes_url https://localhost:8443
           watch false
           cache_size 1
-          include_namespace_id true
         ')
         expected_kube_metadata = {
           'docker' => {
@@ -494,7 +474,6 @@ use_journal true
           kubernetes_url https://localhost:8443
           watch false
           cache_size 1
-          include_namespace_metadata true
         ')
         expected_kube_metadata = {
           'docker' => {
@@ -527,7 +506,6 @@ use_journal true
           watch false
           cache_size 1
           de_dot false
-          include_namespace_metadata true
         ')
         expected_kube_metadata = {
           'docker' => {
@@ -610,7 +588,6 @@ use_journal true
           kubernetes_url https://localhost:8443
           watch false
           cache_size 1
-          include_namespace_id true
           use_journal true
         ')
         expected_kube_metadata = {
@@ -709,7 +686,6 @@ use_journal true
           kubernetes_url https://localhost:8443
           watch false
           cache_size 1
-          include_namespace_metadata true
           annotation_match [ "^custom.+", "two", "workspace*"]
         ')
         expected_kube_metadata = {
@@ -746,7 +722,6 @@ use_journal true
           kubernetes_url https://localhost:8443
           watch false
           cache_size 1
-          include_namespace_metadata true
           annotation_match [ "noMatch*"]
         ')
         expected_kube_metadata = {

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fluent-plugin-kubernetes_metadata_filter
 version: !ruby/object:Gem::Version
-  version: 1.0.1
+  version: 1.0.2
 platform: ruby
 authors:
 - Jimmi Dyson
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-01-17 00:00:00.000000000 Z
+date: 2018-04-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: fluentd