fluent-plugin-mesosphere-filter 0.1.9 → 0.1.10

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    MDFmNDBiNDczZmY1ZWVkYjMwOWNkNWQ5ZDhmOGIzNWEwYTMwM2E5YQ==
+    MGU0MDQyMzUwNzIyZGE0NWQ4OTdmMzgzYWY0OWM3N2NhMDA5YmRhNg==
   data.tar.gz: !binary |-
-    NTc4ZjBmY2ZhYTI2ODY5Y2ZiZTlmNGY0MTRkNzJmODU5NTdmMjEwZA==
+    YWNhYTJmNDk4NjcwZmZkMDlkYmMwNDBlOWFkNjAyNzRkN2RhYjczNg==
 SHA512:
   metadata.gz: !binary |-
-    Nzg4OGEwNjRiMTRlZjhmOGZiMmI3OTgwY2JlMTZkZmUyZTIyY2NjZDRlNDU3
-    MGE2ZDVjMjMwOTYxNDY5MjIwZjc1YmFiYjI3NmExNmVjMDg5YmVjMTcyOTkx
-    Mjc4NmRhZTlkMzY2ZTE5MDdhOTRmMjcyZDMxZTdkOTI0YzU3Yzg=
+    MzlhYTBhZjAwMjBlM2Y3N2Q4MjM0MjM1ZmZhNmZjMDlhZDdiMTRiNTk5NDAx
+    Yjg4MmQ2NTZiNGI1Njc2OTcwMjhjYzM4MmM4ZDA2M2JjNmE0MjE2ZWI5NjYy
+    NTgwYmVjMjdjZmZkYjNjODEzMDhjZjgyMDc3MzczYzgxNDM1YmQ=
   data.tar.gz: !binary |-
-    MWJmYzhiZGY1N2RjZjkwN2I0MDMxMjdkNDQ1ZTY5OGU0ZTZiZmRiMjBiZTIz
-    YTFmYjBlNTlmMWYzZmEzYTcyM2FkYmVjMWZkMmI5ZDgwYTk4ZGI1YTNjN2I1
-    MmE0NjUyYWY3MzMyMDdmZmRkMGE3MWI2MWY3ODlmY2EwYTQ2MGE=
+    NDU5YmIxYjNmMTNkNmQyYjk4MDQyNWYyYjY4MTczZDg2YmI5OWYxODI3YzU4
+    ODI1MmMxZDM0M2E2MzdhMzFlOThlODkyNzEyNTZlMmFkMGE4MzViZTlkNzBl
+    NGQzZGUyNjYwM2VhZjg3ZTk1MDk5ZGQ1NmRiMzZlZWZlZDViNDM=

data/fluent-plugin-mesosphere-filter.gemspec

@@ -4,7 +4,7 @@ $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 
 Gem::Specification.new do |gem|
   gem.name          = 'fluent-plugin-mesosphere-filter'
-  gem.version       = '0.1.9'
+  gem.version       = '0.1.10'
   gem.authors       = ['Joseph Hughes']
   gem.email         = ['jjhughes57@gmail.com']
   gem.description   = 'Filter plugin to add Mesosphere metadata'

data/lib/fluent/plugin/filter_mesosphere_filter.rb

@@ -25,6 +25,7 @@ module Fluent
     config_param :cache_ttl, :integer, default: 60 * 60
     config_param :get_container_id_tag, :bool, default: true
     config_param :container_id_attr, :string, default: 'container_id'
+    config_param :namespace_env_var, :string, default: nil
 
     config_param :merge_json_log, :bool, default: true
     config_param :cronos_task_regex,
@@ -122,6 +123,8 @@ module Fluent
             task_data['mesos_framework'] = 'chronos'
             task_data['app'] = match_data['app'] if match_data
             task_data['chronos_task_type'] = match_data['task_type'] if match_data
+          elsif @namespace_env_var && env.include?(@namespace_env_var)
+            task_data['namespace'] = parse_env(env)
           end
         end
       end
@@ -165,7 +168,8 @@ module Fluent
     end
 
     # Look at the log value and if it is valid json then we will parse the json
