Skip to content

[Fleet] Fix bugs w/ synthetic source toggle#143097

Merged
kpollich merged 3 commits intoelastic:mainfrom
kpollich:143094-fix-synthetic-source-toggle
Oct 12, 2022
Merged

[Fleet] Fix bugs w/ synthetic source toggle#143097
kpollich merged 3 commits intoelastic:mainfrom
kpollich:143094-fix-synthetic-source-toggle

Conversation

@kpollich
Copy link
Copy Markdown
Member

@kpollich kpollich commented Oct 11, 2022 •
edited by kibanamachine
Loading

Summary

Closes #143094

  • Ensure independent enabled/disabled state across all data streams for synthetic source toggle
  • Always display advanced options section, even on "policy create" and when there are no advanced options present in the package to ensure experimental settings are presented

Backporting to 8.5.x since #140132 landed in 8.5.

Screen recording of independent toggle state

Screen.Recording.2022-10-11.at.10.59.29.AM.mov

@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 labels Oct 11, 2022
@kpollich kpollich self-assigned this Oct 11, 2022
@kpollich kpollich requested a review from a team as a code owner October 11, 2022 15:04
@elasticmachine
Copy link
Copy Markdown
Contributor

elasticmachine commented Oct 11, 2022

Pinging @elastic/fleet (Team:Fleet)

kpollich
kpollich commented Oct 11, 2022
View reviewed changes
...olicy/create_package_policy_page/components/steps/components/package_policy_input_stream.tsx
<Fragment>
<EuiFlexItem>
<EuiFlexGroup justifyContent="spaceBetween" alignItems="center">
{/* Advanced section - always shown since we display experimental indexing settings here */}
Copy link
Copy Markdown
Member Author

@kpollich kpollich Oct 11, 2022

Choose a reason for hiding this comment

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

Most of the diff here is whitespace only, so recommend viewing with GitHub's "ignore whitespace" option

@kpollich
Copy link
Copy Markdown
Member Author

kpollich commented Oct 11, 2022

@elasticmachine merge upstream

@kibanamachine kibanamachine requested a review from a team as a code owner October 11, 2022 16:23
@kibana-ci
Copy link
Copy Markdown

kibana-ci commented Oct 11, 2022

💚 Build Succeeded

Metrics [docs]

Async chunks

Total size of all lazy-loaded chunks that will be downloaded as the user navigates the app

id before after diff
fleet 918.3KB 918.5KB +176.0B

History

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

cc @kpollich

legrego
legrego approved these changes Oct 11, 2022
View reviewed changes
Copy link
Copy Markdown
Member

@legrego legrego left a comment

Choose a reason for hiding this comment

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

Import reformatting in x-pack/plugins/security/public/management/roles/edit_role/privileges/kibana/feature_table/feature_table.tsx LGTM

juliaElastic
juliaElastic approved these changes Oct 12, 2022
View reviewed changes
Copy link
Copy Markdown
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

