RubyGems - fluent-plugin-kubernetes_metadata_filter - Versions diffs - 1.2.2 → 2.0.0 - Mend

fluent-plugin-kubernetes_metadata_filter 1.2.2 → 2.0.0

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (15) hide show

checksums.yaml +5 -5
data/Gemfile +1 -5
data/README.md +3 -35
data/circle.yml +2 -0
data/fluent-plugin-kubernetes_metadata_filter.gemspec +4 -13
data/lib/fluent/plugin/filter_kubernetes_metadata.rb +116 -79
data/lib/fluent/plugin/kubernetes_metadata_cache_strategy.rb +1 -1
data/lib/fluent/plugin/kubernetes_metadata_common.rb +0 -46
data/lib/fluent/plugin/kubernetes_metadata_watch_pods.rb +0 -3
data/test/cassettes/kubernetes_docker_metadata_using_bearer_token.yml +1 -1
data/test/plugin/test_filter_kubernetes_metadata.rb +247 -345
data/test/plugin/test_watch_pods.rb +3 -46
metadata +13 -10
data/test/cassettes/metadata_from_tag_and_journald_fields.yml +0 -408
data/test/cassettes/metadata_from_tag_journald_and_kubernetes_fields.yml +0 -540

data/test/plugin/test_watch_pods.rb CHANGED

@@ -35,14 +35,7 @@ class DefaultPodWatchStrategyTest < WatchTest
                 'labels' => {},
             },
             'spec' => {
-                'nodeName' => 'aNodeName',
-                'containers' => [{
-                     'name' => 'foo',
-                     'image' => 'bar',
-                 }, {
-                     'name' => 'bar',
-                     'image' => 'foo',
-                 }]
+                'nodeName' => 'aNodeName'
             }
          }
        )
@@ -56,33 +49,8 @@ class DefaultPodWatchStrategyTest < WatchTest
                 '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'