-    # and merge it into the log record.
+    # and merge it into the log record.  If a namespace is present then the log
+    # record is placed under that key.
     # ==== Attributes:
     # * +record+ - The record we are transforming in the fluentd event stream.
     # ==== Examples
@@ -177,9 +181,15 @@ module Fluent
     def merge_json_log(record)
       if record.key?('log')
         log = record['log'].strip
+        namespace = record['namespace']
         if log[0].eql?('{') && log[-1].eql?('}')
           begin
-            record = Oj.load(log).merge(record)
+            log_json = Oj.load(log)
+            if namespace
+              record[namespace] = log_json
+            else
+              record = log_json.merge(record)
+            end  
           rescue Oj::ParseError
           end
         end

data/test/containers/chronos.json

@@ -29,7 +29,8 @@
       "YEAR=2016",
       "VAULT_HOSTS=https://dev-use1a-pr-01-vault-vault-0001.dev-utopia.com:8200,https://dev-use1b-pr-01-vault-vault-0001.dev-utopia.com:8200,https://dev-use1e-pr-01-vault-vault-0001.dev-utopia.com:8200",
       "MESOS_SANDBOX=/mnt/mesos/sandbox",
-      "PORT=80"
+      "PORT=80",
+      "NAMESPACE=ns"
     ],
     "ExposedPorts": {
       "80/tcp": {}

data/test/containers/marathon.json

@@ -122,7 +122,8 @@
       "MARATHON_APP_ID=/hello-world",
       "FLUENTD_CONF=test.conf",
       "PATH=/home/ubuntu/ruby/bin:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin",
-      "FLUENTD_OPT="
+      "FLUENTD_OPT=",
+      "NAMESPACE=ns"
     ],
     "Cmd": [
       "/bin/sh",

data/test/plugin/test_mesosphere.rb

@@ -25,6 +25,9 @@ class AmplifierFilterTest < Test::Unit::TestCase
     get_container_id_tag false
     container_id_attr container_id
   ]
+  CONFIG4 = %[
+    namespace_env_var NAMESPACE
+  ]
 
   def create_driver(conf = CONFIG, tag = 'test')
     Fluent::Test::FilterTestDriver.new(Fluent::MesosphereFilter, tag).configure(conf)
@@ -152,6 +155,20 @@ class AmplifierFilterTest < Test::Unit::TestCase
     assert_equal 'Hello World', log_entry['test_key']
   end
 
+  def test_merge_json_with_namespace
+    setup_chronos_container
+
+    d1 = create_driver(CONFIG4, 'docker.foobar124')
+    d1.run do
+      d1.filter('log' => '{"test_key":"Hello World"}')
+    end
+    filtered = d1.filtered_as_array
+    log_entry = filtered[0][2]
+
+    assert_equal 'ns', log_entry['namespace']
+    assert_equal 'Hello World', log_entry['ns']['test_key']
+  end
+
   def test_bad_merge_json
     setup_chronos_container
     bad_json1 = '{"test_key":"Hello World"'
@@ -168,6 +185,24 @@ class AmplifierFilterTest < Test::Unit::TestCase
     assert_equal bad_json2, filtered[1][2]['log']
   end
 
+  def test_bad_merge_json_with_namespace
+    setup_chronos_container
+    bad_json1 = '{"test_key":"Hello World"'
+    bad_json2 = '{"test_key":"Hello World", "badnews"}'
+
+    d1 = create_driver(CONFIG4, 'docker.foobar124')
+    d1.run do
+      d1.filter('log' => bad_json1)
+      d1.filter('log' => bad_json2)
+    end
+    filtered = d1.filtered_as_array
+
+    assert_equal bad_json1, filtered[0][2]['log']
+    assert_equal bad_json2, filtered[1][2]['log']
+    assert_equal false, filtered[0][2].key?('ns')
+    assert_equal false, filtered[1][2].key?('ns')
+  end
+
   def test_container_id_from_record
     setup_marathon_container('somecontainer123', 'marathon2')
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fluent-plugin-mesosphere-filter
 version: !ruby/object:Gem::Version
-  version: 0.1.9
+  version: 0.1.10
 platform: ruby
 authors:
 - Joseph Hughes
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-12-02 00:00:00.000000000 Z
+date: 2016-01-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: fluentd