Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Cherry-pick #7963 to 6.x: Add ILM support to Beats #9418

Merged
merged 3 commits into from
Dec 7, 2018
Merged

Cherry-pick #7963 to 6.x: Add ILM support to Beats #9418

Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
afb02a9
Add ILM support to Beats (#7963)
ruflin Dec 6, 2018
c4f76a7
fix version handling
ruflin Dec 6, 2018
8b0a4ab
update testing environment to 6.6 as 6.6 is needed for ilm
ruflin Dec 6, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 6 additions & 1 deletion libbeat/cmd/instance/ilm.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -144,7 +144,12 @@ func loadConfigWithDefaults(config *ilmConfig, b *Beat) {
}

func checkElasticsearchVersionIlm(client *elasticsearch.Client) error {
esV := client.GetVersion()
esVer := client.GetVersion()
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@urso @ph Had to do this fix after the backpart as I assume the version change is not in 6.x

esV, err := common.NewVersion(esVer)
if err != nil {
return err
}

requiredVersion, err := common.NewVersion("6.6.0")
if err != nil {
return err
Expand Down