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

[Fleet] Fix output backfill for preconfigured outputs #173088

Merged
merged 4 commits into from
Dec 11, 2023

Conversation

kpollich
Copy link
Member

@kpollich kpollich commented Dec 11, 2023

Summary

Closes #173081

Fixes output backfill for existing preconfigured outputs.

Checklist

@kpollich kpollich added release_note:skip Skip the PR/issue when compiling release notes Team:Fleet Team label for Observability Data Collection Fleet team backport:prev-minor Backport to (9.0) the previous minor version (i.e. one version back from main) labels Dec 11, 2023
@kpollich kpollich self-assigned this Dec 11, 2023
@kpollich kpollich requested a review from a team as a code owner December 11, 2023 17:35
@elasticmachine
Copy link
Contributor

Pinging @elastic/fleet (Team:Fleet)

@apmmachine
Copy link
Contributor

🤖 GitHub comments

Expand to view the GitHub comments

Just comment with:

  • /oblt-deploy : Deploy a Kibana instance using the Observability test environments.
  • /oblt-deploy-serverless : Deploy a serverless Kibana instance using the Observability test environments.
  • run elasticsearch-ci/docs : Re-trigger the docs validation. (use unformatted text in the comment!)

Copy link
Contributor

@juliaElastic juliaElastic left a comment

Choose a reason for hiding this comment

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

LGTM

Copy link
Member

@nchaulet nchaulet left a comment

Choose a reason for hiding this comment

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

Looks like there is an edge case not handled in that code it seems there is also a type error in the kibana logs related to that code https://github.com/nchaulet/kibana/blob/523474f7e9030db78445941aa55a46e560d73e97/x-pack/plugins/fleet/common/services/output_helpers.ts#L55

Copy link
Member

@nchaulet nchaulet left a comment

Choose a reason for hiding this comment

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

🚀

@kpollich kpollich enabled auto-merge (squash) December 11, 2023 18:39
@kpollich
Copy link
Member Author

@elasticmachine merge upstream

@kpollich kpollich merged commit 61b413e into elastic:main Dec 11, 2023
@kibana-ci
Copy link
Collaborator

💛 Build succeeded, but was flaky

Failed CI Steps

Test Failures

  • [job] [logs] Detection Engine - Security Solution Cypress Tests #6 / Alert user assignment - ESS & Serverless Updating assignees (single alert) updating assignees via More actions in alerts table updating assignees via More actions in alerts table

Metrics [docs]

Page load bundle

Size of the bundles that are downloaded on every page load. Target size is below 100kb

id before after diff
fleet 157.0KB 157.0KB +19.0B

History

To update your PR or re-run it, just comment with:
@elasticmachine merge upstream

cc @kpollich

kibanamachine pushed a commit to kibanamachine/kibana that referenced this pull request Dec 11, 2023
## Summary

Closes elastic#173081

Fixes output backfill for existing preconfigured outputs.

### Checklist

- [x] [Unit or functional
tests](https://www.elastic.co/guide/en/kibana/master/development-tests.html)
were updated or added to match the most common scenarios

---------

Co-authored-by: Nicolas Chaulet <[email protected]>
(cherry picked from commit 61b413e)
@kibanamachine
Copy link
Contributor

💚 All backports created successfully

Status Branch Result
8.12

Note: Successful backport PRs will be merged automatically after passing CI.

Questions ?

Please refer to the Backport tool documentation

kibanamachine added a commit that referenced this pull request Dec 11, 2023
#173118)

# Backport

This will backport the following commits from `main` to `8.12`:
- [[Fleet] Fix output backfill for preconfigured outputs
(#173088)](#173088)

<!--- Backport version: 8.9.7 -->

### Questions ?
Please refer to the [Backport tool
documentation](https://github.com/sqren/backport)

<!--BACKPORT [{"author":{"name":"Kyle
Pollich","email":"[email protected]"},"sourceCommit":{"committedDate":"2023-12-11T21:16:34Z","message":"[Fleet]
Fix output backfill for preconfigured outputs (#173088)\n\n##
Summary\r\n\r\nCloses #173081 \r\n\r\nFixes output backfill for existing
preconfigured outputs. \r\n\r\n### Checklist\r\n\r\n- [x] [Unit or
functional\r\ntests](https://www.elastic.co/guide/en/kibana/master/development-tests.html)\r\nwere
updated or added to match the most common
scenarios\r\n\r\n---------\r\n\r\nCo-authored-by: Nicolas Chaulet
<[email protected]>","sha":"61b413ea05734b94c82cd07cef048f281deda3bd","branchLabelMapping":{"^v8.13.0$":"main","^v(\\d+).(\\d+).\\d+$":"$1.$2"}},"sourcePullRequest":{"labels":["release_note:skip","Team:Fleet","backport:prev-minor","v8.13.0"],"number":173088,"url":"https://github.com/elastic/kibana/pull/173088","mergeCommit":{"message":"[Fleet]
Fix output backfill for preconfigured outputs (#173088)\n\n##
Summary\r\n\r\nCloses #173081 \r\n\r\nFixes output backfill for existing
preconfigured outputs. \r\n\r\n### Checklist\r\n\r\n- [x] [Unit or
functional\r\ntests](https://www.elastic.co/guide/en/kibana/master/development-tests.html)\r\nwere
updated or added to match the most common
scenarios\r\n\r\n---------\r\n\r\nCo-authored-by: Nicolas Chaulet
<[email protected]>","sha":"61b413ea05734b94c82cd07cef048f281deda3bd"}},"sourceBranch":"main","suggestedTargetBranches":[],"targetPullRequestStates":[{"branch":"main","label":"v8.13.0","labelRegex":"^v8.13.0$","isSourceBranch":true,"state":"MERGED","url":"https://github.com/elastic/kibana/pull/173088","number":173088,"mergeCommit":{"message":"[Fleet]
Fix output backfill for preconfigured outputs (#173088)\n\n##
Summary\r\n\r\nCloses #173081 \r\n\r\nFixes output backfill for existing
preconfigured outputs. \r\n\r\n### Checklist\r\n\r\n- [x] [Unit or
functional\r\ntests](https://www.elastic.co/guide/en/kibana/master/development-tests.html)\r\nwere
updated or added to match the most common
scenarios\r\n\r\n---------\r\n\r\nCo-authored-by: Nicolas Chaulet
<[email protected]>","sha":"61b413ea05734b94c82cd07cef048f281deda3bd"}}]}]
BACKPORT-->

Co-authored-by: Kyle Pollich <[email protected]>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
backport:prev-minor Backport to (9.0) the previous minor version (i.e. one version back from main) release_note:skip Skip the PR/issue when compiling release notes Team:Fleet Team label for Observability Data Collection Fleet team v8.12.0 v8.13.0
Projects
None yet
Development

Successfully merging this pull request may close these issues.

[Fleet] Preset output backfill fails on preconfigured outputs
7 participants