Merge pull request openshift#1698 from jcantrill/bug_1726639_new_viaq…

…_plugin

Bug 1726639: Consume new viaq plugin to not set level based on stream

fluentd/Dockerfile

@@ -3,7 +3,7 @@ FROM rhscl/ruby-25-rhel7:latest as builder
 MAINTAINER OpenShift Development <[email protected]>
 
 ENV DATA_VERSION=1.6.0 \
-    FLUENTD_VERSION=1.5.1 \
+    FLUENTD_VERSION=1.6.2 \
     HOME=/opt/app-root/src \
     PATH=/opt/app-root/src/bin:/opt/app-root/bin:$PATH \
     LOGGING_FILE_PATH=/var/log/fluentd/fluentd.log \
@@ -43,7 +43,7 @@ RUN cd ${HOME}/vendored_gem_src/ && ./install-gems.sh && cd / && rm -rf ${HOME}/
 FROM rhel7:7-released
 
 ENV DATA_VERSION=1.6.0 \
-    FLUENTD_VERSION=1.5.1 \
+    FLUENTD_VERSION=1.6.2 \
     HOME=/opt/app-root/src \
     PATH=/opt/app-root/src/bin:/opt/app-root/bin:$PATH \
     LOGGING_FILE_PATH=/var/log/fluentd/fluentd.log \

fluentd/Dockerfile.centos7

@@ -3,7 +3,7 @@ FROM centos/ruby-25-centos7:latest
 MAINTAINER OpenShift Development <[email protected]>
 
 ENV DATA_VERSION=1.6.0 \
-    FLUENTD_VERSION=1.5.1 \
+    FLUENTD_VERSION=1.6.2 \
     GEM_HOME=/opt/app-root/src \
     HOME=/opt/app-root/src \
     PATH=/opt/app-root/src/bin:/opt/app-root/bin:$PATH \

fluentd/rh-manifest.txt

@@ -1,17 +1,17 @@
 dig_rb 1.0.1 https://github.com/jrochkind/dig_rb
 fluent-config-regexp-type 1.0.0 https://github.com/okkez/fluent-config-regexp-type
-fluentd 1.5.1 https://www.fluentd.org/
+fluentd 1.6.2 https://www.fluentd.org/
 fluent-plugin-concat 2.3.0 https://github.com/fluent-plugins-nursery/fluent-plugin-concat
 fluent-plugin-multi-format-parser 1.0.0 https://github.com/repeatedly/fluent-plugin-multi-format-parser
 jemalloc 5.2.0 https://github.com/jemalloc/jemalloc/releases/download/5.2.0/jemalloc-5.2.0.tar.bz2
 rubygem-activesupport 5.2.3 http://rubyonrails.org
 rubygem-addressable 2.6.0 https://github.com/sporkmonger/addressable
 rubygem-concurrent-ruby 1.1.5 http://www.concurrent-ruby.com
 rubygem-cool.io 1.5.4 http://coolio.github.com
-rubygem-domain_name 0.5.20180417 https://github.com/knu/ruby-domain_name
-rubygem-elasticsearch 7.1.0 http://github.com/elasticsearch/elasticsearch-ruby
-rubygem-elasticsearch-api 7.1.0 https://github.com/elasticsearch/elasticsearch-ruby/tree/master/elasticsearch-api
-rubygem-elasticsearch-transport 7.1.0 https://github.com/elasticsearch/elasticsearch-ruby/tree/master/elasticsearch-transport
+rubygem-domain_name 0.5.20190701 https://github.com/knu/ruby-domain_name
+rubygem-elasticsearch 7.2.0 http://github.com/elasticsearch/elasticsearch-ruby
+rubygem-elasticsearch-api 7.2.0 https://github.com/elasticsearch/elasticsearch-ruby/tree/master/elasticsearch-api
+rubygem-elasticsearch-transport 7.2.0 https://github.com/elasticsearch/elasticsearch-ruby/tree/master/elasticsearch-transport
 rubygem-excon 0.64.0 https://github.com/excon/excon
 rubygem-faraday 0.15.4 https://github.com/lostisland/faraday
 rubygem-ffi 1.11.1 http://wiki.github.com/ffi/ffi
@@ -23,7 +23,7 @@ rubygem-fluent-plugin-record-modifier 2.0.1 https://github.com/repeatedly/fluent
 rubygem-fluent-plugin-remote-syslog 1.1 https://github.com/docebo/fluent-plugin-remote-syslog
 rubygem-fluent-plugin-rewrite-tag-filter 2.2.0 https://github.com/fluent/fluent-plugin-rewrite-tag-filter
 rubygem-fluent-plugin-systemd 1.0.2 https://github.com/reevoo/fluent-plugin-systemd
-rubygem-fluent-plugin-viaq_data_model 0.0.18 https://github.com/ViaQ/fluent-plugin-viaq_data_model
+rubygem-fluent-plugin-viaq_data_model 0.0.19 https://github.com/ViaQ/fluent-plugin-viaq_data_model
 rubygem-http 0.9.8 https://github.com/httprb/http.rb
 rubygem-http-cookie 1.0.3 https://github.com/sparklemotion/http-cookie
 rubygem-http-form_data 1.0.3 https://github.com/httprb/form_data.rb
