Skip to content

Commit f181b7c

Browse files
csatib02csatib02
authored
Merge pull request #2039 from joseacl/issue-1941
Update latest version of fluent-plugin-elasticsearch
2 parents d99038a + e70ad20 commit f181b7c

File tree

13 files changed

+71
-7
lines changed

13 files changed

+71
-7
lines changed

‎charts/logging-operator/charts/logging-operator-crds/templates/logging.banzaicloud.io_clusteroutputs.yaml

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -320,6 +320,8 @@ spec:
320320
type: string
321321
data_stream_template_name:
322322
type: string
323+
data_stream_template_use_index_patterns_wildcard:
324+
type: boolean
323325
default_elasticsearch_version:
324326
type: string
325327
deflector_alias:
@@ -1692,6 +1694,8 @@ spec:
16921694
type: string
16931695
data_stream_template_name:
16941696
type: string
1697+
data_stream_template_use_index_patterns_wildcard:
1698+
type: boolean
16951699
default_elasticsearch_version:
16961700
type: string
16971701
deflector_alias:
@@ -7765,6 +7769,8 @@ spec:
77657769
type: string
77667770
data_stream_template_name:
77677771
type: string
7772+
data_stream_template_use_index_patterns_wildcard:
7773+
type: boolean
77687774
default_elasticsearch_version:
77697775
type: string
77707776
deflector_alias:
@@ -9137,6 +9143,8 @@ spec:
91379143
type: string
91389144
data_stream_template_name:
91399145
type: string
9146+
data_stream_template_use_index_patterns_wildcard:
9147+
type: boolean
91409148
default_elasticsearch_version:
91419149
type: string
91429150
deflector_alias:

‎charts/logging-operator/charts/logging-operator-crds/templates/logging.banzaicloud.io_outputs.yaml

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -320,6 +320,8 @@ spec:
320320
type: string
321321
data_stream_template_name:
322322
type: string
323+
data_stream_template_use_index_patterns_wildcard:
324+
type: boolean
323325
default_elasticsearch_version:
324326
type: string
325327
deflector_alias:
@@ -1692,6 +1694,8 @@ spec:
16921694
type: string
16931695
data_stream_template_name:
16941696
type: string
1697+
data_stream_template_use_index_patterns_wildcard:
1698+
type: boolean
16951699
default_elasticsearch_version:
16961700
type: string
16971701
deflector_alias:
@@ -7043,6 +7047,8 @@ spec:
70437047
type: string
70447048
data_stream_template_name:
70457049
type: string
7050+
data_stream_template_use_index_patterns_wildcard:
7051+
type: boolean
70467052
default_elasticsearch_version:
70477053
type: string
70487054
deflector_alias:
@@ -8415,6 +8421,8 @@ spec:
84158421
type: string
84168422
data_stream_template_name:
84178423
type: string
8424+
data_stream_template_use_index_patterns_wildcard:
8425+
type: boolean
84188426
default_elasticsearch_version:
84198427
type: string
84208428
deflector_alias:

‎charts/logging-operator/crds/logging.banzaicloud.io_clusteroutputs.yaml

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -317,6 +317,8 @@ spec:
317317
type: string
318318
data_stream_template_name:
319319
type: string
320+
data_stream_template_use_index_patterns_wildcard:
321+
type: boolean
320322
default_elasticsearch_version:
321323
type: string
322324
deflector_alias:
@@ -1689,6 +1691,8 @@ spec:
16891691
type: string
16901692
data_stream_template_name:
16911693
type: string
1694+
data_stream_template_use_index_patterns_wildcard:
1695+
type: boolean
16921696
default_elasticsearch_version:
16931697
type: string
16941698
deflector_alias:
@@ -7762,6 +7766,8 @@ spec:
77627766
type: string
77637767
data_stream_template_name:
77647768
type: string
7769+
data_stream_template_use_index_patterns_wildcard:
7770+
type: boolean
77657771
default_elasticsearch_version:
77667772
type: string
77677773
deflector_alias:
@@ -9134,6 +9140,8 @@ spec:
91349140
type: string
91359141
data_stream_template_name:
91369142
type: string
9143+
data_stream_template_use_index_patterns_wildcard:
9144+
type: boolean
91379145
default_elasticsearch_version:
91389146
type: string
91399147
deflector_alias:

