Skip to content

Commit 9e03cef

Browse files
kenhyskenhys
authored
Add v1.16.8-1.1 image for elasticsearch (#1576)
* Bump elasticsearhc8 version to -1.1 * elasticsearch{7,8}: use v5.4.4 to fix memory usage See uken/fluent-plugin-elasticsearch#1065 uken/fluent-plugin-elasticsearch#1066 Signed-off-by: Kentaro Hayashi <[email protected]> * Add v1.16.8-1.1 image for elasticsearch{7,8} Signed-off-by: Kentaro Hayashi <[email protected]>
1 parent d32509a commit 9e03cef

File tree

11 files changed

+52
-76
lines changed

11 files changed

+52
-76
lines changed

‎Makefile‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,8 @@ IMAGE_NAME := fluent/fluentd-kubernetes
1414
# NOTE: elasticsearch6 and stackdriver recipe files were kept, but not supported anymore.
1515
X86_IMAGES := \
1616
v1.16/debian-azureblob:v1.16.8-debian-azureblob-amd64-1.0,v1.16-debian-azureblob-amd64-2 \
17-
v1.16/debian-elasticsearch8:v1.16.8-debian-elasticsearch8-amd64-1.0,v1.16-debian-elasticsearch8-amd64-2 \
18-
v1.16/debian-elasticsearch7:v1.16.8-debian-elasticsearch7-amd64-1.0,v1.16-debian-elasticsearch7-amd64-2,v1-debian-elasticsearch-amd64 \
17+
v1.16/debian-elasticsearch8:v1.16.8-debian-elasticsearch8-amd64-1.1,v1.16-debian-elasticsearch8-amd64-2 \
18+
v1.16/debian-elasticsearch7:v1.16.8-debian-elasticsearch7-amd64-1.1,v1.16-debian-elasticsearch7-amd64-2,v1-debian-elasticsearch-amd64 \
1919
v1.16/debian-opensearch:v1.16.8-debian-opensearch-amd64-1.0,v1.16-debian-opensearch-amd64-2 \
2020
v1.16/debian-loggly:v1.16.8-debian-loggly-amd64-1.0,v1.16-debian-loggly-amd64-2 \
2121
v1.16/debian-logentries:v1.16.8-debian-logentries-amd64-1.0,v1.16-debian-logentries-amd64-2 \
@@ -35,8 +35,8 @@ X86_IMAGES := \
3535

3636
ARM64_IMAGES := \
3737
v1.16/arm64/debian-azureblob:v1.16.8-debian-azureblob-arm64-1.0,v1.16-debian-azureblob-arm64-2 \
38-
v1.16/arm64/debian-elasticsearch8:v1.16.8-debian-elasticsearch8-arm64-1.0,v1.16-debian-elasticsearch8-arm64-2 \
39-
v1.16/arm64/debian-elasticsearch7:v1.16.8-debian-elasticsearch7-arm64-1.0,v1.16-debian-elasticsearch7-arm64-2,v1-debian-elasticsearch-arm64 \
38+
v1.16/arm64/debian-elasticsearch8:v1.16.8-debian-elasticsearch8-arm64-1.1,v1.16-debian-elasticsearch8-arm64-2 \
39+
v1.16/arm64/debian-elasticsearch7:v1.16.8-debian-elasticsearch7-arm64-1.1,v1.16-debian-elasticsearch7-arm64-2,v1-debian-elasticsearch-arm64 \
4040
v1.16/arm64/debian-opensearch:v1.16.8-debian-opensearch-arm64-1.0,v1.16-debian-opensearch-arm64-2 \
4141
v1.16/arm64/debian-loggly:v1.16.8-debian-loggly-arm64-1.0,v1.16-debian-loggly-arm64-2 \
4242
v1.16/arm64/debian-logentries:v1.16.8-debian-logentries-arm64-1.0,v1.16-debian-logentries-arm64-2 \

‎README.md‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -28,10 +28,10 @@ If you want to use above non published images, build it by yourself. Dockerfile
2828
- `docker pull fluent/fluentd-kubernetes-daemonset:v1.16.8-debian-azureblob-1.0`
2929
- `docker pull fluent/fluentd-kubernetes-daemonset:v1.16-debian-azureblob-2`
3030
- `Elasticsearch8`
31-
- `docker pull fluent/fluentd-kubernetes-daemonset:v1.16.8-debian-elasticsearch8-1.0`
31+
- `docker pull fluent/fluentd-kubernetes-daemonset:v1.16.8-debian-elasticsearch8-1.1`
3232
- `docker pull fluent/fluentd-kubernetes-daemonset:v1.16-debian-elasticsearch8-2`
3333
- `Elasticsearch7`
34-
- `docker pull fluent/fluentd-kubernetes-daemonset:v1.16.8-debian-elasticsearch7-1.0`
34+
- `docker pull fluent/fluentd-kubernetes-daemonset:v1.16.8-debian-elasticsearch7-1.1`
3535
- `docker pull fluent/fluentd-kubernetes-daemonset:v1.16-debian-elasticsearch7-2`
3636
- `docker pull fluent/fluentd-kubernetes-daemonset:v1-debian-elasticsearch`
3737
- `Opensearch`
@@ -64,10 +64,10 @@ If you want to use above non published images, build it by yourself. Dockerfile
6464
- `docker pull fluent/fluentd-kubernetes-daemonset:v1.16.8-debian-azureblob-amd64-1.0`
6565
- `docker pull fluent/fluentd-kubernetes-daemonset:v1.16-debian-azureblob-amd64-2`
6666
- `Elasticsearch8` [Dockerfile](docker-image/v1.16/debian-elasticsearch8/Dockerfile)
67-
- `docker pull fluent/fluentd-kubernetes-daemonset:v1.16.8-debian-elasticsearch8-amd64-1.0`
67+
- `docker pull fluent/fluentd-kubernetes-daemonset:v1.16.8-debian-elasticsearch8-amd64-1.1`
6868
- `docker pull fluent/fluentd-kubernetes-daemonset:v1.16-debian-elasticsearch8-amd64-2`
6969
- `Elasticsearch7` [Dockerfile](docker-image/v1.16/debian-elasticsearch7/Dockerfile)
70-
- `docker pull fluent/fluentd-kubernetes-daemonset:v1.16.8-debian-elasticsearch7-amd64-1.0`
70+
- `docker pull fluent/fluentd-kubernetes-daemonset:v1.16.8-debian-elasticsearch7-amd64-1.1`
7171
- `docker pull fluent/fluentd-kubernetes-daemonset:v1.16-debian-elasticsearch7-amd64-2`
7272
- `docker pull fluent/fluentd-kubernetes-daemonset:v1-debian-elasticsearch-amd64`
7373
- `Opensearch` [Dockerfile](docker-image/v1.16/debian-opensearch/Dockerfile)
@@ -114,10 +114,10 @@ If you want to use above non published images, build it by yourself. Dockerfile
114114
- `docker pull fluent/fluentd-kubernetes-daemonset:v1.16.8-debian-azureblob-arm64-1.0`
115115
- `docker pull fluent/fluentd-kubernetes-daemonset:v1.16-debian-azureblob-arm64-2`
116116
- `Elasticsearch8` [Dockerfile](docker-image/v1.16/arm64/debian-elasticsearch8/Dockerfile)
117-
- `docker pull fluent/fluentd-kubernetes-daemonset:v1.16.8-debian-elasticsearch8-arm64-1.0`
117+
- `docker pull fluent/fluentd-kubernetes-daemonset:v1.16.8-debian-elasticsearch8-arm64-1.1`
118118
- `docker pull fluent/fluentd-kubernetes-daemonset:v1.16-debian-elasticsearch8-arm64-2`
119119
- `Elasticsearch7` [Dockerfile](docker-image/v1.16/arm64/debian-elasticsearch7/Dockerfile)
120-
- `docker pull fluent/fluentd-kubernetes-daemonset:v1.16.8-debian-elasticsearch7-arm64-1.0`
120+
- `docker pull fluent/fluentd-kubernetes-daemonset:v1.16.8-debian-elasticsearch7-arm64-1.1`
121121
- `docker pull fluent/fluentd-kubernetes-daemonset:v1.16-debian-elasticsearch7-arm64-2`
122122
- `docker pull fluent/fluentd-kubernetes-daemonset:v1-debian-elasticsearch-arm64`
123123
- `Opensearch` [Dockerfile](docker-image/v1.16/arm64/debian-opensearch/Dockerfile)

‎docker-image/v1.16/arm64/debian-elasticsearch7/Gemfile‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ gem "fluent-plugin-detect-exceptions", "~> 0.0.13"
1616
gem "fluent-plugin-rewrite-tag-filter", "~> 2.4.0"
1717
gem "fluent-plugin-parser-cri", "~> 0.1.0"
1818
gem "elasticsearch", "~> 7.0"
19-
gem "fluent-plugin-elasticsearch", "~> 5.2.5"
19+
gem "fluent-plugin-elasticsearch", "~> 5.4.4"
2020
gem "elasticsearch-xpack", "~> 7.0"
2121
gem "fluent-plugin-dedot_filter", "~> 1.0"
2222
gem "fluent-plugin-kubernetes_metadata_filter", "~> 3.4.0"

‎docker-image/v1.16/arm64/debian-elasticsearch7/Gemfile.lock‎

Lines changed: 16 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -24,29 +24,15 @@ GEM
2424
elasticsearch-api (>= 6)
2525
excon (1.2.5)
2626
logger
27-
faraday (1.10.4)
28-
faraday-em_http (~> 1.0)
29-
faraday-em_synchrony (~> 1.0)
30-
faraday-excon (~> 1.1)
31-
faraday-httpclient (~> 1.0)
32-
faraday-multipart (~> 1.0)
33-
faraday-net_http (~> 1.0)
34-
faraday-net_http_persistent (~> 1.0)
35-
faraday-patron (~> 1.0)
36-
faraday-rack (~> 1.0)
37-
faraday-retry (~> 1.0)
38-
ruby2_keywords (>= 0.0.4)
39-
faraday-em_http (1.0.0)
40-
faraday-em_synchrony (1.0.0)
41-
faraday-excon (1.1.0)
42-
faraday-httpclient (1.0.1)
43-
faraday-multipart (1.1.0)
44-
multipart-post (~> 2.0)
45-
faraday-net_http (1.0.2)
46-
faraday-net_http_persistent (1.2.0)
47-
faraday-patron (1.0.0)
48-
faraday-rack (1.0.0)
49-
faraday-retry (1.0.3)
27+
faraday (2.13.1)
28+
faraday-net_http (>= 2.0, < 3.5)
29+
json
30+
logger
31+
faraday-excon (2.3.0)
32+
excon (>= 1.0.0)
33+
faraday (>= 2.11.0, < 3)
34+
faraday-net_http (3.4.0)
35+
net-http (>= 0.5.0)
5036
ffi (1.17.2)
5137
ffi-compiler (1.3.2)
5238
ffi (>= 1.15.5)
@@ -63,10 +49,11 @@ GEM
6349
fluentd (>= 0.14.0, < 2)
6450
fluent-plugin-detect-exceptions (0.0.16)
6551
fluentd (>= 1.14.2)
66-
fluent-plugin-elasticsearch (5.2.5)
52+
fluent-plugin-elasticsearch (5.4.4)
6753
elasticsearch
6854
excon
69-
faraday (~> 1.10)
55+
faraday (>= 2.0.0)
56+
faraday-excon (>= 2.0.0)
7057
fluentd (>= 0.14.22)
7158
fluent-plugin-grok-parser (2.6.2)
7259
fluentd (>= 0.14.6, < 2)
@@ -136,7 +123,8 @@ GEM
136123
mime-types-data (3.2025.0507)
137124
msgpack (1.8.0)
138125
multi_json (1.15.0)
139-
multipart-post (2.4.1)
126+
net-http (0.6.0)
127+
uri
140128
netrc (0.11.0)
141129
oj (3.15.1)
142130
ostruct (0.6.1)
@@ -152,7 +140,6 @@ GEM
152140
mime-types (>= 1.16, < 4.0)
153141
netrc (~> 0.8)
154142
rexml (3.4.1)
155-
ruby2_keywords (0.0.5)
156143
serverengine (2.4.0)
157144
base64 (~> 0.1)
158145
logger (~> 1.4)
@@ -165,6 +152,7 @@ GEM
165152
concurrent-ruby (~> 1.0)
166153
tzinfo-data (1.2025.2)
167154
tzinfo (>= 1.0.0)
155+
uri (1.0.3)
168156
webrick (1.9.1)
169157
yajl-ruby (1.4.3)
170158

@@ -178,7 +166,7 @@ DEPENDENCIES
178166
fluent-plugin-concat (~> 2.5.0)
179167
fluent-plugin-dedot_filter (~> 1.0)
180168
fluent-plugin-detect-exceptions (~> 0.0.13)
181-
fluent-plugin-elasticsearch (~> 5.2.5)
169+
fluent-plugin-elasticsearch (~> 5.4.4)
182170
fluent-plugin-grok-parser (~> 2.6.2)
183171
fluent-plugin-json-in-json-2 (>= 1.0.2)
184172
fluent-plugin-kubernetes_metadata_filter (~> 3.4.0)

‎docker-image/v1.16/arm64/debian-elasticsearch8/Gemfile‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ gem "fluent-plugin-detect-exceptions", "~> 0.0.13"
1616
gem "fluent-plugin-rewrite-tag-filter", "~> 2.4.0"
1717
gem "fluent-plugin-parser-cri", "~> 0.1.0"
1818
gem "elasticsearch", "~> 8.0"
19-
gem "fluent-plugin-elasticsearch", "~> 5.3.0"
19+
gem "fluent-plugin-elasticsearch", "~> 5.4.4"
2020
gem "fluent-plugin-dedot_filter", "~> 1.0"
2121
gem "fluent-plugin-kubernetes_metadata_filter", "~> 3.4.0"
2222
gem "ffi"

‎docker-image/v1.16/arm64/debian-elasticsearch8/Gemfile.lock‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ GEM
4646
fluentd (>= 0.14.0, < 2)
4747
fluent-plugin-detect-exceptions (0.0.16)
4848
fluentd (>= 1.14.2)
49-
fluent-plugin-elasticsearch (5.3.0)
49+
fluent-plugin-elasticsearch (5.4.4)
5050
elasticsearch
5151
excon
5252
faraday (>= 2.0.0)
@@ -162,7 +162,7 @@ DEPENDENCIES
162162
fluent-plugin-concat (~> 2.5.0)
163163
fluent-plugin-dedot_filter (~> 1.0)
164164
fluent-plugin-detect-exceptions (~> 0.0.13)
165-
fluent-plugin-elasticsearch (~> 5.3.0)
165+
fluent-plugin-elasticsearch (~> 5.4.4)
166166
fluent-plugin-grok-parser (~> 2.6.2)
167167
fluent-plugin-json-in-json-2 (>= 1.0.2)
168168
fluent-plugin-kubernetes_metadata_filter (~> 3.4.0)

‎docker-image/v1.16/debian-elasticsearch7/Gemfile‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ gem "fluent-plugin-detect-exceptions", "~> 0.0.13"
1616
gem "fluent-plugin-rewrite-tag-filter", "~> 2.4.0"
1717
gem "fluent-plugin-parser-cri", "~> 0.1.0"
1818
gem "elasticsearch", "~> 7.0"
19-
gem "fluent-plugin-elasticsearch", "~> 5.2.5"
19+
gem "fluent-plugin-elasticsearch", "~> 5.4.4"
2020
gem "elasticsearch-xpack", "~> 7.0"
2121
gem "fluent-plugin-dedot_filter", "~> 1.0"
2222
gem "fluent-plugin-kubernetes_metadata_filter", "~> 3.4.0"

‎docker-image/v1.16/debian-elasticsearch7/Gemfile.lock‎

Lines changed: 16 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -24,29 +24,15 @@ GEM
2424
elasticsearch-api (>= 6)
2525
excon (1.2.5)
2626
logger
27-
faraday (1.10.4)
28-
faraday-em_http (~> 1.0)
29-
faraday-em_synchrony (~> 1.0)
30-
faraday-excon (~> 1.1)
31-
faraday-httpclient (~> 1.0)
32-
faraday-multipart (~> 1.0)
33-
faraday-net_http (~> 1.0)
34-
faraday-net_http_persistent (~> 1.0)
35-
faraday-patron (~> 1.0)
36-
faraday-rack (~> 1.0)
37-
faraday-retry (~> 1.0)
38-
ruby2_keywords (>= 0.0.4)
39-
faraday-em_http (1.0.0)
40-
faraday-em_synchrony (1.0.0)
41-
faraday-excon (1.1.0)
42-
faraday-httpclient (1.0.1)
43-
faraday-multipart (1.1.0)
44-
multipart-post (~> 2.0)
45-
faraday-net_http (1.0.2)
46-
faraday-net_http_persistent (1.2.0)
47-
faraday-patron (1.0.0)
48-
faraday-rack (1.0.0)
49-
faraday-retry (1.0.3)
27+
faraday (2.13.1)
28+
faraday-net_http (>= 2.0, < 3.5)
29+
json
30+
logger
31+
faraday-excon (2.3.0)
32+
excon (>= 1.0.0)
33+
faraday (>= 2.11.0, < 3)
34+
faraday-net_http (3.4.0)
35+
net-http (>= 0.5.0)
5036
ffi (1.17.2)
5137
ffi-compiler (1.3.2)
5238
ffi (>= 1.15.5)
@@ -63,10 +49,11 @@ GEM
6349
fluentd (>= 0.14.0, < 2)
6450
fluent-plugin-detect-exceptions (0.0.16)
6551
fluentd (>= 1.14.2)
66-
fluent-plugin-elasticsearch (5.2.5)
52+
fluent-plugin-elasticsearch (5.4.4)
6753
elasticsearch
6854
excon
69-
faraday (~> 1.10)
55+
faraday (>= 2.0.0)
56+
faraday-excon (>= 2.0.0)
7057
fluentd (>= 0.14.22)
7158
fluent-plugin-grok-parser (2.6.2)
7259
fluentd (>= 0.14.6, < 2)
@@ -136,7 +123,8 @@ GEM
136123
mime-types-data (3.2025.0507)
137124
msgpack (1.8.0)
138125
multi_json (1.15.0)
139-
multipart-post (2.4.1)
126+
net-http (0.6.0)
127+
uri
140128
netrc (0.11.0)
141129
oj (3.15.1)
142130
ostruct (0.6.1)
@@ -152,7 +140,6 @@ GEM
152140
mime-types (>= 1.16, < 4.0)
153141
netrc (~> 0.8)
154142
rexml (3.4.1)
155-
ruby2_keywords (0.0.5)
156143
serverengine (2.4.0)
157144
base64 (~> 0.1)
158145
logger (~> 1.4)
@@ -165,6 +152,7 @@ GEM
165152
concurrent-ruby (~> 1.0)
166153
tzinfo-data (1.2025.2)
167154
tzinfo (>= 1.0.0)
155+
uri (1.0.3)
168156
webrick (1.9.1)
169157
yajl-ruby (1.4.3)
170158

@@ -178,7 +166,7 @@ DEPENDENCIES
178166
fluent-plugin-concat (~> 2.5.0)
179167
fluent-plugin-dedot_filter (~> 1.0)
180168
fluent-plugin-detect-exceptions (~> 0.0.13)
181-
fluent-plugin-elasticsearch (~> 5.2.5)
169+
fluent-plugin-elasticsearch (~> 5.4.4)
182170
fluent-plugin-grok-parser (~> 2.6.2)
183171
fluent-plugin-json-in-json-2 (>= 1.0.2)
184172
fluent-plugin-kubernetes_metadata_filter (~> 3.4.0)

‎docker-image/v1.16/debian-elasticsearch8/Gemfile‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ gem "fluent-plugin-detect-exceptions", "~> 0.0.13"
1616
gem "fluent-plugin-rewrite-tag-filter", "~> 2.4.0"
1717
gem "fluent-plugin-parser-cri", "~> 0.1.0"
1818
gem "elasticsearch", "~> 8.0"
19-
gem "fluent-plugin-elasticsearch", "~> 5.3.0"
19+
gem "fluent-plugin-elasticsearch", "~> 5.4.4"
2020
gem "fluent-plugin-dedot_filter", "~> 1.0"
2121
gem "fluent-plugin-kubernetes_metadata_filter", "~> 3.4.0"
2222
gem "ffi"

‎docker-image/v1.16/debian-elasticsearch8/Gemfile.lock‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ GEM
4646
fluentd (>= 0.14.0, < 2)
4747
fluent-plugin-detect-exceptions (0.0.16)
4848
fluentd (>= 1.14.2)
49-
fluent-plugin-elasticsearch (5.3.0)
49+
fluent-plugin-elasticsearch (5.4.4)
5050
elasticsearch
5151
excon
5252
faraday (>= 2.0.0)
@@ -162,7 +162,7 @@ DEPENDENCIES
162162
fluent-plugin-concat (~> 2.5.0)
163163
fluent-plugin-dedot_filter (~> 1.0)
164164
fluent-plugin-detect-exceptions (~> 0.0.13)
165-
fluent-plugin-elasticsearch (~> 5.3.0)
165+
fluent-plugin-elasticsearch (~> 5.4.4)
166166
fluent-plugin-grok-parser (~> 2.6.2)
167167
fluent-plugin-json-in-json-2 (>= 1.0.2)
168168
fluent-plugin-kubernetes_metadata_filter (~> 3.4.0)

0 commit comments

Comments
 (0)