Skip to content

Commit 305123b

Browse files
openshift-merge-robotopenshift-merge-robot
authored
Merge pull request #2146 from jcantrill/log1499
LOG-1499: Vendor fluent-plugin-elasticsearch v5.0.5 to drop messages
2 parents 5d2ad36 + 03c67dc commit 305123b

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

52 files changed

+3738
-1660
lines changed

‎fluentd/Gemfile.lock

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ GEM
3434
multi_json
3535
ethon (0.12.0)
3636
ffi (>= 1.3.0)
37-
excon (0.75.0)
37+
excon (0.83.0)
3838
faraday (1.0.1)
3939
multipart-post (>= 1.2, < 3)
4040
ffi (1.11.3)
@@ -51,7 +51,7 @@ GEM
5151
fluentd (>= 0.14.15)
5252
fluent-plugin-concat (2.4.0)
5353
fluentd (>= 0.14.0, < 2)
54-
fluent-plugin-elasticsearch (4.1.1)
54+
fluent-plugin-elasticsearch (5.0.5)
5555
elasticsearch
5656
excon
5757
fluentd (>= 0.14.22)

‎fluentd/rh-manifest.txt

Lines changed: 51 additions & 51 deletions
Original file line numberDiff line numberDiff line change
@@ -1,78 +1,78 @@
1-
addressable 2.7.0 https://github.com/sporkmonger/addressable
21
aws-eventstream 1.1.0 https://github.com/aws/aws-sdk-ruby
32
aws-partitions 1.396.0 https://github.com/aws/aws-sdk-ruby
43
aws-sdk-cloudwatchlogs 1.38.0 https://github.com/aws/aws-sdk-ruby
54
aws-sdk-core 3.109.3 https://github.com/aws/aws-sdk-ruby
65
aws-sigv4 1.2.2 https://github.com/aws/aws-sdk-ruby
7-
bigdecimal 3.0.0 https://github.com/ruby/bigdecimal
8-
concurrent-ruby 1.1.6 http://www.concurrent-ruby.com
9-
connection_pool 2.2.3 https://github.com/mperham/connection_pool
10-
cool.io 1.6.0 http://coolio.github.com
116
digest-crc 0.6.1 https://github.com/postmodern/digest-crc#readme
127
dig_rb 1.0.1 https://github.com/jrochkind/dig_rb
13-
domain_name 0.5.20190701 https://github.com/knu/ruby-domain_name
14-
elasticsearch 7.8.0 https://www.elastic.co/guide/en/elasticsearch/client/ruby-api/7.x/index.html
15-
elasticsearch-api 7.8.0 https://www.elastic.co/guide/en/elasticsearch/client/ruby-api/7.x/index.html
16-
elasticsearch-transport 7.8.0 https://www.elastic.co/guide/en/elasticsearch/client/ruby-api/7.x/index.html
17-
ethon 0.12.0 https://github.com/typhoeus/ethon
18-
excon 0.75.0 https://github.com/excon/excon
19-
faraday 1.0.1 https://lostisland.github.io/faraday
20-
ffi 1.11.3 https://github.com/ffi/ffi/wiki
218
ffi-compiler 1.0.1 http://wiki.github.com/ffi/ffi
229
fluent-config-regexp-type 1.0.0 https://github.com/okkez/fluent-config-regexp-type
2310
fluentd 1.7.4 https://www.fluentd.org/
24-
fluent-mixin-config-placeholders 0.4.0 https://github.com/tagomoris/fluent-mixin-config-placeholders
2511
fluent-plugin-cloudwatch-logs 0.7.6 https://github.com/fluent-plugins-nursery/fluent-plugin-cloudwatch-logs
2612
fluent-plugin-concat 2.4.0 https://github.com/fluent-plugins-nursery/fluent-plugin-concat
27-
fluent-plugin-elasticsearch 4.1.1 https://github.com/uken/fluent-plugin-elasticsearch
2813
fluent-plugin-grafana-loki 1.2.7 https://github.com/grafana/loki/
2914
fluent-plugin-kafka 0.13.1 https://github.com/fluent/fluent-plugin-kafka
30-
fluent-plugin-kubernetes_metadata_filter 2.5.2 https://github.com/fabric8io/fluent-plugin-kubernetes_metadata_filter
3115
fluent-plugin-label-router 0.2.4 https://github.com/banzaicloud/fluent-plugin-label-router
3216
fluent-plugin-multi-format-parser 1.0.0 https://github.com/repeatedly/fluent-plugin-multi-format-parser
33-
fluent-plugin-prometheus 1.7.3 https://github.com/fluent/fluent-plugin-prometheus
34-
fluent-plugin-record-modifier 2.1.0 https://github.com/repeatedly/fluent-plugin-record-modifier
35-
fluent-plugin-remote-syslog 1.1 https://github.com/docebo/fluent-plugin-remote-syslog
36-
fluent-plugin-rewrite-tag-filter 2.3.0 https://github.com/fluent/fluent-plugin-rewrite-tag-filter
3717
fluent-plugin-splunk-hec 1.1.2 https://github.com/splunk/fluent-plugin-splunk-hec
38-
fluent-plugin-systemd 1.0.2 https://github.com/reevoo/fluent-plugin-systemd
39-
http 4.4.1 https://github.com/httprb/http
4018
http-accept 1.7.0 https://github.com/ioquatix/http-accept
41-
http-cookie 1.0.3 https://github.com/sparklemotion/http-cookie
42-
http-form_data 2.3.0 https://github.com/httprb/form_data.rb
4319
http-parser 1.2.1 https://github.com/cotag/http-parser
44-
http_parser.rb 0.6.0 http://github.com/tmm1/http_parser.rb
4520
jemalloc 5.2.1 https://github.com/jemalloc/jemalloc/releases/download/5.2.1/jemalloc-5.2.1.tar.bz2
4621
jmespath 1.4.0 http://github.com/trevorrowe/jmespath.rb
4722
jsonpath 1.0.5 https://github.com/joshbuddy/jsonpath
48-
kubeclient 4.8.0 https://github.com/abonas/kubeclient
49-
lru_redux 1.1.0 https://github.com/SamSaffron/lru_redux
5023
ltsv 0.1.2 https://github.com/condor/ltsv
51-
mime-types 3.3.1 https://github.com/mime-types/ruby-mime-types/
52-
mime-types-data 3.2020.0512 https://github.com/mime-types/mime-types-data/
53-
msgpack 1.3.3 http://msgpack.org/
54-
multi_json 1.15.0 https://github.com/intridea/multi_json
55-
multipart-post 2.1.1 https://github.com/nicksieger/multipart-post
56-
net-http-persistent 3.1.0 http://docs.seattlerb.org/net-http-persistent
57-
netrc 0.11.0 https://github.com/geemus/netrc
58-
oj 3.11.3 http://www.ohler.com/oj
59-
prometheus-client 0.9.0 https://github.com/prometheus/client_ruby
60-
public_suffix 4.0.5 https://simonecarletti.com/code/publicsuffix-ruby
61-
quantile 0.2.1 http://github.com/matttproud/ruby_quantile_estimation
62-
rake 13.0.1 https://github.com/ruby/rake
63-
recursive-open-struct 1.1.2 https://github.com/aetherknight/recursive-open-struct
64-
rest-client 2.1.0 https://github.com/rest-client/rest-client
24+
rubygem-addressable 2.7.0 https://github.com/sporkmonger/addressable
25+
rubygem-bigdecimal 3.0.0 https://github.com/ruby/bigdecimal
26+
rubygem-concurrent-ruby 1.1.6 http://www.concurrent-ruby.com
27+
rubygem-connection_pool 2.2.3 https://github.com/mperham/connection_pool
28+
rubygem-cool.io 1.6.0 http://coolio.github.com
29+
rubygem-domain_name 0.5.20190701 https://github.com/knu/ruby-domain_name
30+
rubygem-elasticsearch 7.8.0 https://www.elastic.co/guide/en/elasticsearch/client/ruby-api/7.x/index.html
31+
rubygem-elasticsearch-api 7.8.0 https://www.elastic.co/guide/en/elasticsearch/client/ruby-api/7.x/index.html
32+
rubygem-elasticsearch-transport 7.8.0 https://www.elastic.co/guide/en/elasticsearch/client/ruby-api/7.x/index.html
33+
rubygem-ethon 0.12.0 https://github.com/typhoeus/ethon
34+
rubygem-excon 0.83.0 https://github.com/excon/excon
35+
rubygem-faraday 1.0.1 https://lostisland.github.io/faraday
36+
rubygem-ffi 1.11.3 https://github.com/ffi/ffi/wiki
37+
rubygem-fluent-mixin-config-placeholders 0.4.0 https://github.com/tagomoris/fluent-mixin-config-placeholders
38+
rubygem-fluent-plugin-elasticsearch 5.0.5 https://github.com/uken/fluent-plugin-elasticsearch
39+
rubygem-fluent-plugin-kubernetes_metadata_filter 2.5.2 https://github.com/fabric8io/fluent-plugin-kubernetes_metadata_filter
40+
rubygem-fluent-plugin-prometheus 1.7.3 https://github.com/fluent/fluent-plugin-prometheus
41+
rubygem-fluent-plugin-record-modifier 2.1.0 https://github.com/repeatedly/fluent-plugin-record-modifier
42+
rubygem-fluent-plugin-remote-syslog 1.1 https://github.com/docebo/fluent-plugin-remote-syslog
43+
rubygem-fluent-plugin-rewrite-tag-filter 2.3.0 https://github.com/fluent/fluent-plugin-rewrite-tag-filter
44+
rubygem-fluent-plugin-systemd 1.0.2 https://github.com/reevoo/fluent-plugin-systemd
45+
rubygem-http 4.4.1 https://github.com/httprb/http
46+
rubygem-http-cookie 1.0.3 https://github.com/sparklemotion/http-cookie
47+
rubygem-http-form_data 2.3.0 https://github.com/httprb/form_data.rb
48+
rubygem-http_parser.rb 0.6.0 http://github.com/tmm1/http_parser.rb
49+
rubygem-kubeclient 4.8.0 https://github.com/abonas/kubeclient
50+
rubygem-lru_redux 1.1.0 https://github.com/SamSaffron/lru_redux
51+
rubygem-mime-types 3.3.1 https://github.com/mime-types/ruby-mime-types/
52+
rubygem-mime-types-data 3.2020.0512 https://github.com/mime-types/mime-types-data/
53+
rubygem-msgpack 1.3.3 http://msgpack.org/
54+
rubygem-multi_json 1.15.0 https://github.com/intridea/multi_json
55+
rubygem-multipart-post 2.1.1 https://github.com/nicksieger/multipart-post
56+
rubygem-net-http-persistent 3.1.0 http://docs.seattlerb.org/net-http-persistent
57+
rubygem-netrc 0.11.0 https://github.com/geemus/netrc
58+
rubygem-oj 3.11.3 http://www.ohler.com/oj
59+
rubygem-prometheus-client 0.9.0 https://github.com/prometheus/client_ruby
60+
rubygem-public_suffix 4.0.5 https://simonecarletti.com/code/publicsuffix-ruby
61+
rubygem-quantile 0.2.1 http://github.com/matttproud/ruby_quantile_estimation
62+
rubygem-rake 13.0.1 https://github.com/ruby/rake
63+
rubygem-recursive-open-struct 1.1.2 https://github.com/aetherknight/recursive-open-struct
64+
rubygem-rest-client 2.1.0 https://github.com/rest-client/rest-client
65+
rubygem-sigdump 0.2.4 https://github.com/frsyuki/sigdump
66+
rubygem-syslog_protocol 0.9.2 https://github.com/eric/syslog_protocol
67+
rubygem-systemd-journal 1.3.3 https://github.com/ledbettj/systemd-journal
68+
rubygem-typhoeus 1.4.0 https://github.com/typhoeus/typhoeus
69+
rubygem-tzinfo 2.0.2 https://tzinfo.github.io
70+
rubygem-tzinfo-data 1.2020.1 https://tzinfo.github.io
71+
rubygem-unf 0.1.4 https://github.com/knu/ruby-unf
72+
rubygem-unf_ext 0.0.7.7 https://github.com/knu/ruby-unf_ext
73+
rubygem-uuidtools 2.1.5 https://github.com/sporkmonger/uuidtools
74+
rubygem-yajl-ruby 1.4.1 http://github.com/brianmario/yajl-ruby
6575
ruby-kafka 1.1.0 https://github.com/zendesk/ruby-kafka
6676
serverengine 2.2.1 https://github.com/fluent/serverengine
67-
sigdump 0.2.4 https://github.com/frsyuki/sigdump
6877
strptime 0.2.4 https://github.com/nurse/strptime
69-
syslog_protocol 0.9.2 https://github.com/eric/syslog_protocol
70-
systemd-journal 1.3.3 https://github.com/ledbettj/systemd-journal
7178
to_regexp 0.2.1 https://github.com/seamusabshere/to_regexp
72-
typhoeus 1.4.0 https://github.com/typhoeus/typhoeus
73-
tzinfo 2.0.2 https://tzinfo.github.io
74-
tzinfo-data 1.2020.1 https://tzinfo.github.io
75-
unf 0.1.4 https://github.com/knu/ruby-unf
76-
unf_ext 0.0.7.7 https://github.com/knu/ruby-unf_ext
77-
uuidtools 2.1.5 https://github.com/sporkmonger/uuidtools
78-
yajl-ruby 1.4.1 http://github.com/brianmario/yajl-ruby

‎fluentd/vendored_gem_src/excon/README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ Usable, fast, simple Ruby HTTP 1.1
44

55
Excon was designed to be simple, fast and performant. It works great as a general HTTP(s) client and is particularly well suited to usage in API clients.
66

7-
[![Build Status](https://travis-ci.org/excon/excon.svg?branch=master)](https://travis-ci.org/excon/excon)
7+
[![Build Status](https://github.com/excon/excon/actions/workflows/ruby.yml/badge.svg)](https://github.com/excon/excon/actions/workflows/ruby.yml)
88
[![Gem Version](https://badge.fury.io/rb/excon.svg)](https://badge.fury.io/rb/excon)
99

1010
* [Getting Started](#getting-started)

0 commit comments

Comments
 (0)