fluent-plugin-kubernetes_metadata_filter 0.26.3 → 0.27.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 955084706621e1158ce6950b1afad7702ade679e
-  data.tar.gz: d179ade18f18f3acfe691b85471a007c1a2f6aa2
+  metadata.gz: 168dd4ff037a7da0fc60de77b43784416cf0bf40
+  data.tar.gz: 6ecb0b18c7fc0a5883ec4584dd1e7261ae94393e
 SHA512:
-  metadata.gz: e9571f194b02beb3374ae37e7321d0c9c7ad1a0cc36d7603e5b146bd4b747b5e41f7916d4f910ad4813697331b66556b07d921dab000253f57b1115d796acc05
-  data.tar.gz: 24c6addc93de722388f02f1b4a7e0f6031cc134cd421261429618c477e5b71967e26d117b99921db9fe4f906259e071db20762ef30ce3ad7148cbb46d2077cfd
+  metadata.gz: 234788bfb4c824714fc56cb165ac74480a78932bbe82f4b4bb5a02e0b491d7cedc7b6e54b23a6fef24be784184684630f5464ae87a20477f58a306a56cce72a0
+  data.tar.gz: d25a5dc8846f85c66b8ed99aadbc080d94a770e4cc887dbcf57c326721693cfbc88ed90db87a7a42a4c82182a2eb4974f39077b54f917fa117254d4f0cd2eaef

data/README.md

@@ -11,7 +11,7 @@
 
 Configuration options for fluent.conf are:
 
-* `kubernetes_url` - URL to the API server. Set this to retrieve further kubernetes metadata for logs from kubernetes API server
+* `kubernetes_url` - URL to the API server. Set this to retrieve further kubernetes metadata for logs from kubernetes API server. If not specified, environment variables `KUBERNETES_SERVICE_HOST` and `KUBERNETES_SERVICE_PORT` will be used if both are present which is typically true when running fluentd in a pod.
 * `apiVersion` - API version to use (default: `v1`)
 * `ca_file` - path to CA file for Kubernetes server certificate validation
 * `verify_ssl` - validate SSL certificates (default: `true`)
@@ -28,7 +28,8 @@ This must used named capture groups for `container_name`, `pod_name` & `namespac
 * `de_dot` - replace dots in labels 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: `_`)
 * `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: `'^k8s_(?<container_name>[^\.]+)\.(?<container_hash>[a-z0-9]{8})_(?<pod_name>[^_]+)_(?<namespace>[^_]+)_(?<pod_id>[^_]+)_(?<pod_randhex>[a-z0-9]{8})$'`)