-                   }
-               ]
-           }
+                'nodeName' => 'aNodeName'
+            }
          }
        )
        @deleted = OpenStruct.new(
@@ -113,17 +81,6 @@ class DefaultPodWatchStrategyTest < WatchTest
       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

metadata CHANGED

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fluent-plugin-kubernetes_metadata_filter
 version: !ruby/object:Gem::Version
-  version: 1.2.2
+  version: 2.0.0
 platform: ruby
 authors:
 - Jimmi Dyson
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2019-10-01 00:00:00.000000000 Z
+date: 2018-04-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: fluentd
@@ -16,14 +16,20 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.12.0
+        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.12.0
+        version: 0.14.0
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '2'
 - !ruby/object:Gem::Dependency
   name: lru_redux
   requirement: !ruby/object:Gem::Requirement
@@ -217,8 +223,6 @@ files:
 - 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
@@ -242,14 +246,15 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 2.0.0
+      version: 2.1.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.3
+rubyforge_project:
+rubygems_version: 2.6.12
 signing_key:
 specification_version: 4
 summary: Fluentd filter plugin to add Kubernetes metadata
@@ -259,8 +264,6 @@ test_files:
 - 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

data/test/cassettes/metadata_from_tag_and_journald_fields.yml DELETED

@@ -1,408 +0,0 @@
-#
-# 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.
-#
----
-http_interactions:
-- request:
-    method: get
-    uri: https://localhost:8443/api
-    body:
-      encoding: US-ASCII
-      string: ''
-    headers:
-      Accept:
-      - "*/*; q=0.5, application/xml"
-      Accept-Encoding:
-      - gzip, deflate
-      User-Agent:
-      - Ruby
-  response:
-    status:
-      code: 200
-      message: OK
-    headers:
-      Content-Type:
-      - application/json
-      Date:
-      - Fri, 08 May 2015 10:35:37 GMT
-      Content-Length:
-      - '67'
-    body:
-      encoding: UTF-8
-      string: |-
-        {
-          "versions": [
-            "v1"
-          ]
-        }
-    http_version:
-  recorded_at: Fri, 08 May 2015 10:35:37 GMT
-- request:
-    method: get
-    uri: https://localhost:8443/api/v1/namespaces/default/pods/fabric8-console-controller-98rqc
-    body:
-      encoding: US-ASCII
-      string: ''
-    headers:
-      Accept:
-      - "*/*; q=0.5, application/xml"
-      Accept-Encoding:
-      - gzip, deflate
-      User-Agent:
-      - Ruby
-  response:
-    status:
-      code: 200
-      message: OK
-    headers:
-      Content-Type:
-      - application/json
-      Date:
-      - Fri, 08 May 2015 10:35:37 GMT
-      Transfer-Encoding:
-      - chunked
-    body:
-      encoding: UTF-8
-      string: |-
-        {
-          "kind": "Pod",
-          "apiVersion": "v1",
-          "metadata": {
-            "name": "fabric8-console-controller-98rqc",
-            "generateName": "fabric8-console-controller-",
-            "namespace": "default",
-            "selfLink": "/api/v1/namespaces/default/pods/fabric8-console-controller-98rqc",
-            "uid": "c76927af-f563-11e4-b32d-54ee7527188d",
-            "resourceVersion": "122",
-            "creationTimestamp": "2015-05-08T09:22:42Z",
-            "labels": {
-              "component": "fabric8Console"
-            }
-          },
-          "spec": {
-            "volumes": [
-              {
-                "name": "openshift-cert-secrets",
-                "hostPath": null,
-                "emptyDir": null,
-                "gcePersistentDisk": null,
-                "gitRepo": null,
-                "secret": {
-                  "secretName": "openshift-cert-secrets"
-                },
-                "nfs": null,
-                "iscsi": null,
-                "glusterfs": null
-              }
-            ],
-            "containers": [
-              {
-                "name": "fabric8-console-container",
-                "image": "fabric8/hawtio-kubernetes:latest",
-                "ports": [
-                  {
-                    "containerPort": 9090,
-                    "protocol": "TCP"
-                  }
-                ],
-                "env": [
-                  {
-                    "name": "OAUTH_CLIENT_ID",
-                    "value": "fabric8-console"
-                  },
-                  {
-                    "name": "OAUTH_AUTHORIZE_URI",
-                    "value": "https://localhost:8443/oauth/authorize"
-                  }
-                ],
-                "resources": {},
-                "volumeMounts": [
-                  {
-                    "name": "openshift-cert-secrets",
-                    "readOnly": true,
-                    "mountPath": "/etc/secret-volume"
-                  }
-                ],
-                "terminationMessagePath": "/dev/termination-log",
-                "imagePullPolicy": "IfNotPresent",
-                "capabilities": {}
-              }
-            ],
-            "restartPolicy": "Always",
-            "dnsPolicy": "ClusterFirst",
-            "nodeName": "jimmi-redhat.localnet"
-          },
-          "status": {
-            "phase": "Running",
-            "Condition": [
-              {
-                "type": "Ready",
-                "status": "True"
-              }
-            ],
-            "hostIP": "172.17.42.1",
-            "podIP": "172.17.0.8",
-            "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"
-              }
-            ]
-          }
-        }
-    http_version:
-  recorded_at: Fri, 08 May 2015 10:35:37 GMT
-- request:
-    method: get
-    uri: https://localhost:8443/api/v1/namespaces/default
-    body:
-      encoding: US-ASCII
-      string: ''
-    headers:
-      Accept:
-      - "*/*; q=0.5, application/xml"
-      Accept-Encoding:
-      - gzip, deflate
-      User-Agent:
-      - Ruby
-  response:
-    status:
-      code: 200
-      message: OK
-    headers:
-      Content-Type:
-      - application/json
-      Date:
-      - Fri, 08 May 2015 10:35:37 GMT
-      Transfer-Encoding:
-      - chunked
-    body:
-      encoding: UTF-8
-      string: |-
-        {
-          "kind": "Namespace",
-          "apiVersion": "v1",
-          "metadata": {
-            "name": "default",
-            "selfLink": "/api/v1/namespaces/default",
-            "uid": "898268c8-4a36-11e5-9d81-42010af0194c",
-            "resourceVersion": "6",
-            "creationTimestamp": "2015-05-08T09:22:01Z"
-          },
-          "spec": {
-            "finalizers": [
-                "kubernetes"
-            ]
-          },
-          "status": {
-            "phase": "Active"
-          }
-        }
-    http_version:
-  recorded_at: Fri, 08 May 2015 10:35:37 GMT
-- request:
-    method: get
-    uri: https://localhost:8443/api/v1/namespaces/default
-    body:
-      encoding: US-ASCII
-      string: ''
-    headers:
-      Accept:
-      - "*/*; q=0.5, application/xml"
-      Accept-Encoding:
-      - gzip, deflate
-      User-Agent:
-      - Ruby
-  response:
-    status:
-      code: 200
-      message: OK
-    headers:
-      Content-Type:
-      - application/json
-      Date:
-      - Fri, 08 May 2015 10:35:37 GMT
-      Transfer-Encoding:
-      - chunked
-    body:
-      encoding: UTF-8
-      string: |-
-        {
-          "kind": "Namespace",
-          "apiVersion": "v1",
-          "metadata": {
-            "name": "default",
-            "selfLink": "/api/v1/namespaces/default",
-            "uid": "898268c8-4a36-11e5-9d81-42010af0194c",
-            "resourceVersion": "6",
-            "creationTimestamp": "2015-05-08T09:22:01Z"
-          },
-          "spec": {
-            "finalizers": [
-                "kubernetes"
-            ]
-          },
-          "status": {
-            "phase": "Active"
-          }
-        }
-    http_version:
-  recorded_at: Fri, 08 May 2015 10:35:37 GMT
-- request:
-    method: get
-    uri: https://localhost:8443/api/v1/namespaces/journald-namespace-name/pods/journald-pod-name
-    body:
-      encoding: US-ASCII
-      string: ''
-    headers:
-      Accept:
-      - "*/*; q=0.5, application/xml"
-      Accept-Encoding:
-      - gzip, deflate
-      User-Agent:
-      - Ruby
-  response:
-    status:
-      code: 200
-      message: OK
-    headers:
-      Content-Type:
-      - application/json
-      Date:
-      - Fri, 08 May 2015 10:35:37 GMT
-      Transfer-Encoding:
-      - chunked
-    body:
-      encoding: UTF-8
-      string: |-
-        {
-          "kind": "Pod",
-          "apiVersion": "v1",
-          "metadata": {
-            "name": "journald-pod-name",
-            "generateName": "journald-pod-name-",
-            "namespace": "journald-namespace-name",
-            "selfLink": "/api/v1/namespaces/journald-namespace-name/pods/journald-pod-name",
-            "uid": "5e1c1e27-b637-4e81-80b6-6d8a8c404d3b",
-            "resourceVersion": "122",
-            "creationTimestamp": "2015-05-08T09:22:42Z",
-            "labels": {
-              "component": "journald-test"
-            }
-          },
-          "spec": {
-            "containers": [
-              {
-                "name": "journald-container-name",
-                "image": "journald-container-image:latest",
-                "terminationMessagePath": "/dev/termination-log",
-                "imagePullPolicy": "IfNotPresent",
-                "capabilities": {}
-              }
-            ],
-            "nodeName": "jimmi-redhat.localnet"
-          },
-          "status": {
-            "phase": "Running",
-            "Condition": [
-              {
-                "type": "Ready",
-                "status": "True"
-              }
-            ],
-            "hostIP": "172.17.42.1",
-            "podIP": "172.17.0.8",
-            "containerStatuses": [
-              {
-                "name": "journald-container-name",
-                "state": {
-                  "running": {
-                    "startedAt": "2015-05-08T09:22:44Z"
-                  }
-                },
-                "lastState": {},
-                "ready": true,
-                "restartCount": 0,
-                "image": "journald-container-image:latest",
-                "imageID": "docker://dda4c95705fb7050b701b10a7fe928ca5bc971a1dcb521ae3c339194cbf36b47",
-                "containerID": "docker://838350c64bacba968d39a30a50789b2795291fceca6ccbff55298671d46b0e3b"
-              }
-            ]
-          }
-        }
-    http_version:
-  recorded_at: Fri, 08 May 2015 10:35:37 GMT
-- request:
-    method: get
-    uri: https://localhost:8443/api/v1/namespaces/journald-namespace-name
-    body:
-      encoding: US-ASCII
-      string: ''
-    headers:
-      Accept:
-      - "*/*; q=0.5, application/xml"
-      Accept-Encoding:
-      - gzip, deflate
-      User-Agent:
-      - Ruby
-  response:
-    status:
-      code: 200
-      message: OK
-    headers:
-      Content-Type:
-      - application/json
-      Date:
-      - Fri, 08 May 2015 10:35:37 GMT
-      Transfer-Encoding:
-      - chunked
-    body:
-      encoding: UTF-8
-      string: |-
-        {
-          "kind": "Namespace",
-          "apiVersion": "v1",
-          "metadata": {
-            "name": "journald-namespace-name",
-            "selfLink": "/api/v1/namespaces/journald-namespace-name",
-            "uid": "8282888f-733f-4f23-a3d3-1fdfa3bdacf2",
-            "resourceVersion": "6",
-            "creationTimestamp": "2015-05-08T09:22:01Z"
-          },
-          "spec": {
-            "finalizers": [
-                "kubernetes"
-            ]
-          },
-          "status": {
-            "phase": "Active"
-          }
-        }
-    http_version:
-  recorded_at: Fri, 08 May 2015 10:35:37 GMT
-recorded_with: VCR 2.9.3