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

Jump to bottom

[Fleet] Fix reserved keys for Elasticsearch output YAML box #175901

Merged
merged 2 commits into from
Jan 30, 2024
Merged

[Fleet] Fix reserved keys for Elasticsearch output YAML box #175901

merged 2 commits into from
Jan 30, 2024

Conversation

kpollich
Copy link
Member

@kpollich kpollich commented Jan 30, 2024 •
edited by kibanamachine
Loading

Summary

Fixes #175892

Updates reserved keywords that trigger the Custom preset for the Elasticsearch output.

Screen.Recording.2024-01-30.at.9.40.47.AM.mov

@kpollich kpollich added release_note:fix Team:Fleet Team label for Observability Data Collection Fleet team backport:prev-minor Backport to (8.x) the previous minor version (i.e. one version back from main) labels Jan 30, 2024
@kpollich kpollich self-assigned this Jan 30, 2024
@kpollich kpollich requested a review from a team as a code owner January 30, 2024 15:15
@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!)

@kpollich
Copy link
Member Author

@elasticmachine merge upstream

nchaulet
nchaulet approved these changes Jan 30, 2024
View reviewed changes
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) January 30, 2024 15:19
kpollich
kpollich commented Jan 30, 2024
View reviewed changes
x-pack/plugins/fleet/common/constants/output.ts
Comment on lines -125 to +130
'workers',
'compression_level',
'connection_idle_timeout',
'queue.mem.events',
'flush.min_events',
'flush.timeout',
'compression',
'idle_timeout',
'queue.mem.flush.min_events',
'queue.mem.flush.timeout',
'workers',
Copy link
Member Author

Choose a reason for hiding this comment

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

Sorted these alphabetically, hence the diff

@kibana-ci
Copy link
Collaborator

💚 Build Succeeded

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 151.7KB 151.7KB +37.0B

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

cc @kpollich

@kpollich kpollich merged commit 0c93180 into elastic:main Jan 30, 2024
20 checks passed
@kibanamachine
Copy link
Contributor

💔 All backports failed

Status Branch Result
❌ 8.12 Backport failed because of merge conflicts

Manual backport

To create the backport manually run:

node scripts/backport --pr 175901

Questions ?

Please refer to the Backport tool documentation

kpollich added a commit to kpollich/kibana that referenced this pull request Jan 30, 2024
@kpollich
[Fleet] Fix reserved keys for Elasticsearch output YAML box (elastic#…
0a639ac 
…175901)

## Summary

Fixes elastic#175892

Updates reserved keywords that trigger the `Custom` preset for the
Elasticsearch output.

https://github.com/elastic/kibana/assets/6766512/dda60f6c-d77e-4e98-946b-2c389660074b

Co-authored-by: Kibana Machine <42973632+kibanamachine@users.noreply.github.com>
(cherry picked from commit 0c93180)

# Conflicts:
#	x-pack/plugins/fleet/cypress/e2e/fleet_settings_outputs.cy.ts
@kpollich kpollich mentioned this pull request Jan 30, 2024
Merged
@kpollich
Copy link
Member Author

💚 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

