fluent-plugin-viaq_data_model 0.0.19 → 0.0.20

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b20471334c7756a6393385dfe17987751ea233c8cac638f592459ea5a3a8692f
-  data.tar.gz: 0d1738ff46f83bba941f415616c374ece1268a89c59f7df333c0311106809e67
+  metadata.gz: cf1d5470d55d205da4f4509713986c34ac7e10ca6f8b6fda68bdf2d810a34f06
+  data.tar.gz: 3e09f85cacd9c778b92dced23fa27115b44c4695454f730022e13751e07987f4
 SHA512:
-  metadata.gz: c77bfd1197a5d06b994668034dcd4d662ddb955fd4c3a803fad71a47124f86e28f29f0a063eecfe86d6bf23c9791159ca693405be9e0c4744288345ee3f0d3e0
-  data.tar.gz: 902a1adc2eca199a51b7cb6ce37600c2ec9764eeacbda1e2313410bcde774f1184513d4b87af91b7efd15651c35e2f7b97caf872e6e5f124a9d56232e2e5f433
+  metadata.gz: 40cb5a22fc967944b0c1127caa757396c813a5da47e90184c723c322c1c682bf0f96cdb250daa4ada4cdc7195a66c59119a3194d928cd3d35c969b92d6d6deaf
+  data.tar.gz: 74aae5ecb6cf4128daf3cca879a93a1d6e7d6bf7417e6a1017fd7e67e92c8301b2e9d05add95aec7b5315e9bbe9cf4e81c8259d18e39b69dcba0731dbc9843d2

data/fluent-plugin-viaq_data_model.gemspec

@@ -4,7 +4,7 @@ $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 
 Gem::Specification.new do |gem|
   gem.name          = "fluent-plugin-viaq_data_model"
-  gem.version       = "0.0.19"
+  gem.version       = "0.0.20"
   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.rb

@@ -203,7 +203,12 @@ module Fluent
         @docker_hostname = nil
       end
       @ipaddr4 = ENV['IPADDR4'] || '127.0.0.1'
-      @ipaddr6 = ENV['IPADDR6'] || '::1'
+      @ipaddr6 = nil
+
+      if ENV['IPADDR6'] && ENV['IPADDR6'].length > 0
+        @ipaddr6 = ENV['IPADDR6']
+      end
+      
       @pipeline_version = (ENV['FLUENTD_VERSION'] || 'unknown fluentd version') + ' ' + (ENV['DATA_VERSION'] || 'unknown data version')
       # create the elasticsearch index name tag matchers
       unless @elasticsearch_index_names.empty?
@@ -367,7 +372,9 @@ module Fluent
       # this will catch the case where pipeline_type doesn't exist, or is not a Hash
       record['pipeline_metadata'][pipeline_type] = {} unless record['pipeline_metadata'][pipeline_type].respond_to?(:fetch)
       record['pipeline_metadata'][pipeline_type]['ipaddr4'] = @ipaddr4
-      record['pipeline_metadata'][pipeline_type]['ipaddr6'] = @ipaddr6
+      if @ipaddr6
+        record['pipeline_metadata'][pipeline_type]['ipaddr6'] = @ipaddr6
+      end
       record['pipeline_metadata'][pipeline_type]['inputname'] = 'fluent-plugin-systemd'
       record['pipeline_metadata'][pipeline_type]['name'] = 'fluentd'
       record['pipeline_metadata'][pipeline_type]['received_at'] = Time.now.utc.to_datetime.rfc3339(6)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fluent-plugin-viaq_data_model
 version: !ruby/object:Gem::Version
-  version: 0.0.19
+  version: 0.0.20
 platform: ruby
 authors:
 - Rich Megginson
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-07-18 00:00:00.000000000 Z
+date: 2019-08-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: fluentd