Skip to content

[Fleet] Disable FQDN selector by default#152592

Merged
hop-dev merged 2 commits intoelastic:mainfrom
hop-dev:disable-fqdn-mode
Mar 2, 2023
Merged

[Fleet] Disable FQDN selector by default#152592
hop-dev merged 2 commits intoelastic:mainfrom
hop-dev:disable-fqdn-mode

Conversation

@hop-dev
Copy link
Copy Markdown
Contributor

@hop-dev hop-dev commented Mar 2, 2023

Summary

Hide the FQDN selector unless experimental feature is enabled. This selector was added as part of #149059

To enable this experimental feature either on the command line or in kibana config use:
--xpack.fleet.enableExperimental.0=agentFqdnMode

xpack.fleet.enableExperimental: 
    - agentFqdnMode

Before:

Screenshot 2023-03-02 at 16 15 39

After:

Screenshot 2023-03-02 at 16 14 52

@hop-dev hop-dev added release_note:skip Skip the PR/issue when compiling release notes Team:Fleet Team label for Observability Data Collection Fleet team v8.7.0 v8.8.0 labels Mar 2, 2023
@hop-dev hop-dev self-assigned this Mar 2, 2023
@hop-dev hop-dev requested a review from a team as a code owner March 2, 2023 16:19
@elasticmachine
Copy link
Copy Markdown
Contributor

Pinging @elastic/fleet (Team:Fleet)

@hop-dev
Copy link
Copy Markdown
Contributor Author

hop-dev commented Mar 2, 2023

@elasticmachine merge upstream

Copy link
Copy Markdown
Contributor

@jlind23 jlind23 left a comment

Choose a reason for hiding this comment

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

Thanks!

@hop-dev hop-dev enabled auto-merge (squash) March 2, 2023 16:23
@kibana-ci
Copy link
Copy Markdown

💚 Build Succeeded

Metrics [docs]

Unknown metric groups

ESLint disabled line counts

id before after diff
securitySolution 428 430 +2

Total ESLint disabled count

id before after diff
securitySolution 506 508 +2

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

cc @hop-dev

@hop-dev hop-dev merged commit de482cb into elastic:main Mar 2, 2023
@kibanamachine
Copy link
Copy Markdown
Contributor

💔 All backports failed

Status Branch Result
8.7 Backport failed because of merge conflicts

Manual backport

To create the backport manually run:

node scripts/backport --pr 152592

Questions ?

Please refer to the Backport tool documentation

@hop-dev
Copy link
Copy Markdown
Contributor Author

hop-dev commented Mar 6, 2023

💚 All backports created successfully

Status Branch Result
8.7

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

Questions ?

Please refer to the Backport tool documentation

hop-dev added a commit to hop-dev/kibana that referenced this pull request Mar 6, 2023
## Summary

Hide the FQDN selector unless experimental feature is enabled. This
selector was added as part of
elastic#149059

### Before:
<img width="1073" alt="Screenshot 2023-03-02 at 16 15 39"
src="https://user-images.githubusercontent.com/3315046/222487164-75024608-b0f1-419d-bbb0-299bad55cae1.png">

### After:
<img width="1112" alt="Screenshot 2023-03-02 at 16 14 52"
src="https://user-images.githubusercontent.com/3315046/222487206-c58f76eb-6977-4d3a-908d-3b72b0f901fa.png">

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

# Conflicts:
#	x-pack/plugins/fleet/common/experimental_features.ts
hop-dev added a commit that referenced this pull request Mar 6, 2023
# Backport