@kpollich kpollich merged commit 5c3e256 into elastic:main Oct 12, 2022
@kpollich kpollich deleted the 143094-fix-synthetic-source-toggle branch October 12, 2022 11:40
kibanamachine added a commit to kibanamachine/kibana that referenced this pull request Oct 12, 2022
@kpollich @kibanamachine
[Fleet] Fix bugs w/ synthetic source toggle (elastic#143097)
0335d82 
* Fix bugs w/ synthetic source toggle

* [CI] Auto-commit changed files from 'node scripts/precommit_hook.js --ref HEAD~1..HEAD --fix'

Co-authored-by: Kibana Machine <42973632+kibanamachine@users.noreply.github.com>
(cherry picked from commit 5c3e256)
@kibanamachine kibanamachine mentioned this pull request Oct 12, 2022
Merged
@kibanamachine
Copy link
Copy Markdown
Contributor

kibanamachine commented Oct 12, 2022

💚 All backports created successfully

Status Branch Result
✅ 8.5

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 Oct 12, 2022
@kibanamachine @kpollich
[Fleet] Fix bugs w/ synthetic source toggle (#143097) (#143182)
5cbd972 
* Fix bugs w/ synthetic source toggle

* [CI] Auto-commit changed files from 'node scripts/precommit_hook.js --ref HEAD~1..HEAD --fix'

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

Co-authored-by: Kyle Pollich <kyle.pollich@elastic.co>
@jen-huang jen-huang mentioned this pull request Apr 6, 2023
Merged
jen-huang added a commit that referenced this pull request Apr 11, 2023
@jen-huang
[Fleet] Fix "Advanced options" toggle in policy editor always showing (…
2636262 
…#154612)

## Summary

_Please review with [whitespace
ignore](https://github.com/elastic/kibana/pull/154612/files?diff=unified&w=1)!_

In #143097 the conditional for showing `Advanced options` was removed as
we introduced experimental indexing toggles which are always shown.
However in #148418 (8.7) we put the indexing toggles behind a feature
flag. This caused the `Advanced options` toggle to always be shown
regardless of there is any content underneath. I spotted this while
testing something unrelated.

This PR fixes that by adding a condition back that is based on
aggregating the conditionals of everything underneath (existence of
advanced vars, whether pipelines & mappings are shown, and if
experimental indexing toggles are enabled).
jen-huang added a commit to jen-huang/kibana that referenced this pull request Apr 11, 2023
@jen-huang
[Fleet] Fix "Advanced options" toggle in policy editor always showing (…
c03d9dc 
…elastic#154612)

## Summary

_Please review with [whitespace
ignore](https://github.com/elastic/kibana/pull/154612/files?diff=unified&w=1)!_

In elastic#143097 the conditional for showing `Advanced options` was removed as
we introduced experimental indexing toggles which are always shown.
However in elastic#148418 (8.7) we put the indexing toggles behind a feature
flag. This caused the `Advanced options` toggle to always be shown
regardless of there is any content underneath. I spotted this while
testing something unrelated.

This PR fixes that by adding a condition back that is based on
aggregating the conditionals of everything underneath (existence of
advanced vars, whether pipelines & mappings are shown, and if
experimental indexing toggles are enabled).

(cherry picked from commit 2636262)

# Conflicts:
#	x-pack/plugins/fleet/public/applications/fleet/sections/agent_policy/create_package_policy_page/components/steps/components/package_policy_input_stream.tsx
jen-huang added a commit that referenced this pull request Apr 11, 2023
@jen-huang @kibanamachine
[8.7] [Fleet] Fix "Advanced options" toggle in policy editor always s…
89705e8 
…howing (#154612) (#154784)

# Backport

This will backport the following commits from `main` to `8.7`:
- [[Fleet] Fix "Advanced options" toggle in policy editor always showing
(#154612)](#154612)

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

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

<!--BACKPORT [{"author":{"name":"Jen
Huang","email":"its.jenetic@gmail.com"},"sourceCommit":{"committedDate":"2023-04-11T18:32:05Z","message":"[Fleet]
Fix \"Advanced options\" toggle in policy editor always showing
(#154612)\n\n## Summary\r\n\r\n_Please review with
[whitespace\r\nignore](https://github.com/elastic/kibana/pull/154612/files?diff=unified&w=1)!_\r\n\r\nIn
#143097 the conditional for showing `Advanced options` was removed
as\r\nwe introduced experimental indexing toggles which are always
shown.\r\nHowever in #148418 (8.7) we put the indexing toggles behind a
feature\r\nflag. This caused the `Advanced options` toggle to always be
shown\r\nregardless of there is any content underneath. I spotted this
while\r\ntesting something unrelated.\r\n\r\nThis PR fixes that by
adding a condition back that is based on\r\naggregating the conditionals
of everything underneath (existence of\r\nadvanced vars, whether
pipelines & mappings are shown, and if\r\nexperimental indexing toggles
are
enabled).","sha":"2636262e093f188e4937d192d302607eeaafff85","branchLabelMapping":{"^v8.8.0$":"main","^v(\\d+).(\\d+).\\d+$":"$1.$2"}},"sourcePullRequest":{"labels":["release_note:fix","Team:Fleet","backport:prev-minor","v8.8.0"],"number":154612,"url":"https://github.com/elastic/kibana/pull/154612","mergeCommit":{"message":"[Fleet]
Fix \"Advanced options\" toggle in policy editor always showing
(#154612)\n\n## Summary\r\n\r\n_Please review with
[whitespace\r\nignore](https://github.com/elastic/kibana/pull/154612/files?diff=unified&w=1)!_\r\n\r\nIn
#143097 the conditional for showing `Advanced options` was removed
as\r\nwe introduced experimental indexing toggles which are always
shown.\r\nHowever in #148418 (8.7) we put the indexing toggles behind a
feature\r\nflag. This caused the `Advanced options` toggle to always be
shown\r\nregardless of there is any content underneath. I spotted this
while\r\ntesting something unrelated.\r\n\r\nThis PR fixes that by
adding a condition back that is based on\r\naggregating the conditionals
of everything underneath (existence of\r\nadvanced vars, whether
pipelines & mappings are shown, and if\r\nexperimental indexing toggles
are
enabled).","sha":"2636262e093f188e4937d192d302607eeaafff85"}},"sourceBranch":"main","suggestedTargetBranches":[],"targetPullRequestStates":[{"branch":"main","label":"v8.8.0","labelRegex":"^v8.8.0$","isSourceBranch":true,"state":"MERGED","url":"https://github.com/elastic/kibana/pull/154612","number":154612,"mergeCommit":{"message":"[Fleet]
Fix \"Advanced options\" toggle in policy editor always showing
(#154612)\n\n## Summary\r\n\r\n_Please review with
[whitespace\r\nignore](https://github.com/elastic/kibana/pull/154612/files?diff=unified&w=1)!_\r\n\r\nIn
#143097 the conditional for showing `Advanced options` was removed
as\r\nwe introduced experimental indexing toggles which are always
shown.\r\nHowever in #148418 (8.7) we put the indexing toggles behind a
feature\r\nflag. This caused the `Advanced options` toggle to always be
shown\r\nregardless of there is any content underneath. I spotted this
while\r\ntesting something unrelated.\r\n\r\nThis PR fixes that by
adding a condition back that is based on\r\naggregating the conditionals
of everything underneath (existence of\r\nadvanced vars, whether
pipelines & mappings are shown, and if\r\nexperimental indexing toggles
are enabled).","sha":"2636262e093f188e4937d192d302607eeaafff85"}}]}]
BACKPORT-->

---------

Co-authored-by: kibanamachine <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

@legrego legrego legrego approved these changes

@juliaElastic juliaElastic juliaElastic approved these changes

Assignees

@kpollich kpollich

Labels

release_note:skip Skip the PR/issue when compiling release notes Team:Fleet Team label for Observability Data Collection Fleet team v8.5.0 v8.6.0

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

[Fleet] Synthetic source toggle does not appear for data streams without advanced settings + toggling behavior is broken

6 participants

@kpollich @elasticmachine @kibana-ci @kibanamachine @legrego @juliaElastic