fluent-plugin-kubernetes_metadata_filter_fix 2.2.0.pre.1

data/test/plugin/test_watch_namespaces.rb

@@ -0,0 +1,91 @@
+#
+# Fluentd Kubernetes Metadata Filter Plugin - Enrich Fluentd events with
+# Kubernetes metadata
+#
+# Copyright 2015 Red Hat, Inc.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+require_relative '../helper'
+require 'ostruct'
+require_relative 'watch_test'
+
+class WatchNamespacesTestTest < WatchTest
+
+     include KubernetesMetadata::WatchNamespaces
+
+     setup do
+       @created = OpenStruct.new(
+         type: 'CREATED',
+         object: {
+           'metadata' => {
+                'name' => 'created',
+                'uid' => 'created_uid'
+            }
+         }
+       )
+       @modified = OpenStruct.new(
+         type: 'MODIFIED',
+         object: {
+           'metadata' => {
+                'name' => 'foo',
+                'uid' => 'modified_uid'
+            }
+         }
+       )
+       @deleted = OpenStruct.new(
+         type: 'DELETED',
+         object: {
+           'metadata' => {
+                'name' => 'deleteme',
+                'uid' => 'deleted_uid'
+            }
+         }
+       )
+     end
+
+    test 'namespace watch ignores CREATED' do
+      @client.stub :watch_namespaces, [@created] do
+       start_namespace_watch
+       assert_equal(false, @namespace_cache.key?('created_uid'))
+       assert_equal(1, @stats[:namespace_cache_watch_ignored])
+      end
+    end
+
+    test 'namespace watch ignores MODIFIED when info not in cache' do
+      @client.stub :watch_namespaces, [@modified] do
+       start_namespace_watch
+       assert_equal(false, @namespace_cache.key?('modified_uid'))
+       assert_equal(1, @stats[:namespace_cache_watch_misses])
+      end
+    end
+
+    test 'namespace watch updates cache when MODIFIED is received and info is cached' do
+      @namespace_cache['modified_uid'] = {}
+      @client.stub :watch_namespaces, [@modified] do
+       start_namespace_watch
+       assert_equal(true, @namespace_cache.key?('modified_uid'))
+       assert_equal(1, @stats[:namespace_cache_watch_updates])
+      end
+    end
+
+    test 'namespace watch ignores DELETED' do
+      @namespace_cache['deleted_uid'] = {}
+      @client.stub :watch_namespaces, [@deleted] do
+       start_namespace_watch
+       assert_equal(true, @namespace_cache.key?('deleted_uid'))
+       assert_equal(1, @stats[:namespace_cache_watch_deletes_ignored])
+      end
+    end
+
+end

data/test/plugin/test_watch_pods.rb