‎charts/logging-operator/crds/logging.banzaicloud.io_outputs.yaml

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -317,6 +317,8 @@ spec:
317317
type: string
318318
data_stream_template_name:
319319
type: string
320+
data_stream_template_use_index_patterns_wildcard:
321+
type: boolean
320322
default_elasticsearch_version:
321323
type: string
322324
deflector_alias:
@@ -1689,6 +1691,8 @@ spec:
16891691
type: string
16901692
data_stream_template_name:
16911693
type: string
1694+
data_stream_template_use_index_patterns_wildcard:
1695+
type: boolean
16921696
default_elasticsearch_version:
16931697
type: string
16941698
deflector_alias:
@@ -7040,6 +7044,8 @@ spec:
70407044
type: string
70417045
data_stream_template_name:
70427046
type: string
7047+
data_stream_template_use_index_patterns_wildcard:
7048+
type: boolean
70437049
default_elasticsearch_version:
70447050
type: string
70457051
deflector_alias:
@@ -8412,6 +8418,8 @@ spec:
84128418
type: string
84138419
data_stream_template_name:
84148420
type: string
8421+
data_stream_template_use_index_patterns_wildcard:
8422+
type: boolean
84158423
default_elasticsearch_version:
84168424
type: string
84178425
deflector_alias:

‎config/crd/bases/logging.banzaicloud.io_clusteroutputs.yaml

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -317,6 +317,8 @@ spec:
317317
type: string
318318
data_stream_template_name:
319319
type: string
320+
data_stream_template_use_index_patterns_wildcard:
321+
type: boolean
320322
default_elasticsearch_version:
321323
type: string
322324
deflector_alias:
@@ -1689,6 +1691,8 @@ spec:
16891691
type: string
16901692
data_stream_template_name:
16911693
type: string
1694+
data_stream_template_use_index_patterns_wildcard:
1695+
type: boolean
16921696
default_elasticsearch_version:
16931697
type: string
16941698
deflector_alias:
@@ -7762,6 +7766,8 @@ spec:
77627766
type: string
77637767
data_stream_template_name:
77647768
type: string
7769+
data_stream_template_use_index_patterns_wildcard:
7770+
type: boolean
77657771
default_elasticsearch_version:
77667772
type: string
77677773
deflector_alias:
@@ -9134,6 +9140,8 @@ spec:
91349140
type: string
91359141
data_stream_template_name:
91369142
type: string
9143+
data_stream_template_use_index_patterns_wildcard:
9144+
type: boolean
91379145
default_elasticsearch_version:
91389146
type: string
91399147
deflector_alias:

‎config/crd/bases/logging.banzaicloud.io_outputs.yaml

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -317,6 +317,8 @@ spec:
317317
type: string
318318
data_stream_template_name:
319319
type: string
320+
data_stream_template_use_index_patterns_wildcard:
321+
type: boolean
320322
default_elasticsearch_version:
321323
type: string
322324
deflector_alias:
@@ -1689,6 +1691,8 @@ spec:
16891691
type: string
16901692
data_stream_template_name:
16911693
type: string
1694+
data_stream_template_use_index_patterns_wildcard:
1695+
type: boolean
16921696
default_elasticsearch_version:
16931697
type: string
16941698
deflector_alias:
@@ -7040,6 +7044,8 @@ spec:
70407044
type: string
70417045
data_stream_template_name:
70427046
type: string
7047+
data_stream_template_use_index_patterns_wildcard:
7048+
type: boolean
70437049
default_elasticsearch_version:
70447050
type: string
70457051
deflector_alias:
@@ -8412,6 +8418,8 @@ spec:
84128418
type: string
84138419
data_stream_template_name:
84148420
type: string
8421+
data_stream_template_use_index_patterns_wildcard:
8422+
type: boolean
84158423
default_elasticsearch_version:
84168424
type: string
84178425
deflector_alias:

‎docs/configuration/plugins/outputs/elasticsearch.md

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -109,6 +109,12 @@ Specify an existing index template for the data stream. If not present, a new te
109109
110110
Default: data_stream_name
111111
112+
### data_stream_template_use_index_patterns_wildcard (*bool, optional) {#elasticsearch-data_stream_template_use_index_patterns_wildcard}
113+
114+
https://github.com/uken/fluent-plugin-elasticsearch?tab=readme-ov-file#data_stream_template_use_index_patterns_wildcard
115+
116+
Default: true
117+
112118
### default_elasticsearch_version (string, optional) {#elasticsearch-default_elasticsearch_version}
113119
114120
This parameter changes that ES plugin assumes default Elasticsearch version.

