fluent-plugin-viaq_data_model 0.0.14 → 0.0.15
Sign up to get free protection for your applications and to get access to all the features.
checksums.yaml
CHANGED
@@ -1,7 +1,7 @@
|
|
1
1
|
---
|
2
|
-
|
3
|
-
metadata.gz:
|
4
|
-
data.tar.gz:
|
2
|
+
SHA256:
|
3
|
+
metadata.gz: 1e2d89cd01043e9f4626fbc5b96f23b9d3e91ed989a1b8264b5a1a2dc3e8b0e3
|
4
|
+
data.tar.gz: bdee971b965c95c2b4e64a22c224d7a18e046015c187c2f819a63d5c77a345c2
|
5
5
|
SHA512:
|
6
|
-
metadata.gz:
|
7
|
-
data.tar.gz:
|
6
|
+
metadata.gz: 2a08509729e56cbaa215d86af87e9f6aa869924b591e8b854bb4905e75cdbbf52f6a1b8968b662b99064b791f19b7f982125f71145e73116fb24cd26637699ec
|
7
|
+
data.tar.gz: a2633dc71aecbae9cefa8395fb78ed95f62a93f272f246bb605200afab28271c06afaa5dcff8420c7efb0c182ad2ddd7a4e163027ce1f709e3e44386e815ad43
|
@@ -7,7 +7,7 @@ FLUENTD_VERSION = ENV['FLUENTD_VERSION'] || "0.12.0"
|
|
7
7
|
|
8
8
|
Gem::Specification.new do |gem|
|
9
9
|
gem.name = "fluent-plugin-viaq_data_model"
|
10
|
-
gem.version = "0.0.
|
10
|
+
gem.version = "0.0.15"
|
11
11
|
gem.authors = ["Rich Megginson"]
|
12
12
|
gem.email = ["rmeggins@redhat.com"]
|
13
13
|
gem.description = %q{Filter plugin to ensure data is in the ViaQ common data model}
|
@@ -109,6 +109,20 @@ module ViaqDataModelFilterSystemd
|
|
109
109
|
else
|
110
110
|
record['hostname'] = record['_HOSTNAME']
|
111
111
|
end
|
112
|
+
# system, non-kubernetes containers
|
113
|
+
docker = {}
|
114
|
+
if record.key?('CONTAINER_ID_FULL')
|
115
|
+
docker['container_id'] = record['CONTAINER_ID_FULL']
|
116
|
+
end
|
117
|
+
if record.key?('CONTAINER_ID')
|
118
|
+
docker['container_id_short'] = record['CONTAINER_ID']
|
119
|
+
end
|
120
|
+
if record.key?('CONTAINER_NAME')
|
121
|
+
docker['container_name'] = record['CONTAINER_NAME']
|
122
|
+
end
|
123
|
+
unless docker.empty?
|
124
|
+
record['docker'] = record['docker'] ? record['docker'].merge(docker) : docker
|
125
|
+
end
|
112
126
|
when :k8s_journal
|
113
127
|
record['message'] = record['message'] || record['MESSAGE'] || record['log']
|
114
128
|
if record.key?('kubernetes') && record['kubernetes'].respond_to?(:fetch) && \
|
@@ -379,6 +379,7 @@ class ViaqDataModelFilterTest < Test::Unit::TestCase
|
|
379
379
|
assert_equal('fluentd', rec['pipeline_metadata']['normalizer']['name'])
|
380
380
|
assert_equal('fversion dversion', rec['pipeline_metadata']['normalizer']['version'])
|
381
381
|
assert_equal(@timestamp_str, rec['pipeline_metadata']['normalizer']['received_at'])
|
382
|
+
assert_equal(false, rec.key?('docker'))
|
382
383
|
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(',')
|
383
384
|
dellist.each{|field| assert_nil(rec[field])}
|
384
385
|
end
|
@@ -503,6 +504,22 @@ class ViaqDataModelFilterTest < Test::Unit::TestCase
|
|
503
504
|
')
|
504
505
|
assert_equal(Time.at(@time).utc.to_datetime.rfc3339(6), rec['@timestamp'])
|
505
506
|
end
|
507
|
+
test 'test system containers' do
|
508
|
+
input = normal_input.merge({
|
509
|
+
'CONTAINER_ID' => 'container-id',
|
510
|
+
'CONTAINER_ID_FULL' => 'container-id-full',
|
511
|
+
'CONTAINER_NAME' => 'container-name'
|
512
|
+
})
|
513
|
+
rec = emit_with_tag('journal.system', input, '
|
514
|
+
<formatter>
|
515
|
+
tag "journal.system**"
|
516
|
+
type sys_journal
|
517
|
+
</formatter>
|
518
|
+
')
|
519
|
+
assert_equal('container-name', rec['docker']['container_name'])
|
520
|
+
assert_equal('container-id', rec['docker']['container_id_short'])
|
521
|
+
assert_equal('container-id-full', rec['docker']['container_id'])
|
522
|
+
end
|
506
523
|
test 'process a kubernetes journal record, default settings' do
|
507
524
|
ENV['IPADDR4'] = '127.0.0.1'
|
508
525
|
ENV['IPADDR6'] = '::1'
|
metadata
CHANGED
@@ -1,14 +1,14 @@
|
|
1
1
|
--- !ruby/object:Gem::Specification
|
2
2
|
name: fluent-plugin-viaq_data_model
|
3
3
|
version: !ruby/object:Gem::Version
|
4
|
-
version: 0.0.
|
4
|
+
version: 0.0.15
|
5
5
|
platform: ruby
|
6
6
|
authors:
|
7
7
|
- Rich Megginson
|
8
8
|
autorequire:
|
9
9
|
bindir: bin
|
10
10
|
cert_chain: []
|
11
|
-
date: 2018-
|
11
|
+
date: 2018-09-20 00:00:00.000000000 Z
|
12
12
|
dependencies:
|
13
13
|
- !ruby/object:Gem::Dependency
|
14
14
|
name: fluentd
|
@@ -147,7 +147,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
|
|
147
147
|
version: '0'
|
148
148
|
requirements: []
|
149
149
|
rubyforge_project:
|
150
|
-
rubygems_version: 2.6
|
150
|
+
rubygems_version: 2.7.6
|
151
151
|
signing_key:
|
152
152
|
specification_version: 4
|
153
153
|
summary: Filter plugin to ensure data is in the ViaQ common data model
|