+* `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)
 * `annotation_match` - Array of regular expressions matching annotation field names. Matched annotations are added to a log record.
 
 Reading from the JSON formatted log files with `in_tail` and wildcard filenames:
@@ -43,7 +44,7 @@ Reading from the JSON formatted log files with `in_tail` and wildcard filenames:
   read_from_head true
 </source>
 
-<filter kubernetes.var.log.containers.*.log>
+<filter kubernetes.var.log.containers.**.log>
   type kubernetes_metadata
 </filter>
 

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       = "0.26.3"
+  gem.version       = "0.27.0"
   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

@@ -39,6 +39,7 @@ module Fluent
     config_param :merge_json_log, :bool, default: true
     config_param :preserve_json_log, :bool, default: true
     config_param :include_namespace_id, :bool, default: false
+    config_param :include_namespace_metadata, :bool, default: false
     config_param :secret_dir, :string, default: '/var/run/secrets/kubernetes.io/serviceaccount'
     config_param :de_dot, :bool, default: true
     config_param :de_dot_separator, :string, default: '_'
@@ -50,9 +51,10 @@ module Fluent
     # Field 2 is the container_hash, field 5 is the pod_id, and field 6 is the pod_randhex
     # I would have included them as named groups, but you can't have named groups that are
     # non-capturing :P
+    # parse format is defined here: https://github.com/kubernetes/kubernetes/blob/master/pkg/kubelet/dockertools/docker.go#L317
     config_param :container_name_to_kubernetes_regexp,
                  :string,
-                 :default => '^k8s_(?<container_name>[^\.]+)\.[^_]+_(?<pod_name>[^_]+)_(?<namespace>[^_]+)_[^_]+_[a-f0-9]{8}$'
+                 :default => '^(?<name_prefix>[^_]+)_(?<container_name>[^\._]+)(\.(?<container_hash>[^_]+))?_(?<pod_name>[^_]+)_(?<namespace>[^_]+)_[^_]+_[^_]+$'
 
     config_param :annotation_match, :array, default: []
 
@@ -71,25 +73,45 @@ module Fluent
       newhsh
     end
 
-    def get_metadata(namespace_name, pod_name)
+    def parse_pod_metadata(pod_object)
+      labels = syms_to_strs(pod_object['metadata']['labels'].to_h)
+      annotations = match_annotations(syms_to_strs(pod_object['metadata']['annotations'].to_h))
+      if @de_dot
+        self.de_dot!(labels)
+        self.de_dot!(annotations)
+      end
+      kubernetes_metadata = {
+          'namespace_name' => pod_object['metadata']['namespace'],
+          'pod_id'         => pod_object['metadata']['uid'],
+          'pod_name'       => pod_object['metadata']['name'],
+          'labels'         => labels,
+          'host'           => pod_object['spec']['nodeName'],
+          'master_url'     => @kubernetes_url
+      }
+      kubernetes_metadata['annotations'] = annotations unless annotations.empty?
+      return kubernetes_metadata
+    end
+
+    def parse_namespace_metadata(namespace_object)
+      labels = syms_to_strs(namespace_object['metadata']['labels'].to_h)
+      annotations = match_annotations(syms_to_strs(namespace_object['metadata']['annotations'].to_h))
+      if @de_dot
+        self.de_dot!(labels)
+        self.de_dot!(annotations)
+      end
+      kubernetes_metadata = {
+        'namespace_id' => namespace_object['metadata']['uid']
+      }
+      kubernetes_metadata['namespace_labels'] = labels unless labels.empty?
+      kubernetes_metadata['namespace_annotations'] = annotations unless annotations.empty?
+      return kubernetes_metadata
+    end
+
+    def get_pod_metadata(namespace_name, pod_name)
       begin
         metadata = @client.get_pod(pod_name, namespace_name)
         return if !metadata
-        labels = syms_to_strs(metadata['metadata']['labels'].to_h)
-        annotations = match_annotations(syms_to_strs(metadata['metadata']['annotations'].to_h))
-        if @de_dot
-          self.de_dot!(labels)
-          self.de_dot!(annotations)
-        end
-        kubernetes_metadata = {
-            'namespace_name' => namespace_name,
-            'pod_id'         => metadata['metadata']['uid'],
-            'pod_name'       => pod_name,
-            'labels'         => labels,
-            'host'           => metadata['spec']['nodeName']
-        }
-        kubernetes_metadata['annotations'] = annotations unless annotations.empty?
-        return kubernetes_metadata
+        return parse_pod_metadata(metadata)
       rescue KubeException
         nil
       end
@@ -110,11 +132,16 @@ module Fluent
         raise Fluent::ConfigError, "Invalid de_dot_separator: cannot be or contain '.'"
       end
 
+      if @include_namespace_id
+        # For compatibility, use include_namespace_metadata instead
+        @include_namespace_metadata = true
+      end
+
       if @cache_ttl < 0
         @cache_ttl = :none
       end
       @cache = LruRedux::TTL::ThreadSafeCache.new(@cache_size, @cache_ttl)
-      if @include_namespace_id
+      if @include_namespace_metadata
         @namespace_cache = LruRedux::TTL::ThreadSafeCache.new(@cache_size, @cache_ttl)
       end
       @tag_to_kubernetes_name_regexp_compiled = Regexp.compile(@tag_to_kubernetes_name_regexp)
@@ -172,7 +199,7 @@ module Fluent
         if @watch
           thread = Thread.new(self) { |this| this.start_watch }
           thread.abort_on_exception = true
-          if @include_namespace_id
+          if @include_namespace_metadata
             namespace_thread = Thread.new(self) { |this| this.start_namespace_watch }
             namespace_thread.abort_on_exception = true
           end
@@ -197,6 +224,42 @@ module Fluent
 
     end
 
+    def get_metadata_for_record(namespace_name, pod_name, container_name)
+      metadata = {
+        'container_name' => container_name,
+        'namespace_name' => namespace_name,
+        'pod_name'       => pod_name,
+      }
+      if @kubernetes_url.present?
+        cache_key = "#{namespace_name}_#{pod_name}"
+
+        this = self
+        pod_metadata = @cache.getset(cache_key) {
+          md = this.get_pod_metadata(
+            namespace_name,
+            pod_name,
+          )
+          md
+        }
+        metadata.merge!(pod_metadata) if pod_metadata
+
+        if @include_namespace_metadata
+          namespace_metadata = @namespace_cache.getset(namespace_name) {
+            begin
+              namespace = @client.get_namespace(namespace_name)
+              if namespace
+                parse_namespace_metadata(namespace)
+              end
+            rescue KubeException
+              nil
+            end
+          }
+          metadata.merge!(namespace_metadata) if namespace_metadata
+        end
+      end
+      metadata
+    end
+
     def filter_stream(tag, es)
       es
     end
@@ -211,38 +274,12 @@ module Fluent
           'docker' => {
             'container_id' => match_data['docker_id']
           },
-          'kubernetes' => {
-            'namespace_name' => match_data['namespace'],
-            'pod_name'       => match_data['pod_name'],
-          }
+          'kubernetes' => get_metadata_for_record(
+            match_data['namespace'],
+            match_data['pod_name'],
+            match_data['container_name'],
+          ),
         }
-
-        if @kubernetes_url.present?
-          cache_key = "#{metadata['kubernetes']['namespace_name']}_#{metadata['kubernetes']['pod_name']}"
-
-          this     = self
-          kubernetes_metadata = @cache.getset(cache_key) {
-            if metadata
-              md = this.get_metadata(
-                metadata['kubernetes']['namespace_name'],
-                metadata['kubernetes']['pod_name']
-              )
-              md
-            end
-          }
-          metadata['kubernetes'].merge!(kubernetes_metadata) if kubernetes_metadata
-
-          if @include_namespace_id
-            namespace_name = metadata['kubernetes']['namespace_name']
-            namespace_id = @namespace_cache.getset(namespace_name) {
-              namespace = @client.get_namespace(namespace_name)
-              namespace['metadata']['uid'] if namespace
-            }
-            metadata['kubernetes']['namespace_id'] = namespace_id if namespace_id
-          end
-        end
-
-        metadata['kubernetes']['container_name'] = match_data['container_name']
       end
 
       es.each { |time, record|
@@ -269,36 +306,13 @@ module Fluent
               'docker' => {
                 'container_id' => record['CONTAINER_ID_FULL']
               },
-              'kubernetes' => {
-                'namespace_name' => match_data['namespace'],
-                'pod_name'       => match_data['pod_name']
-              }
+              'kubernetes' => get_metadata_for_record(
+                match_data['namespace'],
+                match_data['pod_name'],
+                match_data['container_name'],
+              )
             }
-            if @kubernetes_url.present?
-              cache_key = "#{metadata['kubernetes']['namespace_name']}_#{metadata['kubernetes']['pod_name']}"
-
-              this     = self
-              kubernetes_metadata = @cache.getset(cache_key) {
-                if metadata
-                  md = this.get_metadata(
-                    metadata['kubernetes']['namespace_name'],
-                    metadata['kubernetes']['pod_name']
-                  )
-                  md
-                end
-              }
-              metadata['kubernetes'].merge!(kubernetes_metadata) if kubernetes_metadata
-
-              if @include_namespace_id
-                namespace_name = metadata['kubernetes']['namespace_name']
-                namespace_id = @namespace_cache.getset(namespace_name) {
-                  namespace = @client.get_namespace(namespace_name)
-                  namespace['metadata']['uid'] if namespace
-                }
-                metadata['kubernetes']['namespace_id'] = namespace_id if namespace_id
-              end
-            end
-            metadata['kubernetes']['container_name'] = match_data['container_name']
+
             metadata
           end
           unless metadata
@@ -361,7 +375,12 @@ module Fluent
         resource_version = @client.get_pods.resourceVersion
         watcher          = @client.watch_pods(resource_version)
       rescue Exception => e
-        raise Fluent::ConfigError, "Exception encountered fetching metadata from Kubernetes API endpoint: #{e.message}"
+        message = "Exception encountered fetching metadata from Kubernetes API endpoint: #{e.message}"
+        if e.respond_to?(:response)
+          message += " (#{e.response})"
+        end
+
+        raise Fluent::ConfigError, message
       end
 
       watcher.each do |notice|
@@ -370,16 +389,7 @@ module Fluent
             cache_key = "#{notice.object['metadata']['namespace']}_#{notice.object['metadata']['name']}"
             cached    = @cache[cache_key]
             if cached
-              # Only thing that can be modified is labels and (possibly) annotations
-              labels = syms_to_strs(notice.object.metadata.labels.to_h)
-              annotations = match_annotations(syms_to_strs(notice.object.metadata.annotations.to_h))
-              if @de_dot
-                self.de_dot!(labels)
-                self.de_dot!(annotations)
-              end
-              cached['labels'] = labels
-              cached['annotations'] = annotations
-              @cache[cache_key] = cached
+              @cache[cache_key] = parse_pod_metadata(notice.object)
             end
           when 'DELETED'
             cache_key = "#{notice.object['metadata']['namespace']}_#{notice.object['metadata']['name']}"
@@ -397,11 +407,17 @@ module Fluent
       watcher.each do |notice|
         puts notice
         case notice.type
+          when 'MODIFIED'
+            cache_key = notice.object['metadata']['name']
+            cached    = @namespace_cache[cache_key]
+            if cached
+              @namespace_cache[cache_key] = parse_namespace_metadata(notice.object)
+            end
           when 'DELETED'
             @namespace_cache.delete(notice.object['metadata']['name'])
           else
-            # We only care about each namespace's name and UID, neither of which
-            # is modifiable, so we only have to care about deletions.
+            # Don't pay attention to creations, since the created namespace may not
+            # be used by any pod on this node.
         end
       end
     end

data/test/cassettes/kubernetes_docker_metadata.yml

@@ -177,4 +177,52 @@ http_interactions:
         }
     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
 recorded_with: VCR 2.9.3

data/test/cassettes/kubernetes_docker_metadata_annotations.yml

@@ -185,4 +185,55 @@ http_interactions:
         }
     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",
+            "annotations": {
+              "workspaceId": "myWorkspaceName"
+            }
+          },
+          "spec": {
+            "finalizers": [
+                "kubernetes"
+            ]
+          },
+          "status": {
+            "phase": "Active"
+          }
+        }
+    http_version:
+  recorded_at: Fri, 08 May 2015 10:35:37 GMT
 recorded_with: VCR 2.9.3

data/test/cassettes/kubernetes_docker_metadata_dotted_labels.yml

@@ -177,4 +177,55 @@ http_interactions:
         }
     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",
+            "labels": {
+              "kubernetes.io/namespacetest": "somevalue"
+            }
+          },
+          "spec": {
+            "finalizers": [
+                "kubernetes"
+            ]
+          },
+          "status": {
+            "phase": "Active"
+          }
+        }
+    http_version:
+  recorded_at: Fri, 08 May 2015 10:35:37 GMT
 recorded_with: VCR 2.9.3

data/test/cassettes/kubernetes_docker_metadata_using_bearer_token.yml

@@ -197,4 +197,52 @@ http_interactions:
         }
     http_version: 
   recorded_at: Sat, 09 May 2015 13:51:07 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
 recorded_with: VCR 2.9.3

data/test/cassettes/metadata_with_namespace_id.yml

@@ -225,4 +225,52 @@ http_interactions:
         }
     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
 recorded_with: VCR 2.9.3

data/test/plugin/test_filter_kubernetes_metadata.rb

@@ -166,6 +166,7 @@ class KubernetesMetadataFilterTest < Test::Unit::TestCase
             'container_name' => 'fabric8-console-container',
             'namespace_name' => 'default',
             'pod_id'         => 'c76927af-f563-11e4-b32d-54ee7527188d',
+            'master_url'     => 'https://localhost:8443',
             'labels' => {
               'component' => 'fabric8Console'
             }
@@ -194,6 +195,7 @@ class KubernetesMetadataFilterTest < Test::Unit::TestCase
             'namespace_name' => 'default',
             'namespace_id'   => '898268c8-4a36-11e5-9d81-42010af0194c',
             'pod_id'         => 'c76927af-f563-11e4-b32d-54ee7527188d',
+            'master_url'     => 'https://localhost:8443',
             'labels' => {
               'component' => 'fabric8Console'
             }
@@ -221,6 +223,7 @@ class KubernetesMetadataFilterTest < Test::Unit::TestCase
             'container_name' => 'fabric8-console-container',
             'namespace_name' => 'default',
             'pod_id'         => 'c76927af-f563-11e4-b32d-54ee7527188d',
+            'master_url'     => 'https://localhost:8443',
             'labels' => {
               'component' => 'fabric8Console'
             }
@@ -377,17 +380,27 @@ use_journal true
 
     test 'with kubernetes dotted labels, de_dot enabled' do
       VCR.use_cassette('kubernetes_docker_metadata_dotted_labels') do
-        es = emit()
+        es = emit({}, '
+          kubernetes_url https://localhost:8443
+          watch false
+          cache_size 1
+          include_namespace_metadata true
+        ')
         expected_kube_metadata = {
           'docker' => {
               'container_id' => '49095a2894da899d3b327c5fde1e056a81376cc9a8f8b09a195f2a92bceed459'
           },
           'kubernetes' => {
-            'host'           => 'jimmi-redhat.localnet',
-            'pod_name'       => 'fabric8-console-controller-98rqc',
-            'container_name' => 'fabric8-console-container',
-            'namespace_name' => 'default',
-            'pod_id'         => 'c76927af-f563-11e4-b32d-54ee7527188d',
+            'host'             => 'jimmi-redhat.localnet',
+            'pod_name'         => 'fabric8-console-controller-98rqc',
+            'container_name'   => 'fabric8-console-container',
+            'namespace_id'     => '898268c8-4a36-11e5-9d81-42010af0194c',
+            'namespace_labels' => {
+              'kubernetes_io/namespacetest' => 'somevalue'
+            },
+            'namespace_name'   => 'default',
+            'pod_id'           => 'c76927af-f563-11e4-b32d-54ee7527188d',
+            'master_url'       => 'https://localhost:8443',
             'labels' => {
               'kubernetes_io/test' => 'somevalue'
             }
@@ -404,17 +417,23 @@ use_journal true
           watch false
           cache_size 1
           de_dot false
+          include_namespace_metadata true
         ')
         expected_kube_metadata = {
           'docker' => {
               'container_id' => '49095a2894da899d3b327c5fde1e056a81376cc9a8f8b09a195f2a92bceed459'
           },
           'kubernetes' => {
-            'host'           => 'jimmi-redhat.localnet',
-            'pod_name'       => 'fabric8-console-controller-98rqc',
-            'container_name' => 'fabric8-console-container',
-            'namespace_name' => 'default',
-            'pod_id'         => 'c76927af-f563-11e4-b32d-54ee7527188d',
+            'host'             => 'jimmi-redhat.localnet',
+            'pod_name'         => 'fabric8-console-controller-98rqc',
+            'container_name'   => 'fabric8-console-container',
+            'namespace_id'     => '898268c8-4a36-11e5-9d81-42010af0194c',
+            'namespace_labels' => {
+              'kubernetes.io/namespacetest' => 'somevalue'
+            },
+            'namespace_name'   => 'default',
+            'pod_id'           => 'c76927af-f563-11e4-b32d-54ee7527188d',
+            'master_url'       => 'https://localhost:8443',
             'labels' => {
               'kubernetes.io/test' => 'somevalue'
             }
@@ -457,6 +476,7 @@ use_journal true
             'container_name' => 'fabric8-console-container',
             'namespace_name' => 'default',
             'pod_id'         => 'c76927af-f563-11e4-b32d-54ee7527188d',
+            'master_url'     => 'https://localhost:8443',
             'labels' => {
               'component' => 'fabric8Console'
             }
@@ -493,6 +513,7 @@ use_journal true
             'namespace_name' => 'default',
             'namespace_id'   => '898268c8-4a36-11e5-9d81-42010af0194c',
             'pod_id'         => 'c76927af-f563-11e4-b32d-54ee7527188d',
+            'master_url'     => 'https://localhost:8443',
             'labels' => {
               'component' => 'fabric8Console'
             }
@@ -520,6 +541,7 @@ use_journal true
                 'container_name' => 'fabric8-console-container',
                 'namespace_name' => 'default',
                 'pod_id'         => 'c76927af-f563-11e4-b32d-54ee7527188d',
+                'master_url'     => 'https://localhost:8443',
                 'labels'         => {
                     'component' => 'fabric8Console'
                 },
@@ -533,5 +555,107 @@ use_journal true
       end
     end
 
+    test 'with records from journald and docker & kubernetes metadata, alternate form' do
+      # with use_journal true should ignore tags and use CONTAINER_NAME and CONTAINER_ID_FULL
+      tag = 'var.log.containers.junk1_junk2_junk3-49095a2894da899d3b327c5fde1e056a81376cc9a8f8b09a195f2a92bceed450.log'
+      msg = {
+        'CONTAINER_NAME' => 'alt_fabric8-console-container_fabric8-console-controller-98rqc_default_c76927af-f563-11e4-b32d-54ee7527188d_0',
+        'CONTAINER_ID_FULL' => '49095a2894da899d3b327c5fde1e056a81376cc9a8f8b09a195f2a92bceed459',
+        'randomfield' => 'randomvalue'
+      }
+      VCR.use_cassette('kubernetes_docker_metadata') do
+        es = emit_with_tag(tag, msg, '
+          kubernetes_url https://localhost:8443
+          watch false
+          cache_size 1
+          use_journal true
+        ')
+        expected_kube_metadata = {
+          'docker' => {
+              'container_id' => '49095a2894da899d3b327c5fde1e056a81376cc9a8f8b09a195f2a92bceed459'
+          },
+          'kubernetes' => {
+            'host'           => 'jimmi-redhat.localnet',
+            'pod_name'       => 'fabric8-console-controller-98rqc',
+            'container_name' => 'fabric8-console-container',
+            'namespace_name' => 'default',
+            'pod_id'         => 'c76927af-f563-11e4-b32d-54ee7527188d',
+            'master_url'     => 'https://localhost:8443',
+            'labels' => {
+              'component' => 'fabric8Console'
+            }
+          }
+        }.merge(msg)
+        assert_equal(expected_kube_metadata, es.instance_variable_get(:@record_array)[0])
+      end
+    end
+
+    test 'with kubernetes namespace annotations' do
+      VCR.use_cassette('kubernetes_docker_metadata_annotations') do
+        es = emit({},'
+          kubernetes_url https://localhost:8443
+          watch false
+          cache_size 1
+          include_namespace_metadata true
+          annotation_match [ "^custom.+", "two", "workspace*"]
+        ')
+        expected_kube_metadata = {
+            'docker' => {
+                'container_id' => '49095a2894da899d3b327c5fde1e056a81376cc9a8f8b09a195f2a92bceed459'
+            },
+            'kubernetes' => {
+                'host'           => 'jimmi-redhat.localnet',
+                'pod_name'       => 'fabric8-console-controller-98rqc',
+                'container_name' => 'fabric8-console-container',
+                'namespace_id'   => '898268c8-4a36-11e5-9d81-42010af0194c',
+                'namespace_name' => 'default',
+                'pod_id'         => 'c76927af-f563-11e4-b32d-54ee7527188d',
+                'master_url'     => 'https://localhost:8443',
+                'labels'         => {
+                    'component' => 'fabric8Console'
+                },
+                'annotations'    => {
+                    'custom_field1' => 'hello_kitty',
+                    'field_two' => 'value'
+                },
+                'namespace_annotations'    => {
+                    'workspaceId' => 'myWorkspaceName'
+                }
+            }
+        }
+        assert_equal(expected_kube_metadata, es.instance_variable_get(:@record_array)[0])
+      end
+    end
+
+    test 'with kubernetes namespace annotations no match' do
+      VCR.use_cassette('kubernetes_docker_metadata_annotations') do
+        es = emit({},'
+          kubernetes_url https://localhost:8443
+          watch false
+          cache_size 1
+          include_namespace_metadata true
+          annotation_match [ "noMatch*"]
+        ')
+        expected_kube_metadata = {
+            'docker' => {
+                'container_id' => '49095a2894da899d3b327c5fde1e056a81376cc9a8f8b09a195f2a92bceed459'
+            },
+            'kubernetes' => {
+                'host'           => 'jimmi-redhat.localnet',
+                'pod_name'       => 'fabric8-console-controller-98rqc',
+                'container_name' => 'fabric8-console-container',
+                'namespace_id'   => '898268c8-4a36-11e5-9d81-42010af0194c',
+                'namespace_name' => 'default',
+                'pod_id'         => 'c76927af-f563-11e4-b32d-54ee7527188d',
+                'master_url'     => 'https://localhost:8443',
+                'labels'         => {
+                    'component' => 'fabric8Console'
+                }
+            }
+        }
+        assert_equal(expected_kube_metadata, es.instance_variable_get(:@record_array)[0])
+      end
+    end
+
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fluent-plugin-kubernetes_metadata_filter
 version: !ruby/object:Gem::Version
-  version: 0.26.3
+  version: 0.27.0
 platform: ruby
 authors:
 - Jimmi Dyson
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-02-27 00:00:00.000000000 Z
+date: 2017-05-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: fluentd
@@ -238,7 +238,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.8
+rubygems_version: 2.6.12
 signing_key: 
 specification_version: 4
 summary: Filter plugin to add Kubernetes metadata