This will backport the following commits from `main` to `8.7`:
- [[Fleet] Disable FQDN selector by default
(#152592)](#152592)

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

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

<!--BACKPORT [{"author":{"name":"Mark
Hopkin","email":"mark.hopkin@elastic.co"},"sourceCommit":{"committedDate":"2023-03-02T17:28:11Z","message":"[Fleet]
Disable FQDN selector by default (#152592)\n\n## Summary\r\n\r\nHide the
FQDN selector unless experimental feature is enabled. This\r\nselector
was added as part
of\r\nhttps://github.com//issues/149059\r\n\r\n###
Before:\r\n<img width=\"1073\" alt=\"Screenshot 2023-03-02 at 16 15
39\"\r\nsrc=\"https://user-images.githubusercontent.com/3315046/222487164-75024608-b0f1-419d-bbb0-299bad55cae1.png\">\r\n\r\n###
After:\r\n<img width=\"1112\" alt=\"Screenshot 2023-03-02 at 16 14
52\"\r\nsrc=\"https://user-images.githubusercontent.com/3315046/222487206-c58f76eb-6977-4d3a-908d-3b72b0f901fa.png\">\r\n\r\nCo-authored-by:
Kibana Machine
<42973632+kibanamachine@users.noreply.github.com>","sha":"de482cbc9ebce0f6d424e90b3e98cffd9979e707","branchLabelMapping":{"^v8.8.0$":"main","^v(\\d+).(\\d+).\\d+$":"$1.$2"}},"sourcePullRequest":{"labels":["release_note:skip","Team:Fleet","v8.7.0","v8.8.0"],"number":152592,"url":"https://github.com/elastic/kibana/pull/152592","mergeCommit":{"message":"[Fleet]
Disable FQDN selector by default (#152592)\n\n## Summary\r\n\r\nHide the
FQDN selector unless experimental feature is enabled. This\r\nselector
was added as part
of\r\nhttps://github.com//issues/149059\r\n\r\n###
Before:\r\n<img width=\"1073\" alt=\"Screenshot 2023-03-02 at 16 15
39\"\r\nsrc=\"https://user-images.githubusercontent.com/3315046/222487164-75024608-b0f1-419d-bbb0-299bad55cae1.png\">\r\n\r\n###
After:\r\n<img width=\"1112\" alt=\"Screenshot 2023-03-02 at 16 14
52\"\r\nsrc=\"https://user-images.githubusercontent.com/3315046/222487206-c58f76eb-6977-4d3a-908d-3b72b0f901fa.png\">\r\n\r\nCo-authored-by:
Kibana Machine
<42973632+kibanamachine@users.noreply.github.com>","sha":"de482cbc9ebce0f6d424e90b3e98cffd9979e707"}},"sourceBranch":"main","suggestedTargetBranches":["8.7"],"targetPullRequestStates":[{"branch":"8.7","label":"v8.7.0","labelRegex":"^v(\\d+).(\\d+).\\d+$","isSourceBranch":false,"state":"NOT_CREATED"},{"branch":"main","label":"v8.8.0","labelRegex":"^v8.8.0$","isSourceBranch":true,"state":"MERGED","url":"https://github.com/elastic/kibana/pull/152592","number":152592,"mergeCommit":{"message":"[Fleet]
Disable FQDN selector by default (#152592)\n\n## Summary\r\n\r\nHide the
FQDN selector unless experimental feature is enabled. This\r\nselector
was added as part
of\r\nhttps://github.com//issues/149059\r\n\r\n###
Before:\r\n<img width=\"1073\" alt=\"Screenshot 2023-03-02 at 16 15
39\"\r\nsrc=\"https://user-images.githubusercontent.com/3315046/222487164-75024608-b0f1-419d-bbb0-299bad55cae1.png\">\r\n\r\n###
After:\r\n<img width=\"1112\" alt=\"Screenshot 2023-03-02 at 16 14
52\"\r\nsrc=\"https://user-images.githubusercontent.com/3315046/222487206-c58f76eb-6977-4d3a-908d-3b72b0f901fa.png\">\r\n\r\nCo-authored-by:
Kibana Machine
<42973632+kibanamachine@users.noreply.github.com>","sha":"de482cbc9ebce0f6d424e90b3e98cffd9979e707"}}]}]
BACKPORT-->
@hop-dev hop-dev deleted the disable-fqdn-mode branch March 8, 2023 13:58
bmorelli25 pushed a commit to bmorelli25/kibana that referenced this pull request Mar 10, 2023
## Summary

Hide the FQDN selector unless experimental feature is enabled. This
selector was added as part of
elastic#149059

### Before:
<img width="1073" alt="Screenshot 2023-03-02 at 16 15 39"
src="https://user-images.githubusercontent.com/3315046/222487164-75024608-b0f1-419d-bbb0-299bad55cae1.png">

### After:
<img width="1112" alt="Screenshot 2023-03-02 at 16 14 52"
src="https://user-images.githubusercontent.com/3315046/222487206-c58f76eb-6977-4d3a-908d-3b72b0f901fa.png">

Co-authored-by: Kibana Machine <42973632+kibanamachine@users.noreply.github.com>
hop-dev added a commit that referenced this pull request Apr 6, 2023
…ture flag references (#154563)

## Summary

This pull request enables the feature flag which hid the host name
format selector in agent policies.

The host name selector can be used in any agent policy, go to the agent
policy settings tab then scroll to the bottom.

Feature flag was disabled by default in
#152592

Enabling the feature flag by default also means we can remove references
to it in the code now. (we keep the flag reference so that nobodies
config is invalidated)

**Before:**
<img width="896" alt="Screenshot 2023-04-06 at 15 34 57"
src="https://user-images.githubusercontent.com/3315046/230411132-364a1b21-3007-4f20-af25-5e6208786120.png">

**After:**
<img width="925" alt="Screenshot 2023-04-06 at 15 31 53"
src="https://user-images.githubusercontent.com/3315046/230410428-879dc975-fb27-434e-bc91-d43185361b71.png">
hop-dev added a commit to hop-dev/kibana that referenced this pull request Apr 6, 2023
…ture flag references (elastic#154563)

## Summary

This pull request enables the feature flag which hid the host name
format selector in agent policies.

The host name selector can be used in any agent policy, go to the agent
policy settings tab then scroll to the bottom.

Feature flag was disabled by default in
elastic#152592

Enabling the feature flag by default also means we can remove references
to it in the code now. (we keep the flag reference so that nobodies
config is invalidated)

**Before:**
<img width="896" alt="Screenshot 2023-04-06 at 15 34 57"
src="https://user-images.githubusercontent.com/3315046/230411132-364a1b21-3007-4f20-af25-5e6208786120.png">

**After:**
<img width="925" alt="Screenshot 2023-04-06 at 15 31 53"
src="https://user-images.githubusercontent.com/3315046/230410428-879dc975-fb27-434e-bc91-d43185361b71.png">

(cherry picked from commit b9d38be)

# Conflicts:
#	x-pack/plugins/fleet/common/experimental_features.ts
hop-dev added a commit that referenced this pull request Apr 6, 2023
…DN feature flag references (#154563) (#154592)

# Backport

This will backport the following commits from `main` to `8.7`:
- [[Fleet] Enable Host name format selector by default + remove FQDN
feature flag references
(#154563)](#154563)

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

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

<!--BACKPORT [{"author":{"name":"Mark
Hopkin","email":"mark.hopkin@elastic.co"},"sourceCommit":{"committedDate":"2023-04-06T15:31:29Z","message":"[Fleet]
Enable Host name format selector by default + remove FQDN feature flag
references (#154563)\n\n## Summary\r\n\r\nThis pull request enables the
feature flag which hid the host name\r\nformat selector in agent
policies.\r\n\r\nThe host name selector can be used in any agent policy,
go to the agent\r\npolicy settings tab then scroll to the
bottom.\r\n\r\nFeature flag was disabled by default
in\r\nhttps://github.com//pull/152592\r\n\r\nEnabling the
feature flag by default also means we can remove references\r\nto it in
the code now. (we keep the flag reference so that nobodies\r\nconfig is
invalidated)\r\n\r\n**Before:**\r\n<img width=\"896\" alt=\"Screenshot
2023-04-06 at 15 34
57\"\r\nsrc=\"https://user-images.githubusercontent.com/3315046/230411132-364a1b21-3007-4f20-af25-5e6208786120.png\">\r\n\r\n**After:**\r\n<img
width=\"925\" alt=\"Screenshot 2023-04-06 at 15 31
53\"\r\nsrc=\"https://user-images.githubusercontent.com/3315046/230410428-879dc975-fb27-434e-bc91-d43185361b71.png\">","sha":"b9d38be8e28a0855662b84cbcb814484728a2f3e","branchLabelMapping":{"^v8.8.0$":"main","^v(\\d+).(\\d+).\\d+$":"$1.$2"}},"sourcePullRequest":{"labels":["release_note:enhancement","Team:Fleet","v8.8.0","v8.7.1"],"number":154563,"url":"https://github.com/elastic/kibana/pull/154563","mergeCommit":{"message":"[Fleet]
Enable Host name format selector by default + remove FQDN feature flag
references (#154563)\n\n## Summary\r\n\r\nThis pull request enables the
feature flag which hid the host name\r\nformat selector in agent
policies.\r\n\r\nThe host name selector can be used in any agent policy,
go to the agent\r\npolicy settings tab then scroll to the
bottom.\r\n\r\nFeature flag was disabled by default
in\r\nhttps://github.com//pull/152592\r\n\r\nEnabling the
feature flag by default also means we can remove references\r\nto it in
the code now. (we keep the flag reference so that nobodies\r\nconfig is
invalidated)\r\n\r\n**Before:**\r\n<img width=\"896\" alt=\"Screenshot
2023-04-06 at 15 34
57\"\r\nsrc=\"https://user-images.githubusercontent.com/3315046/230411132-364a1b21-3007-4f20-af25-5e6208786120.png\">\r\n\r\n**After:**\r\n<img
width=\"925\" alt=\"Screenshot 2023-04-06 at 15 31
53\"\r\nsrc=\"https://user-images.githubusercontent.com/3315046/230410428-879dc975-fb27-434e-bc91-d43185361b71.png\">","sha":"b9d38be8e28a0855662b84cbcb814484728a2f3e"}},"sourceBranch":"main","suggestedTargetBranches":["8.7"],"targetPullRequestStates":[{"branch":"main","label":"v8.8.0","labelRegex":"^v8.8.0$","isSourceBranch":true,"state":"MERGED","url":"https://github.com/elastic/kibana/pull/154563","number":154563,"mergeCommit":{"message":"[Fleet]
Enable Host name format selector by default + remove FQDN feature flag
references (#154563)\n\n## Summary\r\n\r\nThis pull request enables the
feature flag which hid the host name\r\nformat selector in agent
policies.\r\n\r\nThe host name selector can be used in any agent policy,
go to the agent\r\npolicy settings tab then scroll to the
bottom.\r\n\r\nFeature flag was disabled by default
in\r\nhttps://github.com//pull/152592\r\n\r\nEnabling the
feature flag by default also means we can remove references\r\nto it in
the code now. (we keep the flag reference so that nobodies\r\nconfig is
invalidated)\r\n\r\n**Before:**\r\n<img width=\"896\" alt=\"Screenshot
2023-04-06 at 15 34
57\"\r\nsrc=\"https://user-images.githubusercontent.com/3315046/230411132-364a1b21-3007-4f20-af25-5e6208786120.png\">\r\n\r\n**After:**\r\n<img
width=\"925\" alt=\"Screenshot 2023-04-06 at 15 31
53\"\r\nsrc=\"https://user-images.githubusercontent.com/3315046/230410428-879dc975-fb27-434e-bc91-d43185361b71.png\">","sha":"b9d38be8e28a0855662b84cbcb814484728a2f3e"}},{"branch":"8.7","label":"v8.7.1","labelRegex":"^v(\\d+).(\\d+).\\d+$","isSourceBranch":false,"state":"NOT_CREATED"}]}]
BACKPORT-->
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

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

Projects

None yet

Development

Successfully merging this pull request may close these issues.

5 participants