Migrations v2 ignore fleet agent events #96690
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
rudolf
added
Team:Core
|
Pinging @elastic/kibana-core (Team:Core) |
rudolf
commented
Apr 9, 2021
| @@ -101,7 +101,7 @@ export default function (providerContext: FtrProviderContext) { | |||
| ); | |||
| }); | |||
|
|
|||
| it('should create or update the fleet_enroll user if called multiple times with forceRecreate flag', async () => { | |||
| it.skip('should create or update the fleet_enroll user if called multiple times with forceRecreate flag', async () => { | |||
There was a problem hiding this comment.
@elastic/fleet @nchaulet somehow this test is failing when I remove fleet-agent-events. The same test also fails on master if I enable v1 migrations for this test with the following:
--- a/x-pack/test/fleet_api_integration/config.ts
+++ b/x-pack/test/fleet_api_integration/config.ts
@@ -65,6 +65,7 @@ export default async function ({ readConfigFile }: FtrConfigProviderContext) {
kbnTestServer: {
...xPackAPITestsConfig.get('kbnTestServer'),
serverArgs: [
+ '--migrations.enableV2=false',
...xPackAPITestsConfig.get('kbnTestServer.serverArgs'),
...(registryPort ? [`--xpack.fleet.registryUrl=http://localhost:${registryPort}`] : []),
],We're targeting 7.12.1 for this fix, so please take a look and let me know if it's possible to fix this test or if we should skip it.
There was a problem hiding this comment.
I think it's okay to skip it, we are going to remove that API in 7.13.
botelastic
bot
added
the
Team:Fleet
|
Pinging @elastic/fleet (Team:Fleet) |
afharo
approved these changes
Apr 9, 2021
There was a problem hiding this comment.
🚀 LGTM! Just added a NIT about term vs. terms. According to https://discuss.elastic.co/t/term-vs-terms-filter/15533, the only difference in performance is caching. Since, ideally, we should be running this once, I guess it makes no difference.
|
@elasticmachine merge upstream |
💚 Build SucceededMetrics [docs]
History
To update your PR or re-run it, just comment with: |
rudolf
added
the
auto-backport
kibanamachine
added a commit
to kibanamachine/kibana
that referenced
this pull request
Apr 12, 2021
* migrationsv2: ignore fleet agent events and tsvb telemetry * migrationsv1: ignore tsvb-validation-telemetry * Skip fleet test that depends on fleet-agent-events * Fix typescript errors Co-authored-by: Kibana Machine <[email protected]>
💔 Backport failed
Successful backport PRs will be merged automatically after passing CI. To backport manually run: |
kibanamachine
added a commit
that referenced
this pull request
Apr 12, 2021
* migrationsv2: ignore fleet agent events and tsvb telemetry * migrationsv1: ignore tsvb-validation-telemetry * Skip fleet test that depends on fleet-agent-events * Fix typescript errors Co-authored-by: Kibana Machine <[email protected]> Co-authored-by: Rudolf Meijering <[email protected]>
rudolf
added a commit
to rudolf/kibana
that referenced
this pull request
Apr 12, 2021
* migrationsv2: ignore fleet agent events and tsvb telemetry * migrationsv1: ignore tsvb-validation-telemetry * Skip fleet test that depends on fleet-agent-events * Fix typescript errors Co-authored-by: Kibana Machine <[email protected]> # Conflicts: # src/core/server/saved_objects/migrationsv2/integration_tests/actions.test.ts
pgayvallet
added a commit
that referenced
this pull request
Apr 13, 2021
…sted sessions (#96938) (#96892) * Migrations v2 ignore fleet agent events (#96690) * migrationsv2: ignore fleet agent events and tsvb telemetry * migrationsv1: ignore tsvb-validation-telemetry * Skip fleet test that depends on fleet-agent-events * Fix typescript errors Co-authored-by: Kibana Machine <[email protected]> # Conflicts: # src/core/server/saved_objects/migrationsv2/integration_tests/actions.test.ts * Correctly fix merge conflicts * Skip failing fleet-agent-events tests * Skip security solution endpoint telemetry tests depending on fleet-agent-events so's * Exclude non-persisted sessions from SO migration (#96938) (cherry picked from commit bfd5b7b) * use `any` for estypes.QueryContainer Co-authored-by: Kibana Machine <[email protected]> Co-authored-by: Pierre Gayvallet <[email protected]>
|
👍 🥇 💯 |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Summary
Ignore fleet-agent-events and tsvb-validation-telemetry saved objects from both v1 and v2 migrations.
Fixes #95617
Fixes #91869
Release notes
Users who tried the fleet agent beta in 7.10 might have hundreds of thousands of
fleet-agent-eventsin their.kibanaindex. Due to the large volume of documents, upgrades to 7.12 would frequently fail for these users. In 7.12.1 we drop allfleet-agent-eventsduring the upgrade migration to address this problem. Thefleet-agent-eventsdocuments are still left in the older.kibana_Nindex from previous versions, once the upgrade has succeeded we recommend deleting these indices to recover the disk space, see https://www.elastic.co/guide/en/kibana/current/upgrade-migrations.html#upgrade-migrations-old-indicesChecklist
Delete any items that are not applicable to this PR.
For maintainers