@@ -0,0 +1,145 @@
+#
+# Fluentd Kubernetes Metadata Filter Plugin - Enrich Fluentd events with
+# Kubernetes metadata
+#
+# Copyright 2015 Red Hat, Inc.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+require_relative '../helper'
+require 'ostruct'
+require_relative 'watch_test'
+
+class DefaultPodWatchStrategyTest < WatchTest
+
+     include KubernetesMetadata::WatchPods
+
+     setup do
+       @created = OpenStruct.new(
+         type: 'CREATED',
+         object: {
+           'metadata' => {
+                'name' => 'created',
+                'namespace' => 'create',
+                'uid' => 'created_uid',
+                'labels' => {},
+            },
+            'spec' => {
+                'nodeName' => 'aNodeName',
+                'containers' => [{
+                     'name' => 'foo',
+                     'image' => 'bar',
+                 }, {
+                     'name' => 'bar',
+                     'image' => 'foo',
+                 }]
+            }
+         }
+       )
+       @modified = OpenStruct.new(
+         type: 'MODIFIED',
+         object: {
+           'metadata' => {
+                'name' => 'foo',
+                'namespace' => 'modified',
+                'uid' => 'modified_uid',
+                'labels' => {},
+            },
+            'spec' => {
+                'nodeName' => 'aNodeName',
+                'containers' => [{
+                    'name' => 'foo',
+                    'image' => 'bar',
+                 }, {
+                    'name' => 'bar',
+                    'image' => 'foo',
+                 }]
+            },
+           'status' => {
+               'containerStatuses' => [
+                   {
+                       'name' => 'fabric8-console-container',
+                       'state' => {
+                           'running' => {
+                               'startedAt' => '2015-05-08T09:22:44Z'
+                           }
+                       },
+                       'lastState' => {},
+                       'ready' => true,
+                       'restartCount' => 0,
+                       'image' => 'fabric8/hawtio-kubernetes:latest',
+                       'imageID' => 'docker://b2bd1a24a68356b2f30128e6e28e672c1ef92df0d9ec01ec0c7faea5d77d2303',
+                       'containerID' => 'docker://49095a2894da899d3b327c5fde1e056a81376cc9a8f8b09a195f2a92bceed459'
+                   }
+               ]
+           }
+         }
+       )
+       @deleted = OpenStruct.new(
+         type: 'DELETED',
+         object: {
+           'metadata' => {
+                'name' => 'deleteme',
+                'namespace' => 'deleted',
+                'uid' => 'deleted_uid'
+            }
+         }
+       )
+     end
+
+    test 'pod watch notice ignores CREATED' do
+      @client.stub :watch_pods, [@created] do
+       start_pod_watch
+       assert_equal(false, @cache.key?('created_uid'))
+       assert_equal(1, @stats[:pod_cache_watch_ignored])
+      end
+    end
+
+    test 'pod watch notice is ignored when info not cached and MODIFIED is received' do
+      @client.stub :watch_pods, [@modified] do
+       start_pod_watch
+       assert_equal(false, @cache.key?('modified_uid'))
+       assert_equal(1, @stats[:pod_cache_watch_misses])
+      end
+    end
+
+    test 'pod MODIFIED cached when hostname matches' do
+      orig_env_val = ENV['K8S_NODE_NAME']
+      ENV['K8S_NODE_NAME'] = 'aNodeName'
+      @client.stub :watch_pods, [@modified] do
+       start_pod_watch
+       assert_equal(true, @cache.key?('modified_uid'))
+       assert_equal(1, @stats[:pod_cache_host_updates])
+      end
+      ENV['K8S_NODE_NAME'] = orig_env_val
+    end
+
+    test 'pod watch notice is updated when MODIFIED is received' do
+      @cache['modified_uid'] = {}
+      @client.stub :watch_pods, [@modified] do
+       start_pod_watch
+       assert_equal(true, @cache.key?('modified_uid'))
+       assert_equal(1, @stats[:pod_cache_watch_updates])
+      end
+    end
+
+    test 'pod watch notice is ignored when delete is received' do
+      @cache['deleted_uid'] = {}
+      @client.stub :watch_pods, [@deleted] do
+       start_pod_watch
+       assert_equal(true, @cache.key?('deleted_uid'))
+       assert_equal(1, @stats[:pod_cache_watch_delete_ignored])
+      end
+    end
+
+end

data/test/plugin/watch_test.rb

@@ -0,0 +1,57 @@
+#
+# Fluentd Kubernetes Metadata Filter Plugin - Enrich Fluentd events with
+# Kubernetes metadata
+#
+# Copyright 2015 Red Hat, Inc.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+require_relative '../helper'
+require 'ostruct'
+
+class WatchTest < Test::Unit::TestCase
+   
+    setup do
+      @annotations_regexps = []
+      @namespace_cache = {}
+      @cache = {}
+      @stats = KubernetesMetadata::Stats.new
+      @client = OpenStruct.new
+      def @client.resourceVersion
+        '12345'
+      end
+      def @client.watch_pods(value)
+         []
+      end
+      def @client.watch_namespaces(value)
+         []
+      end
+      def @client.get_namespaces 
+          self
+      end
+      def @client.get_pods
+          self
+      end
+    end
+
+    def watcher=(value)
+    end
+
+    def log
+        logger = {}
+        def logger.debug(message)
+        end
+        logger
+    end
+
+end

metadata

