fluent-plugin-mesosphere-filter 0.1.6 → 0.1.7

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    NjYxZWVmZDQzNDc2MTRmN2Y2YTcwMWQ1NDExM2ZjMjY4YzRjYjgzYQ==
+    YjI3ZjFmNGQxNmE0NWRkN2M0YWIzM2Q2MTU3OGRmYTE4ZTg5MmMxYg==
   data.tar.gz: !binary |-
-    ODY0YWJlZWZkYTc5MmM4NDI5MjhjMzU5NGUzMjE1NGExZDM2MzZhNA==
+    NGY0OWIwMjA4OTZhYWE0Mjk3MmQxMWQ0MjViMmY5ZDFhYWNjM2UzNA==
 SHA512:
   metadata.gz: !binary |-
-    NGE3OGM2NTAzYjgwMTZlZmM4OTUwYWMxNTVmYmFmOTMyYWY0NzUyNDgxMDJm
-    OTZmMThlNTM1ZTY5ZWI4MThhNjQzN2RhZjYyOTU4NzQ4M2RjZDUxZTY3NTUy
-    NDVjNzczZTQ0YmY5ZGY4NTk1MWMzZTA1NGM5MjgxZjM4NGNiNmQ=
+    NDZlY2JlZTM0Njc5ZjZhNmM2ZjYyMTllOTRmMGNlMzZiMTMzOWVmNTQ2MTY1
+    YjEwMTQwMWY2M2RjMzA4YWY1OWQ3NzlhZWNkMTFjMWNjZDA0NmQ2M2QyZmE2
+    MDBhNjk4NmZjZjc0YWVlNWIyOGFhZWFlZmE4OThhNDY2NjQ4ZWI=
   data.tar.gz: !binary |-
-    NTJkMDY4YjkyMDc5YTdiZjEwMDZlOTk3YTY2NWVkMzM5ZjIyYThlMmJlNmU3
-    ZDMxNmJjYWM0OWM1MTY0MWM2ZTU0MzIzYzhlMjBkMTI2OTQ3ODhhNjIxOTA5
-    ODVjODM5MDk5NWFhYjY2YjdiMGExMGI5MDcyMTUwOWMzZDE5ODM=
+    ODM3OTRkZmY4YjdiYmM0YzE0NGQ1NjQ4ZDc1OWNhNzk1YTI2NGMxMTlkMmNl
+    M2MyMDhmNDRmMzhmMjFhYTFiN2NkODRjMGEzMGZlOGM0YjIyOGMwNzdhY2I2
+    MDc3Yzg4ZDI1YWUwYTkyMjI2N2FkZDk1ZTY2NzMzOWM3NWYyNmE=

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.6'
+  gem.version       = '0.1.7'
   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

@@ -26,10 +26,11 @@ module Fluent
     config_param :get_container_id_tag, :bool, default: true
     config_param :container_id_attr, :string, default: 'container_id'
 
+    config_param :timestamp_key, :string, default: '@timestamp'
     config_param :merge_json_log, :bool, default: true
     config_param :cronos_task_regex,
                  :string,
-                 default: '(?<app>[a-z0-9]([-a-z0-9_]*[a-z0-9_]))-(?<date>[^-]+)-(?<time>[^-]+)-(?<task_type>[^-]+)-(?<run>[^-]+)-(?<epoc>[^-]+)'
+                 default: '^(?<app>[a-z0-9]([-a-z0-9.]*[a-z0-9]))-(?<date>[^-]+)-(?<time>[^-]+)-(?<task_type>[^-]+)-(?<run>[^-]+)-(?<epoc>[^-]+)$'
 
     # Get the configuration for the plugin
     def configure(conf)
@@ -38,6 +39,7 @@ module Fluent
       require 'docker-api'
       require 'lru_redux'
       require 'oj'
+      require 'time'
 
       @cache_ttl = :none if @cache_ttl < 0
 
@@ -45,7 +47,7 @@ module Fluent
 
       @chronos_task_regex_compiled = Regexp.compile(@cronos_task_regex)
 
-      marathon_regex = '\/(?<app>[a-z0-9]([-a-z0-9_]*[a-z0-9_]))'
+      marathon_regex = '\/(?<app>[a-z0-9]([-a-z0-9_.]*[a-z0-9_.]))'
       @marathon_app_regex_compiled = Regexp.compile(marathon_regex)
     end
 
@@ -61,11 +63,23 @@ module Fluent
         container_id =
           get_container_id_from_record(record) if container_id.empty?
         next unless container_id
+        record[@timestamp_key] = generate_time_stamp(time)
         new_es.add(time, modify_record(record, get_mesos_data(container_id)))
       end
       new_es
     end
 
+    # Generates a timestamp that the elasticsearch plugin can understand.
+    #
+    # ==== Attributes:
+    # * +time+ - A time record from the event stream
+    # ==== Returns:
+    # * A string with the correct datatime format for the elasticsearch plugin
+    #   to consume
+    def generate_time_stamp(time)
+      Time.at(time).utc.strftime('%Y-%m-%dT%H:%M:%S%z')
+    end
+
     # Injects the meso framework data into the record and also merges
     # the json log if that configuration is enabled.
     #

data/test/plugin/test_mesosphere.rb

@@ -65,6 +65,26 @@ class AmplifierFilterTest < Test::Unit::TestCase
     assert_equal task_id, log_entry['mesos_task_id']
   end
 
+  def test_timestamp
+    setup_marathon_container('foobar123', 'marathon')
+    time_string = ''
+    filtered = {}
+    Timecop.freeze(Time.now) do
+      d1 = create_driver(CONFIG, 'docker.foobar123')
+      d1.run do
+        1000.times do
+          d1.filter('log' => 'Hello World 4')
+        end
+      end
+      time_string = Time.now.utc.strftime('%Y-%m-%dT%H:%M:%S%z')
+      filtered = d1.filtered_as_array
+    end
+
+    log_entry = filtered[0][2]
+
+    assert_equal time_string, log_entry['@timestamp']
+  end
+
   def test_container_cache
     setup_marathon_container('foobar123', 'marathon')
 

metadata

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