Skip to content

Commit c059723

Browse files
authored
Merge pull request #883 from karenzone/fix-wording
[Doc]Update wording on ilm_enabled setting and bump to v10.2.1
2 parents 0c3ab54 + a1d739b commit c059723

File tree

3 files changed

+8
-4
lines changed

3 files changed

+8
-4
lines changed

CHANGELOG.md

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,6 @@
1+
## 10.2.1
2+
- Fixed wording and corrected option in documentation [#881](https://github.com/logstash-plugins/logstash-output-elasticsearch/pull/881) [#883](https://github.com/logstash-plugins/logstash-output-elasticsearch/pull/883)
3+
14
## 10.2.0
25
- Deprecation: Added warning about connecting a default Distribution of Logstash with an OSS version of ES [#875](https://github.com/logstash-plugins/logstash-output-elasticsearch/pull/875)
36
- Added template for connecting to ES 8.x [#871](https://github.com/logstash-plugins/logstash-output-elasticsearch/pull/871)

docs/index.asciidoc

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -105,9 +105,10 @@ This feature requires an Elasticsearch instance of 6.6.0 or higher with at least
105105

106106
Logstash can use {ref}/index-lifecycle-management.html[Index Lifecycle Management] to automate the management of indices over time.
107107

108-
The use of Index Lifecycle Management is controlled by the `ilm_enabled` setting. By default, this is will
109-
automatically detect whether the Elasticsearch instance supports ILM, and will use it if it is available. `ilm_enabled`
110-
can also be set to `true` or `false` to override the automatic detection, or disable ILM.
108+
The use of Index Lifecycle Management is controlled by the `ilm_enabled`
109+
setting. By default, this setting detects whether the Elasticsearch instance
110+
supports ILM, and uses it if it is available. `ilm_enabled` can also be set to
111+
`true` or `false` to override the automatic detection, or disable ILM.
111112

112113
This will overwrite the index settings and adjust the Logstash template to write the necessary settings for the template
113114
to support index lifecycle management, including the index policy and rollover alias to be used.

logstash-output-elasticsearch.gemspec

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
Gem::Specification.new do |s|
22
s.name = 'logstash-output-elasticsearch'
3-
s.version = '10.2.0'
3+
s.version = '10.2.1'
44
s.licenses = ['apache-2.0']
55
s.summary = "Stores logs in Elasticsearch"
66
s.description = "This gem is a Logstash plugin required to be installed on top of the Logstash core pipeline using $LS_HOME/bin/logstash-plugin install gemname. This gem is not a stand-alone program"

0 commit comments

Comments
 (0)