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.

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

Add migration.enabled config option #9805

Merged
merged 4 commits into from
Jan 21, 2019
Merged

Conversation

ruflin
Copy link
Contributor

@ruflin ruflin commented Dec 27, 2018

The migration.enabled config option is off by default. Enabling it will add all the alias fields which are used for making Beats 7.x data compatible with 6.x data for queries and dashboards.

A user that upgrades can either set migration.enabled: true in the config file or run -E migration.enabled=true on the command line to also have the migration aliases in the Elasticsearch index template.

Further changes:

  • Add system test to check the generated template
  • Fix autodiscovery tests. Were broken as probably the removal of the aliases by default did not work here as it relied on apache2.

@ruflin ruflin added in progress Pull request is currently in progress. libbeat ecs labels Dec 27, 2018
@ruflin ruflin requested a review from a team as a code owner December 27, 2018 14:59
@ruflin ruflin mentioned this pull request Jan 7, 2019
@ruflin ruflin force-pushed the introduce-migration branch from e6be910 to 5a94aa8 Compare January 10, 2019 13:28
@ruflin ruflin requested review from a team as code owners January 10, 2019 13:28
@@ -63,7 +63,7 @@ import (
svc "github.com/elastic/beats/libbeat/service"
"github.com/elastic/beats/libbeat/template"
"github.com/elastic/beats/libbeat/version"
"github.com/elastic/go-sysinfo"
sysinfo "github.com/elastic/go-sysinfo"
Copy link
Contributor Author

Choose a reason for hiding this comment

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

Seems like my idea / goimports did this automatically. Interesting.

libbeat/cmd/instance/beat.go Outdated Show resolved Hide resolved
@ruflin
Copy link
Contributor Author

ruflin commented Jan 11, 2019

Trying to add support to enable / disable aliases for the Kibana index pattern I stumbled over the following issue: #10013 Also opened elastic/kibana#28570 to get better support in Kibana.

@ruflin ruflin added the Team:Integrations Label for the Integrations team label Jan 14, 2019
@ruflin ruflin force-pushed the introduce-migration branch from 5a94aa8 to 141053a Compare January 15, 2019 07:46
@ruflin ruflin requested a review from a team as a code owner January 15, 2019 07:46
@ruflin ruflin force-pushed the introduce-migration branch from 141053a to 6c0d37b Compare January 15, 2019 07:51
@ruflin ruflin changed the title [WIP] Add migration.enabled config option Add migration.enabled config option Jan 15, 2019
@ruflin ruflin added the review label Jan 15, 2019
@ruflin
Copy link
Contributor Author

ruflin commented Jan 16, 2019

This PR will only address migration aliases for the Elasticsearch index template. A follow up PR will be created to also enable / disable it in Kibana index pattern after #10075 is done.

@ruflin ruflin force-pushed the introduce-migration branch 2 times, most recently from 84ea2bc to 6c07d6d Compare January 16, 2019 12:15
@ruflin
Copy link
Contributor Author

ruflin commented Jan 16, 2019

This is ready for review.

@ruflin ruflin removed the in progress Pull request is currently in progress. label Jan 16, 2019
@ruflin ruflin force-pushed the introduce-migration branch from 6c07d6d to 46017b9 Compare January 18, 2019 13:06
filebeat/autodiscover/builder/hints/logs_test.go Outdated Show resolved Hide resolved
filebeat/module/apache2/module.yml Outdated Show resolved Hide resolved
libbeat/tests/system/test_migration.py Show resolved Hide resolved
The migration.enabled config option is off by default. Enabling it will add all the alias fields which are used for making Beats 7.x data compatible with 6.x data for queries and dashboards.

A user that upgrades can either set `migration.enabled: true` in the config file or run `-E migration.enabled=true` on the command line to also have the migration aliases in the Elasticsearch index template.

Further changes:

* Add system test to check the generated template
* Fix autodiscovery tests. Were broken as probably the removal of the aliases by default did not work here as it relied on apache2.
@ruflin ruflin force-pushed the introduce-migration branch from fb1a3a5 to dd782d1 Compare January 18, 2019 14:49
@ruflin ruflin merged commit 4ee3a64 into elastic:master Jan 21, 2019
@ruflin ruflin deleted the introduce-migration branch January 21, 2019 08:44
DStape pushed a commit to DStape/beats that referenced this pull request Aug 20, 2019
The migration.enabled config option is off by default. Enabling it will add all the alias fields which are used for making Beats 7.x data compatible with 6.x data for queries and dashboards.

A user that upgrades can either set `migration.enabled: true` in the config file or run `-E migration.enabled=true` on the command line to also have the migration aliases in the Elasticsearch index template.

Further changes:

* Add system test to check the generated template
* Fix autodiscovery tests. Were broken as probably the removal of the aliases by default did not work here as it relied on apache2.
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
ecs libbeat review Team:Integrations Label for the Integrations team
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants