fluent-plugin-viaq_data_model 0.0.14 → 0.0.15

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 0d75857c023e4a50642884ce7a0d89c41e56eb08
-  data.tar.gz: 8fb458a7d91149c16d442a1ccf3f403ffbb3ea6f
+SHA256:
+  metadata.gz: 1e2d89cd01043e9f4626fbc5b96f23b9d3e91ed989a1b8264b5a1a2dc3e8b0e3
+  data.tar.gz: bdee971b965c95c2b4e64a22c224d7a18e046015c187c2f819a63d5c77a345c2
 SHA512:
-  metadata.gz: 26d81b85b7bddecb3a474432e2e7953f403db00629c66dc392e577fc4f3750870d3bbbf2d6d01fc5d14d636256848fef99d147f4902e6fa41e71f4e2acae8459
-  data.tar.gz: 857f83d2afafddb743ce3394e5bc8638a4269728f8e3673e6a7d650c79c622374141940c67e679addc95946e7432c54cc049894c1fdd487c915fcde8cdd17e91
+  metadata.gz: 2a08509729e56cbaa215d86af87e9f6aa869924b591e8b854bb4905e75cdbbf52f6a1b8968b662b99064b791f19b7f982125f71145e73116fb24cd26637699ec
+  data.tar.gz: a2633dc71aecbae9cefa8395fb78ed95f62a93f272f246bb605200afab28271c06afaa5dcff8420c7efb0c182ad2ddd7a4e163027ce1f709e3e44386e815ad43

data/fluent-plugin-viaq_data_model.gemspec

@@ -7,7 +7,7 @@ FLUENTD_VERSION = ENV['FLUENTD_VERSION'] || "0.12.0"
 
 Gem::Specification.new do |gem|
   gem.name          = "fluent-plugin-viaq_data_model"
-  gem.version       = "0.0.14"
+  gem.version       = "0.0.15"
   gem.authors       = ["Rich Megginson"]
   gem.email         = ["rmeggins@redhat.com"]
   gem.description   = %q{Filter plugin to ensure data is in the ViaQ common data model}

data/lib/fluent/plugin/filter_viaq_data_model_systemd.rb

@@ -109,6 +109,20 @@ module ViaqDataModelFilterSystemd
       else
         record['hostname'] = record['_HOSTNAME']
       end
+      # system, non-kubernetes containers
+      docker = {}
+      if record.key?('CONTAINER_ID_FULL')
+        docker['container_id'] = record['CONTAINER_ID_FULL']
+      end
+      if record.key?('CONTAINER_ID')
+        docker['container_id_short'] = record['CONTAINER_ID']
+      end
+      if record.key?('CONTAINER_NAME')
+        docker['container_name'] = record['CONTAINER_NAME']
+      end
+      unless docker.empty?
+        record['docker'] = record['docker'] ? record['docker'].merge(docker) : docker
+      end
     when :k8s_journal
       record['message'] = record['message'] || record['MESSAGE'] || record['log']
       if record.key?('kubernetes') && record['kubernetes'].respond_to?(:fetch) && \

data/test/test_filter_viaq_data_model.rb

@@ -379,6 +379,7 @@ class ViaqDataModelFilterTest < Test::Unit::TestCase
       assert_equal('fluentd', rec['pipeline_metadata']['normalizer']['name'])
       assert_equal('fversion dversion', rec['pipeline_metadata']['normalizer']['version'])
       assert_equal(@timestamp_str, rec['pipeline_metadata']['normalizer']['received_at'])
+      assert_equal(false, rec.key?('docker'))
       dellist = 'log,stream,MESSAGE,_SOURCE_REALTIME_TIMESTAMP,__REALTIME_TIMESTAMP,CONTAINER_ID,CONTAINER_ID_FULL,CONTAINER_NAME,PRIORITY,_BOOT_ID,_CAP_EFFECTIVE,_CMDLINE,_COMM,_EXE,_GID,_HOSTNAME,_MACHINE_ID,_PID,_SELINUX_CONTEXT,_SYSTEMD_CGROUP,_SYSTEMD_SLICE,_SYSTEMD_UNIT,_TRANSPORT,_UID,_AUDIT_LOGINUID,_AUDIT_SESSION,_SYSTEMD_OWNER_UID,_SYSTEMD_SESSION,_SYSTEMD_USER_UNIT,CODE_FILE,CODE_FUNCTION,CODE_LINE,ERRNO,MESSAGE_ID,RESULT,UNIT,_KERNEL_DEVICE,_KERNEL_SUBSYSTEM,_UDEV_SYSNAME,_UDEV_DEVNODE,_UDEV_DEVLINK,SYSLOG_FACILITY,SYSLOG_IDENTIFIER,SYSLOG_PID'.split(',')
       dellist.each{|field| assert_nil(rec[field])}
     end
@@ -503,6 +504,22 @@ class ViaqDataModelFilterTest < Test::Unit::TestCase
       ')
       assert_equal(Time.at(@time).utc.to_datetime.rfc3339(6), rec['@timestamp'])
     end
+    test 'test system containers' do
+      input = normal_input.merge({
+        'CONTAINER_ID' => 'container-id',
+        'CONTAINER_ID_FULL' => 'container-id-full',
+        'CONTAINER_NAME' => 'container-name'
+      })
+      rec = emit_with_tag('journal.system', input, '
+        <formatter>
+          tag "journal.system**"
+          type sys_journal
+        </formatter>
+      ')
+      assert_equal('container-name', rec['docker']['container_name'])
+      assert_equal('container-id', rec['docker']['container_id_short'])
+      assert_equal('container-id-full', rec['docker']['container_id'])
+    end
     test 'process a kubernetes journal record, default settings' do
       ENV['IPADDR4'] = '127.0.0.1'
       ENV['IPADDR6'] = '::1'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fluent-plugin-viaq_data_model
 version: !ruby/object:Gem::Version
-  version: 0.0.14
+  version: 0.0.15
 platform: ruby
 authors:
 - Rich Megginson
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-06-07 00:00:00.000000000 Z
+date: 2018-09-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: fluentd
@@ -147,7 +147,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.14.1
+rubygems_version: 2.7.6
 signing_key: 
 specification_version: 4
 summary: Filter plugin to ensure data is in the ViaQ common data model