fluent-plugin-kubernetes_metadata_filter 0.11.0 → 0.12.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4e0fcd32fc3504d09147c16350c4596822151394
-  data.tar.gz: d6032d7ec7cd42cf46fcf101e3d8579883502caf
+  metadata.gz: 9a693d1d4eda7b6f2243e7be4852cb0d158a5aba
+  data.tar.gz: d9d6d6ef27bf420eb20f6abbfcb254452b39b983
 SHA512:
-  metadata.gz: 606ac89791ceec0de9f1f46d80ced6b126dff9325513c1bc177dcb1cb7f35896f9cdedea4a9aff657f5b0eab1569b0a0eb0143c38c51678cc86cbc5d47c6e1e7
-  data.tar.gz: 98c9aa0d292a7dc9d679ab46961136986ecfbfcfdd2c9276ded1bca00c67fa6ca11a52581942ff3a3d10c32267b259d0267efc0db462f2d8331454f3af6f869c
+  metadata.gz: ca3e4278a6394318a7a0cb840da1820502d5eeca95339d4968ad25fb19c55b78c4bdbee16b6854293740af8a2ac01c9777546452750681e23d25df0caee7d0f6
+  data.tar.gz: 1e6038a0ff64a556ecc2dfac8c693ec4ec2cd1040d905414bb3c1dc2b11ba36a8cdd1a1c28f2843224815e7f9d5d6cf9459076f32c9d158f3a8babdf2f557ff2

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.11.0"
+  gem.version       = "0.12.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

@@ -31,7 +31,7 @@ module Fluent
     config_param :verify_ssl, :bool, default: true
     config_param :tag_to_kubernetes_name_regexp,
                  :string,
-                 :default => '\.(?<pod_name>[^\._]+)_(?<namespace>[^_]+)_(?<container_name>.+)-(?<docker_id>[a-z0-9]{64})\.log$'
+                 :default => 'var\.log\.containers\.(?<pod_name>[a-z0-9]([-a-z0-9]*[a-z0-9])?(\.[a-z0-9]([-a-z0-9]*[a-z0-9])?)*)_(?<namespace>[^_]+)_(?<container_name>.+)-(?<docker_id>[a-z0-9]{64})\.log$'
     config_param :bearer_token_file, :string, default: ''
     config_param :merge_json_log, :bool, default: true
     config_param :include_namespace_id, :bool, default: false

data/test/plugin/test_filter_kubernetes_metadata.rb

@@ -112,8 +112,8 @@ class KubernetesMetadataFilterTest < Test::Unit::TestCase
             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',
+            namespace_name: 'default',
+            pod_id:         'c76927af-f563-11e4-b32d-54ee7527188d',
             labels: {
               component: 'fabric8Console'
             }
@@ -167,8 +167,8 @@ class KubernetesMetadataFilterTest < Test::Unit::TestCase
             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',
+            namespace_name: 'default',
+            pod_id:         'c76927af-f563-11e4-b32d-54ee7527188d',
             labels: {
               component: 'fabric8Console'
             }
@@ -187,7 +187,7 @@ class KubernetesMetadataFilterTest < Test::Unit::TestCase
           kubernetes: {
               pod_name:       'fabric8-console-controller-98rqc',
               container_name: 'fabric8-console-container',
-              namespace_name:      'default',
+              namespace_name: 'default',
           }
       }
       assert_equal(expected_kube_metadata, es.instance_variable_get(:@record_array)[0])
@@ -208,7 +208,28 @@ class KubernetesMetadataFilterTest < Test::Unit::TestCase
         kubernetes: {
           pod_name:       'fabric8-console-controller-98rqc',
           container_name: 'fabric8-console-container',
-          namespace_name:      'default'
+          namespace_name: 'default'
+        }
+      }
+      assert_equal(expected_kube_metadata, es.instance_variable_get(:@record_array)[0])
+    end
+
+    test 'with dot in pod name' do
+      stub_request(:any, 'https://localhost:8443/api').to_return(
+        body: {
+          versions: ['v1beta3', 'v1']
+        }.to_json
+      )
+      stub_request(:any, 'https://localhost:8443/api/v1/namespaces/default/pods/fabric8-console-controller.98rqc').to_timeout
+      es = emit_with_tag('var.log.containers.fabric8-console-controller.98rqc_default_fabric8-console-container-49095a2894da899d3b327c5fde1e056a81376cc9a8f8b09a195f2a92bceed459.log', {}, '')
+      expected_kube_metadata = {
+        docker: {
+          container_id: '49095a2894da899d3b327c5fde1e056a81376cc9a8f8b09a195f2a92bceed459'
+        },
+        kubernetes: {
+          pod_name:       'fabric8-console-controller.98rqc',
+          container_name: 'fabric8-console-container',
+          namespace_name: 'default'
         }
       }
       assert_equal(expected_kube_metadata, es.instance_variable_get(:@record_array)[0])

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fluent-plugin-kubernetes_metadata_filter
 version: !ruby/object:Gem::Version
-  version: 0.11.0
+  version: 0.12.0
 platform: ruby
 authors:
 - Jimmi Dyson
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-09-09 00:00:00.000000000 Z
+date: 2015-09-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: fluentd