‎images/fluentd/outputs/Gemfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ gem 'fluent-plugin-kafka', '0.19.4'
55
gem 'fluent-plugin-grafana-loki', '1.2.20'
66
gem 'fluent-plugin-kinesis', '3.5.0'
77
gem 'fluent-plugin-splunk-hec', '1.3.3'
8-
gem 'fluent-plugin-elasticsearch', '5.4.3'
8+
gem 'fluent-plugin-elasticsearch', '6.0.0'
99
gem 'fluent-plugin-newrelic', '1.2.3'
1010
gem 'fluent-plugin-cloudwatch-logs', '0.14.3'
1111
gem 'fluent-plugin-opensearch', '1.1.5'

‎images/fluentd/outputs/Gemfile.lock

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -62,13 +62,13 @@ GEM
6262
domain_name (0.5.20190701)
6363
unf (>= 0.0.5, < 1.0.0)
6464
drb (2.2.1)
65-
elastic-transport (8.3.0)
65+
elastic-transport (8.4.0)
6666
faraday (< 3)
6767
multi_json
68-
elasticsearch (8.11.0)
68+
elasticsearch (9.0.2)
6969
elastic-transport (~> 8.3)
70-
elasticsearch-api (= 8.11.0)
71-
elasticsearch-api (8.11.0)
70+
elasticsearch-api (= 9.0.2)
71+
elasticsearch-api (9.0.2)
7272
multi_json
7373
excon (0.104.0)
7474
faraday (2.7.12)
@@ -100,7 +100,7 @@ GEM
100100
fluent-plugin-datadog (0.14.4)
101101
fluentd (>= 1, < 2)
102102
net-http-persistent (~> 4.0.1)
103-
fluent-plugin-elasticsearch (5.4.3)
103+
fluent-plugin-elasticsearch (6.0.0)
104104
elasticsearch
105105
excon
106106
faraday (>= 2.0.0)
@@ -382,7 +382,7 @@ DEPENDENCIES
382382
fluent-plugin-aliyun-oss (= 0.0.1)
383383
fluent-plugin-cloudwatch-logs (= 0.14.3)
384384
fluent-plugin-datadog (= 0.14.4)
385-
fluent-plugin-elasticsearch (= 5.4.3)
385+
fluent-plugin-elasticsearch (= 6.0.0)
386386
fluent-plugin-gcs (= 0.4.4)
387387
fluent-plugin-gelf-best (= 1.4.1)
388388
fluent-plugin-grafana-loki (= 1.2.20)

‎pkg/sdk/logging/model/output/aws_elasticsearch_test.go

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -46,6 +46,7 @@ buffer:
4646
<match **>
4747
@type aws-elasticsearch-service
4848
@id test
49+
data_stream_template_use_index_patterns_wildcard true
4950
exception_backup true
5051
fail_on_detecting_es_version_retry_exceed true
5152
fail_on_putting_template_retry_exceed true

‎pkg/sdk/logging/model/output/elasticsearch.go

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -260,6 +260,8 @@ type ElasticsearchOutput struct {
260260
DataStreamIlmPolicy string `json:"data_stream_ilm_policy,omitempty"`
261261
// Specify whether overwriting data stream ilm policy or not.
262262
DataStreamIlmPolicyOverwrite bool `json:"data_stream_ilm_policy_overwrite,omitempty"`
263+
// https://github.com/uken/fluent-plugin-elasticsearch?tab=readme-ov-file#data_stream_template_use_index_patterns_wildcard
264+
DataStreamTemplateNameUseIndexPatternsWildcard *bool `json:"data_stream_template_use_index_patterns_wildcard,omitempty" plugin:"default:true"`
263265
// If set to true, the output uses the [legacy index template format](https://www.elastic.co/guide/en/elasticsearch/reference/7.13/indices-templates-v1.html). Otherwise, it uses the [composable index template](https://www.elastic.co/guide/en/elasticsearch/reference/7.13/index-templates.html) format. (default: true)
264266
// +kubebuilder:validation:Optional
265267
UseLegacyTemplate *bool `json:"use_legacy_template,omitempty"`

‎pkg/sdk/logging/model/output/elasticsearch_test.go

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -41,6 +41,7 @@ compression_level: default_compression
4141
@type elasticsearch
4242
@id test
4343
compression_level default_compression
44+
data_stream_template_use_index_patterns_wildcard true
4445
exception_backup true
4546
fail_on_detecting_es_version_retry_exceed true
4647
fail_on_putting_template_retry_exceed true
@@ -88,6 +89,7 @@ buffer:
8889
@type elasticsearch_data_stream
8990
@id test
9091
data_stream_name test-ds
92+
data_stream_template_use_index_patterns_wildcard true
9193
exception_backup true
9294
fail_on_detecting_es_version_retry_exceed true
9395
fail_on_putting_template_retry_exceed true

‎pkg/sdk/logging/model/output/zz_generated.deepcopy.go

Lines changed: 5 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)