@@ -34,12 +34,12 @@ rubygem-lru_redux 1.1.0 https://github.com/SamSaffron/lru_redux
 rubygem-mime-types 3.2.2 https://github.com/mime-types/ruby-mime-types/
 rubygem-mime-types-data 3.2019.0331 https://github.com/mime-types/mime-types-data/
 rubygem-minitest 5.11.3 https://github.com/seattlerb/minitest
-rubygem-msgpack 1.2.10 http://msgpack.org/
+rubygem-msgpack 1.3.0 http://msgpack.org/
 rubygem-multi_json 1.13.1 http://github.com/intridea/multi_json
 rubygem-multipart-post 2.1.1 https://github.com/nicksieger/multipart-post
 rubygem-netrc 0.11.0 https://github.com/geemus/netrc
 rubygem-prometheus-client 0.9.0 https://github.com/prometheus/client_ruby
-rubygem-public_suffix 3.1.0 https://simonecarletti.com/code/publicsuffix-ruby
+rubygem-public_suffix 3.1.1 https://simonecarletti.com/code/publicsuffix-ruby
 rubygem-quantile 0.2.1 http://github.com/matttproud/ruby_quantile_estimation
 rubygem-recursive-open-struct 1.0.0 http://github.com/aetherknight/recursive-open-struct
 rubygem-rest-client 2.0.2 https://github.com/rest-client/rest-client
@@ -48,7 +48,7 @@ rubygem-syslog_protocol 0.9.2 https://github.com/eric/syslog_protocol
 rubygem-systemd-journal 1.3.3 https://github.com/ledbettj/systemd-journal
 rubygem-thread_safe 0.3.6 https://github.com/ruby-concurrency/thread_safe
 rubygem-tzinfo 1.2.5 http://tzinfo.github.io
-rubygem-tzinfo-data 1.2019.1 http://tzinfo.github.io
+rubygem-tzinfo-data 1.2019.2 http://tzinfo.github.io
 rubygem-unf 0.1.4 https://github.com/knu/ruby-unf
 rubygem-unf_ext 0.0.7.6 https://github.com/knu/ruby-unf_ext
 rubygem-uuidtools 2.1.5 https://github.com/sporkmonger/uuidtools

fluentd/vendored_gem_src/activesupport/activesupport.gemspec

@@ -17,28 +17,28 @@ Gem::Specification.new do |s|
   s.licenses = ["MIT".freeze]
   s.rdoc_options = ["--encoding".freeze, "UTF-8".freeze]
   s.required_ruby_version = Gem::Requirement.new(">= 2.2.2".freeze)
-  s.rubygems_version = "3.0.3".freeze
+  s.rubygems_version = "2.6.12".freeze
   s.summary = "A toolkit of support libraries and Ruby core extensions extracted from the Rails framework.".freeze
 
   if s.respond_to? :specification_version then
     s.specification_version = 4
 
     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
-      s.add_runtime_dependency(%q<i18n>.freeze, [">= 0.7", "< 2"])
+      s.add_runtime_dependency(%q<i18n>.freeze, ["< 2", ">= 0.7"])
       s.add_runtime_dependency(%q<tzinfo>.freeze, ["~> 1.1"])
       s.add_runtime_dependency(%q<minitest>.freeze, ["~> 5.1"])
-      s.add_runtime_dependency(%q<concurrent-ruby>.freeze, ["~> 1.0", ">= 1.0.2"])
+      s.add_runtime_dependency(%q<concurrent-ruby>.freeze, [">= 1.0.2", "~> 1.0"])
     else
-      s.add_dependency(%q<i18n>.freeze, [">= 0.7", "< 2"])
+      s.add_dependency(%q<i18n>.freeze, ["< 2", ">= 0.7"])
       s.add_dependency(%q<tzinfo>.freeze, ["~> 1.1"])
       s.add_dependency(%q<minitest>.freeze, ["~> 5.1"])
-      s.add_dependency(%q<concurrent-ruby>.freeze, ["~> 1.0", ">= 1.0.2"])
+      s.add_dependency(%q<concurrent-ruby>.freeze, [">= 1.0.2", "~> 1.0"])
     end
   else
-    s.add_dependency(%q<i18n>.freeze, [">= 0.7", "< 2"])
+    s.add_dependency(%q<i18n>.freeze, ["< 2", ">= 0.7"])
     s.add_dependency(%q<tzinfo>.freeze, ["~> 1.1"])
     s.add_dependency(%q<minitest>.freeze, ["~> 5.1"])
-    s.add_dependency(%q<concurrent-ruby>.freeze, ["~> 1.0", ">= 1.0.2"])
+    s.add_dependency(%q<concurrent-ruby>.freeze, [">= 1.0.2", "~> 1.0"])
   end
 end
 

fluentd/vendored_gem_src/addressable/addressable.gemspec