kpollich added a commit that referenced this pull request Jan 30, 2024
@kpollich
[8.12] [Fleet] Fix reserved keys for Elasticsearch output YAML box (#…
e54f4ce 
…175901) (#175915)

# Backport

This will backport the following commits from `main` to `8.12`:
- [[Fleet] Fix reserved keys for Elasticsearch output YAML box
(#175901)](#175901)

<!--- Backport version: 8.9.8 -->

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

<!--BACKPORT [{"author":{"name":"Kyle
Pollich","email":"kyle.pollich@elastic.co"},"sourceCommit":{"committedDate":"2024-01-30T16:30:36Z","message":"[Fleet]
Fix reserved keys for Elasticsearch output YAML box (#175901)\n\n##
Summary\r\n\r\nFixes #175892\r\n\r\nUpdates reserved keywords that
trigger the `Custom` preset for the\r\nElasticsearch
output.\r\n\r\n\r\n\r\nhttps://github.com/elastic/kibana/assets/6766512/dda60f6c-d77e-4e98-946b-2c389660074b\r\n\r\nCo-authored-by:
Kibana Machine
<42973632+kibanamachine@users.noreply.github.com>","sha":"0c9318043902474f27d4bbf9739de70994e58cf8","branchLabelMapping":{"^v8.13.0$":"main","^v(\\d+).(\\d+).\\d+$":"$1.$2"}},"sourcePullRequest":{"labels":["release_note:fix","Team:Fleet","backport:prev-minor","v8.13.0"],"number":175901,"url":"https://github.com/elastic/kibana/pull/175901","mergeCommit":{"message":"[Fleet]
Fix reserved keys for Elasticsearch output YAML box (#175901)\n\n##
Summary\r\n\r\nFixes #175892\r\n\r\nUpdates reserved keywords that
trigger the `Custom` preset for the\r\nElasticsearch
output.\r\n\r\n\r\n\r\nhttps://github.com/elastic/kibana/assets/6766512/dda60f6c-d77e-4e98-946b-2c389660074b\r\n\r\nCo-authored-by:
Kibana Machine
<42973632+kibanamachine@users.noreply.github.com>","sha":"0c9318043902474f27d4bbf9739de70994e58cf8"}},"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/175901","number":175901,"mergeCommit":{"message":"[Fleet]
Fix reserved keys for Elasticsearch output YAML box (#175901)\n\n##
Summary\r\n\r\nFixes #175892\r\n\r\nUpdates reserved keywords that
trigger the `Custom` preset for the\r\nElasticsearch
output.\r\n\r\n\r\n\r\nhttps://github.com/elastic/kibana/assets/6766512/dda60f6c-d77e-4e98-946b-2c389660074b\r\n\r\nCo-authored-by:
Kibana Machine
<42973632+kibanamachine@users.noreply.github.com>","sha":"0c9318043902474f27d4bbf9739de70994e58cf8"}}]}]
BACKPORT-->
nreese pushed a commit to nreese/kibana that referenced this pull request Jan 31, 2024
@kpollich @kibanamachine @nreese
[Fleet] Fix reserved keys for Elasticsearch output YAML box (elastic#…
c888fff 
…175901)

## Summary

Fixes elastic#175892

Updates reserved keywords that trigger the `Custom` preset for the
Elasticsearch output.



https://github.com/elastic/kibana/assets/6766512/dda60f6c-d77e-4e98-946b-2c389660074b

Co-authored-by: Kibana Machine <42973632+kibanamachine@users.noreply.github.com>
WafaaNasr pushed a commit to WafaaNasr/kibana that referenced this pull request Feb 5, 2024
@kpollich @kibanamachine @WafaaNasr
[Fleet] Fix reserved keys for Elasticsearch output YAML box (elastic#…
d9a386c 
…175901)

## Summary

Fixes elastic#175892

Updates reserved keywords that trigger the `Custom` preset for the
Elasticsearch output.



https://github.com/elastic/kibana/assets/6766512/dda60f6c-d77e-4e98-946b-2c389660074b

Co-authored-by: Kibana Machine <42973632+kibanamachine@users.noreply.github.com>
WafaaNasr pushed a commit to WafaaNasr/kibana that referenced this pull request Feb 6, 2024
@kpollich @kibanamachine @WafaaNasr
[Fleet] Fix reserved keys for Elasticsearch output YAML box (elastic#…
8716f6b 
…175901)

## Summary

Fixes elastic#175892

Updates reserved keywords that trigger the `Custom` preset for the
Elasticsearch output.



https://github.com/elastic/kibana/assets/6766512/dda60f6c-d77e-4e98-946b-2c389660074b

Co-authored-by: Kibana Machine <42973632+kibanamachine@users.noreply.github.com>
CoenWarmer pushed a commit to CoenWarmer/kibana that referenced this pull request Feb 15, 2024
@kpollich @kibanamachine @CoenWarmer
[Fleet] Fix reserved keys for Elasticsearch output YAML box (elastic#…
267a456 
…175901)

## Summary

Fixes elastic#175892

Updates reserved keywords that trigger the `Custom` preset for the
Elasticsearch output.



https://github.com/elastic/kibana/assets/6766512/dda60f6c-d77e-4e98-946b-2c389660074b

Co-authored-by: Kibana Machine <42973632+kibanamachine@users.noreply.github.com>
CoenWarmer pushed a commit to CoenWarmer/kibana that referenced this pull request Feb 15, 2024
@kpollich @kibanamachine @CoenWarmer
[Fleet] Fix reserved keys for Elasticsearch output YAML box (elastic#…
ced6d0e 
…175901)

## Summary

Fixes elastic#175892

Updates reserved keywords that trigger the `Custom` preset for the
Elasticsearch output.



https://github.com/elastic/kibana/assets/6766512/dda60f6c-d77e-4e98-946b-2c389660074b

Co-authored-by: Kibana Machine <42973632+kibanamachine@users.noreply.github.com>
fkanout pushed a commit to fkanout/kibana that referenced this pull request Mar 4, 2024
@kpollich @kibanamachine @fkanout
[Fleet] Fix reserved keys for Elasticsearch output YAML box (elastic#…
ff44d29 
…175901)

## Summary

Fixes elastic#175892

Updates reserved keywords that trigger the `Custom` preset for the
Elasticsearch output.



https://github.com/elastic/kibana/assets/6766512/dda60f6c-d77e-4e98-946b-2c389660074b

Co-authored-by: Kibana Machine <42973632+kibanamachine@users.noreply.github.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@nchaulet nchaulet nchaulet approved these changes

Assignees

@kpollich kpollich

Labels
backport:prev-minor Backport to (8.x) the previous minor version (i.e. one version back from main) release_note:fix Team:Fleet Team label for Observability Data Collection Fleet team v8.12.1 v8.13.0
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

[Fleet] ES output presets config keyword should be changed
6 participants
@kpollich @elasticmachine @apmmachine @kibana-ci @kibanamachine @nchaulet