@@ -0,0 +1,280 @@
+--- !ruby/object:Gem::Specification
+name: fluent-plugin-kubernetes_metadata_filter_fix
+version: !ruby/object:Gem::Version
+  version: 2.2.0.pre.1
+platform: ruby
+authors:
+- Jimmi Dyson
+autorequire: 
+bindir: bin
+cert_chain: []
+date: 2019-08-01 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
+  name: fluentd
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.14.0
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '2'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.14.0
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '2'
+- !ruby/object:Gem::Dependency
+  name: lru_redux
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: kubeclient
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 1.1.4
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 1.1.4
+- !ruby/object:Gem::Dependency
+  name: bundler
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 2.0.2
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 2.0.2
+- !ruby/object:Gem::Dependency
+  name: rake
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: minitest
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '4.0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '4.0'
+- !ruby/object:Gem::Dependency
+  name: test-unit
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 3.0.2
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 3.0.2
+- !ruby/object:Gem::Dependency
+  name: test-unit-rr
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 1.0.3
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 1.0.3
+- !ruby/object:Gem::Dependency
+  name: copyright-header
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: webmock
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: vcr
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: bump
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: yajl-ruby
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+description: Filter plugin to add Kubernetes metadata
+email:
+- jimmidyson@gmail.com
+executables: []
+extensions: []
+extra_rdoc_files: []
+files:
+- ".circleci/config.yml"
+- ".gitignore"
+- Gemfile
+- LICENSE.txt
+- README.md
+- Rakefile
+- fluent-plugin-kubernetes_metadata_filter.gemspec
+- lib/fluent/plugin/filter_kubernetes_metadata.rb
+- lib/fluent/plugin/kubernetes_metadata_cache_strategy.rb
+- lib/fluent/plugin/kubernetes_metadata_common.rb
+- lib/fluent/plugin/kubernetes_metadata_stats.rb
+- lib/fluent/plugin/kubernetes_metadata_watch_namespaces.rb
+- lib/fluent/plugin/kubernetes_metadata_watch_pods.rb
+- test/cassettes/invalid_api_server_config.yml
+- test/cassettes/kubernetes_docker_metadata.yml
+- test/cassettes/kubernetes_docker_metadata_annotations.yml
+- test/cassettes/kubernetes_docker_metadata_dotted_labels.yml
+- test/cassettes/kubernetes_docker_metadata_using_bearer_token.yml
+- test/cassettes/metadata_from_tag_and_journald_fields.yml
+- test/cassettes/metadata_from_tag_journald_and_kubernetes_fields.yml
+- test/cassettes/metadata_with_namespace_id.yml
+- test/cassettes/non_kubernetes_docker_metadata.yml
+- test/cassettes/valid_kubernetes_api_server.yml
+- test/helper.rb
+- test/plugin/test.token
+- test/plugin/test_cache_stats.rb
+- test/plugin/test_cache_strategy.rb
+- test/plugin/test_filter_kubernetes_metadata.rb
+- test/plugin/test_watch_namespaces.rb
+- test/plugin/test_watch_pods.rb
+- test/plugin/watch_test.rb
+homepage: https://github.com/vitkovskii/fluent-plugin-kubernetes_metadata_filter
+licenses:
+- Apache-2.0
+metadata: {}
+post_install_message: 
+rdoc_options: []
+require_paths:
+- lib
+required_ruby_version: !ruby/object:Gem::Requirement
+  requirements:
+  - - ">="
+    - !ruby/object:Gem::Version
+      version: 2.1.0
+required_rubygems_version: !ruby/object:Gem::Requirement
+  requirements:
+  - - ">"
+    - !ruby/object:Gem::Version
+      version: 1.3.1
+requirements: []
+rubygems_version: 3.0.3
+signing_key: 
+specification_version: 4
+summary: Fluentd filter plugin to add Kubernetes metadata
+test_files:
+- test/cassettes/invalid_api_server_config.yml
+- test/cassettes/kubernetes_docker_metadata.yml
+- test/cassettes/kubernetes_docker_metadata_annotations.yml
+- test/cassettes/kubernetes_docker_metadata_dotted_labels.yml
+- test/cassettes/kubernetes_docker_metadata_using_bearer_token.yml
+- test/cassettes/metadata_from_tag_and_journald_fields.yml
+- test/cassettes/metadata_from_tag_journald_and_kubernetes_fields.yml
+- test/cassettes/metadata_with_namespace_id.yml
+- test/cassettes/non_kubernetes_docker_metadata.yml
+- test/cassettes/valid_kubernetes_api_server.yml
+- test/helper.rb
+- test/plugin/test.token
+- test/plugin/test_cache_stats.rb
+- test/plugin/test_cache_strategy.rb
+- test/plugin/test_filter_kubernetes_metadata.rb
+- test/plugin/test_watch_namespaces.rb
+- test/plugin/test_watch_pods.rb
+- test/plugin/watch_test.rb