@@ -17,22 +17,22 @@ Gem::Specification.new do |s|
   s.licenses = ["Apache-2.0".freeze]
   s.rdoc_options = ["--main".freeze, "README.md".freeze]
   s.required_ruby_version = Gem::Requirement.new(">= 2.0".freeze)
-  s.rubygems_version = "3.0.3".freeze
+  s.rubygems_version = "2.6.12".freeze
   s.summary = "URI Implementation".freeze
 
   if s.respond_to? :specification_version then
     s.specification_version = 4
 
     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
-      s.add_runtime_dependency(%q<public_suffix>.freeze, [">= 2.0.2", "< 4.0"])
-      s.add_development_dependency(%q<bundler>.freeze, [">= 1.0", "< 3.0"])
+      s.add_runtime_dependency(%q<public_suffix>.freeze, ["< 4.0", ">= 2.0.2"])
+      s.add_development_dependency(%q<bundler>.freeze, ["< 3.0", ">= 1.0"])
     else
-      s.add_dependency(%q<public_suffix>.freeze, [">= 2.0.2", "< 4.0"])
-      s.add_dependency(%q<bundler>.freeze, [">= 1.0", "< 3.0"])
+      s.add_dependency(%q<public_suffix>.freeze, ["< 4.0", ">= 2.0.2"])
+      s.add_dependency(%q<bundler>.freeze, ["< 3.0", ">= 1.0"])
     end
   else
-    s.add_dependency(%q<public_suffix>.freeze, [">= 2.0.2", "< 4.0"])
-    s.add_dependency(%q<bundler>.freeze, [">= 1.0", "< 3.0"])
+    s.add_dependency(%q<public_suffix>.freeze, ["< 4.0", ">= 2.0.2"])
+    s.add_dependency(%q<bundler>.freeze, ["< 3.0", ">= 1.0"])
   end
 end
 

fluentd/vendored_gem_src/concurrent-ruby/concurrent-ruby.gemspec

@@ -17,7 +17,7 @@ Gem::Specification.new do |s|
   s.homepage = "http://www.concurrent-ruby.com".freeze
   s.licenses = ["MIT".freeze]
   s.required_ruby_version = Gem::Requirement.new(">= 1.9.3".freeze)
-  s.rubygems_version = "3.0.3".freeze
+  s.rubygems_version = "2.6.12".freeze
   s.summary = "Modern concurrency tools for Ruby. Inspired by Erlang, Clojure, Scala, Haskell, F#, C#, Java, and classic concurrency patterns.".freeze
 end
 

fluentd/vendored_gem_src/domain_name/CHANGELOG.md

@@ -1,5 +1,15 @@
 # Change Log
 
+## [v0.5.20190701](https://github.com/knu/ruby-domain_name/tree/v0.5.20190701) (2019-07-05)
+[Full Changelog](https://github.com/knu/ruby-domain_name/compare/v0.5.20180417...v0.5.20190701)
+
+- Update the eTLD database to 2019-07-01 18:45:50 UTC
+
+## [v0.5.20180417](https://github.com/knu/ruby-domain_name/tree/v0.5.20180417) (2018-04-17)
+[Full Changelog](https://github.com/knu/ruby-domain_name/compare/v0.5.20170404...v0.5.20180417)
+
+- Update the eTLD database to 2018-04-17T23:50:25Z
+
 ## [v0.5.20170404](https://github.com/knu/ruby-domain_name/tree/v0.5.20170404) (2017-04-04)
 [Full Changelog](https://github.com/knu/ruby-domain_name/compare/v0.5.20170223...v0.5.20170404)
 

fluentd/vendored_gem_src/domain_name/Rakefile

@@ -52,13 +52,36 @@ end
 
 namespace :etld_data do
   task :commit do
-    load ETLD_DATA_RB
+    if system(*%W[git diff --exit-code --quiet], ETLD_DATA_FILE)
+      warn "Nothing to commit."
+      exit
+    end
+
+    prev = `ruby -e "$(git cat-file -p @:lib/domain_name/version.rb); puts DomainName::VERSION"`.chomp
+    curr = `ruby -e "load 'lib/domain_name/version.rb'; puts DomainName::VERSION"`.chomp
+    timestamp = File.mtime(ETLD_DATA_FILE).utc
+
+    File.open('CHANGELOG.md', 'r+') do |f|
+      lines = f.readlines
+      lines.insert(2, <<~EOF)
+## [v#{curr}](https://github.com/knu/ruby-domain_name/tree/v#{curr}) (#{Time.now.strftime('%F')})
+[Full Changelog](https://github.com/knu/ruby-domain_name/compare/v#{prev}...v#{curr})
+
+- Update the eTLD database to #{timestamp}
+
+      EOF
+      f.rewind
+      f.puts lines
+    end
 
     sh 'git', 'commit',
+      'CHANGELOG.md',
       ETLD_DATA_FILE,
       ETLD_DATA_RB,
       VERSION_RB,
-      '-m', 'Update the eTLD database to %s.' % DomainName::ETLD_DATA_DATE
+      '-m', 'Update the eTLD database to %s.' % timestamp
+
+    sh 'git', 'tag', "v#{curr}"
   end
 end