[Fleet] Only show agent dashboard links if there is more than one non-server agent and if the dashboards exist #164469
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
hop-dev
added
release_note:fix
Team:Fleet
|
Pinging @elastic/fleet (Team:Fleet) |
🤖 GitHub commentsExpand to view the GitHub comments
Just comment with:
|
hop-dev
commented
Aug 22, 2023
| import { useDashboardLocator } from '../../../../hooks'; | ||
| import { useDashboardLocator, useStartServices } from '../../../../hooks'; | ||
|
|
||
| const useDashboardExists = (dashboardId: string) => { |
There was a problem hiding this comment.
as this hook is only used here I kept it in the same file, happy to move it to its own file?
There was a problem hiding this comment.
I think it can stay in this file and can be moved if we need to reuse it elsewhere
hop-dev
commented
Aug 22, 2023
| @@ -94,6 +96,8 @@ export const SearchAndFilterBar: React.FunctionComponent<SearchAndFilterBarProps | |||
| }) => { | |||
| const { euiTheme } = useEuiTheme(); | |||
| const { isFleetServerStandalone } = useFleetServerStandalone(); | |||
| const { isFirstTimeAgentUser, isLoading: isFirstTimeAgentUserLoading } = | |||
There was a problem hiding this comment.
isFirstTimeAgentUser checks if the user has at least one non-fleet-server agent
criamico
approved these changes
Aug 22, 2023
| const fetchDashboard = async () => { | ||
| try { | ||
| const findDashboardsService = await dashboardPlugin.findDashboardsService(); | ||
| const [dashboard] = await findDashboardsService.findByIds([dashboardId]); |
There was a problem hiding this comment.
Good idea to use the dashboard service!
| import { useDashboardLocator } from '../../../../hooks'; | ||
| import { useDashboardLocator, useStartServices } from '../../../../hooks'; | ||
|
|
||
| const useDashboardExists = (dashboardId: string) => { |
There was a problem hiding this comment.
I think it can stay in this file and can be moved if we need to reuse it elsewhere
💛 Build succeeded, but was flaky
Failed CI StepsMetrics [docs]Public APIs missing comments
Async chunks
History
To update your PR or re-run it, just comment with: cc @hop-dev |
💚 All backports created successfully
Note: Successful backport PRs will be merged automatically after passing CI. Questions ?Please refer to the Backport tool documentation |
kibanamachine
pushed a commit
to kibanamachine/kibana
that referenced
this pull request
Aug 23, 2023
…-server agent and if the dashboards exist (elastic#164469) ## Summary Closes elastic#161827 These buttons were showing in cloud when there was only the cloud agent added: <img width="647" alt="Screenshot 2023-08-22 at 16 18 51" src="https://github.com/elastic/kibana/assets/3315046/baaff9b9-17fc-49b5-bad9-980f91a5ae15"> The ingest dashboard links will now only show if: - the user has one agent that is not part of a policy containing fleet server (I have re-used an existing hook we have to check this here) - the agent ingest metrics dashaboard exists in the current space Test Scenarios 1. Setup fleet with ONLY a fleet server connected, the dashboard links should not show 2. Setup fleet with fleet server and another non-fleet server agent, the dashboard links should show 3. With the same setup as test case 2, now create another space, visit fleet in the new space, the links should not show as the dashboards are not installed in the current space. ### Checklist Delete any items that are not applicable to this PR. - [x] Any text added follows [EUI's writing guidelines](https://elastic.github.io/eui/#/guidelines/writing), uses sentence case text and includes [i18n support](https://github.com/elastic/kibana/blob/main/packages/kbn-i18n/README.md) - [x] Any UI touched in this PR is usable by keyboard only (learn more about [keyboard accessibility](https://webaim.org/techniques/keyboard/)) - [x] Any UI touched in this PR does not create any new axe failures (run axe in browser: [FF](https://addons.mozilla.org/en-US/firefox/addon/axe-devtools/), [Chrome](https://chrome.google.com/webstore/detail/axe-web-accessibility-tes/lhdoppojpmngadmnindnejefpokejbdd?hl=en-US)) - [x] If a plugin configuration key changed, check if it needs to be allowlisted in the cloud and added to the [docker list](https://github.com/elastic/kibana/blob/main/src/dev/build/tasks/os_packages/docker_generator/resources/base/bin/kibana-docker) - [x] This renders correctly on smaller devices using a responsive layout. (You can test this [in your browser](https://www.browserstack.com/guide/responsive-testing-on-local-server)) - [x] This was checked for [cross-browser compatibility](https://www.elastic.co/support/matrix#matrix_browsers) --------- Co-authored-by: kibanamachine <[email protected]> (cherry picked from commit 805c974)
kibanamachine
added a commit
that referenced
this pull request
Aug 23, 2023
…one non-server agent and if the dashboards exist (#164469) (#164539) # Backport This will backport the following commits from `main` to `8.10`: - [[Fleet] Only show agent dashboard links if there is more than one non-server agent and if the dashboards exist (#164469)](#164469) <!--- Backport version: 8.9.7 --> ### Questions ? Please refer to the [Backport tool documentation](https://github.com/sqren/backport) <!--BACKPORT [{"author":{"name":"Mark Hopkin","email":"[email protected]"},"sourceCommit":{"committedDate":"2023-08-23T08:53:49Z","message":"[Fleet] Only show agent dashboard links if there is more than one non-server agent and if the dashboards exist (#164469)\n\n## Summary\r\n\r\nCloses #161827\r\n\r\nThese buttons were showing in cloud when there was only the cloud agent\r\nadded:\r\n\r\n<img width=\"647\" alt=\"Screenshot 2023-08-22 at 16 18 51\"\r\nsrc=\"https://github.com/elastic/kibana/assets/3315046/baaff9b9-17fc-49b5-bad9-980f91a5ae15\">\r\n\r\nThe ingest dashboard links will now only show if:\r\n\r\n- the user has one agent that is not part of a policy containing fleet\r\nserver (I have re-used an existing hook we have to check this here)\r\n- the agent ingest metrics dashaboard exists in the current space\r\n\r\nTest Scenarios\r\n\r\n1. Setup fleet with ONLY a fleet server connected, the dashboard links\r\nshould not show\r\n2. Setup fleet with fleet server and another non-fleet server agent, the\r\ndashboard links should show\r\n3. With the same setup as test case 2, now create another space, visit\r\nfleet in the new space, the links should not show as the dashboards are\r\nnot installed in the current space.\r\n\r\n\r\n### Checklist\r\n\r\nDelete any items that are not applicable to this PR.\r\n\r\n- [x] Any text added follows [EUI's writing\r\nguidelines](https://elastic.github.io/eui/#/guidelines/writing), uses\r\nsentence case text and includes [i18n\r\nsupport](https://github.com/elastic/kibana/blob/main/packages/kbn-i18n/README.md)\r\n- [x] Any UI touched in this PR is usable by keyboard only (learn more\r\nabout [keyboard accessibility](https://webaim.org/techniques/keyboard/))\r\n- [x] Any UI touched in this PR does not create any new axe failures\r\n(run axe in browser:\r\n[FF](https://addons.mozilla.org/en-US/firefox/addon/axe-devtools/),\r\n[Chrome](https://chrome.google.com/webstore/detail/axe-web-accessibility-tes/lhdoppojpmngadmnindnejefpokejbdd?hl=en-US))\r\n- [x] If a plugin configuration key changed, check if it needs to be\r\nallowlisted in the cloud and added to the [docker\r\nlist](https://github.com/elastic/kibana/blob/main/src/dev/build/tasks/os_packages/docker_generator/resources/base/bin/kibana-docker)\r\n- [x] This renders correctly on smaller devices using a responsive\r\nlayout. (You can test this [in your\r\nbrowser](https://www.browserstack.com/guide/responsive-testing-on-local-server))\r\n- [x] This was checked for [cross-browser\r\ncompatibility](https://www.elastic.co/support/matrix#matrix_browsers)\r\n\r\n---------\r\n\r\nCo-authored-by: kibanamachine <[email protected]>","sha":"805c974ed0c6f30be9153734859e0a28fa95eae1","branchLabelMapping":{"^v8.11.0$":"main","^v(\\d+).(\\d+).\\d+$":"$1.$2"}},"sourcePullRequest":{"labels":["release_note:fix","Team:Fleet","backport:prev-minor","v8.11.0"],"number":164469,"url":"https://github.com/elastic/kibana/pull/164469","mergeCommit":{"message":"[Fleet] Only show agent dashboard links if there is more than one non-server agent and if the dashboards exist (#164469)\n\n## Summary\r\n\r\nCloses #161827\r\n\r\nThese buttons were showing in cloud when there was only the cloud agent\r\nadded:\r\n\r\n<img width=\"647\" alt=\"Screenshot 2023-08-22 at 16 18 51\"\r\nsrc=\"https://github.com/elastic/kibana/assets/3315046/baaff9b9-17fc-49b5-bad9-980f91a5ae15\">\r\n\r\nThe ingest dashboard links will now only show if:\r\n\r\n- the user has one agent that is not part of a policy containing fleet\r\nserver (I have re-used an existing hook we have to check this here)\r\n- the agent ingest metrics dashaboard exists in the current space\r\n\r\nTest Scenarios\r\n\r\n1. Setup fleet with ONLY a fleet server connected, the dashboard links\r\nshould not show\r\n2. Setup fleet with fleet server and another non-fleet server agent, the\r\ndashboard links should show\r\n3. With the same setup as test case 2, now create another space, visit\r\nfleet in the new space, the links should not show as the dashboards are\r\nnot installed in the current space.\r\n\r\n\r\n### Checklist\r\n\r\nDelete any items that are not applicable to this PR.\r\n\r\n- [x] Any text added follows [EUI's writing\r\nguidelines](https://elastic.github.io/eui/#/guidelines/writing), uses\r\nsentence case text and includes [i18n\r\nsupport](https://github.com/elastic/kibana/blob/main/packages/kbn-i18n/README.md)\r\n- [x] Any UI touched in this PR is usable by keyboard only (learn more\r\nabout [keyboard accessibility](https://webaim.org/techniques/keyboard/))\r\n- [x] Any UI touched in this PR does not create any new axe failures\r\n(run axe in browser:\r\n[FF](https://addons.mozilla.org/en-US/firefox/addon/axe-devtools/),\r\n[Chrome](https://chrome.google.com/webstore/detail/axe-web-accessibility-tes/lhdoppojpmngadmnindnejefpokejbdd?hl=en-US))\r\n- [x] If a plugin configuration key changed, check if it needs to be\r\nallowlisted in the cloud and added to the [docker\r\nlist](https://github.com/elastic/kibana/blob/main/src/dev/build/tasks/os_packages/docker_generator/resources/base/bin/kibana-docker)\r\n- [x] This renders correctly on smaller devices using a responsive\r\nlayout. (You can test this [in your\r\nbrowser](https://www.browserstack.com/guide/responsive-testing-on-local-server))\r\n- [x] This was checked for [cross-browser\r\ncompatibility](https://www.elastic.co/support/matrix#matrix_browsers)\r\n\r\n---------\r\n\r\nCo-authored-by: kibanamachine <[email protected]>","sha":"805c974ed0c6f30be9153734859e0a28fa95eae1"}},"sourceBranch":"main","suggestedTargetBranches":[],"targetPullRequestStates":[{"branch":"main","label":"v8.11.0","labelRegex":"^v8.11.0$","isSourceBranch":true,"state":"MERGED","url":"https://github.com/elastic/kibana/pull/164469","number":164469,"mergeCommit":{"message":"[Fleet] Only show agent dashboard links if there is more than one non-server agent and if the dashboards exist (#164469)\n\n## Summary\r\n\r\nCloses #161827\r\n\r\nThese buttons were showing in cloud when there was only the cloud agent\r\nadded:\r\n\r\n<img width=\"647\" alt=\"Screenshot 2023-08-22 at 16 18 51\"\r\nsrc=\"https://github.com/elastic/kibana/assets/3315046/baaff9b9-17fc-49b5-bad9-980f91a5ae15\">\r\n\r\nThe ingest dashboard links will now only show if:\r\n\r\n- the user has one agent that is not part of a policy containing fleet\r\nserver (I have re-used an existing hook we have to check this here)\r\n- the agent ingest metrics dashaboard exists in the current space\r\n\r\nTest Scenarios\r\n\r\n1. Setup fleet with ONLY a fleet server connected, the dashboard links\r\nshould not show\r\n2. Setup fleet with fleet server and another non-fleet server agent, the\r\ndashboard links should show\r\n3. With the same setup as test case 2, now create another space, visit\r\nfleet in the new space, the links should not show as the dashboards are\r\nnot installed in the current space.\r\n\r\n\r\n### Checklist\r\n\r\nDelete any items that are not applicable to this PR.\r\n\r\n- [x] Any text added follows [EUI's writing\r\nguidelines](https://elastic.github.io/eui/#/guidelines/writing), uses\r\nsentence case text and includes [i18n\r\nsupport](https://github.com/elastic/kibana/blob/main/packages/kbn-i18n/README.md)\r\n- [x] Any UI touched in this PR is usable by keyboard only (learn more\r\nabout [keyboard accessibility](https://webaim.org/techniques/keyboard/))\r\n- [x] Any UI touched in this PR does not create any new axe failures\r\n(run axe in browser:\r\n[FF](https://addons.mozilla.org/en-US/firefox/addon/axe-devtools/),\r\n[Chrome](https://chrome.google.com/webstore/detail/axe-web-accessibility-tes/lhdoppojpmngadmnindnejefpokejbdd?hl=en-US))\r\n- [x] If a plugin configuration key changed, check if it needs to be\r\nallowlisted in the cloud and added to the [docker\r\nlist](https://github.com/elastic/kibana/blob/main/src/dev/build/tasks/os_packages/docker_generator/resources/base/bin/kibana-docker)\r\n- [x] This renders correctly on smaller devices using a responsive\r\nlayout. (You can test this [in your\r\nbrowser](https://www.browserstack.com/guide/responsive-testing-on-local-server))\r\n- [x] This was checked for [cross-browser\r\ncompatibility](https://www.elastic.co/support/matrix#matrix_browsers)\r\n\r\n---------\r\n\r\nCo-authored-by: kibanamachine <[email protected]>","sha":"805c974ed0c6f30be9153734859e0a28fa95eae1"}}]}] BACKPORT--> Co-authored-by: Mark Hopkin <[email protected]>
jloleysens
added a commit
to jloleysens/kibana
that referenced
this pull request
Aug 23, 2023
* main: (150 commits) Fixes unnecessary autocompletes on HTTP methods (elastic#163233) [Defend Workflows] Convert filterQuery to kql (elastic#161806) [Fleet] copy `inactivity_timeout` when duplicating agent policy (elastic#164544) Fix 7.17 forward compatibility with 8.2+ (elastic#164274) [ML] Fixes dark mode in flyouts and modals (elastic#164399) [Defend Workflows]Changes to policy settings are not persistent until a refresh (elastic#164403) [Security Solution][Endpoint] Fixes kibana crash when going back to policy details page (elastic#164329) Prepare the Security domain HTTP APIs for Serverless (elastic#162087) skip failing test suite (elastic#160986) [Security Solution] Fix flaky Event Filters test (elastic#164473) [EDR workflows] Osquery serverless tests (elastic#163795) [Fleet] Only show agent dashboard links if there is more than one non-server agent and if the dashboards exist (elastic#164469) [Chrome UI] Fix background color in serverless (elastic#164419) [DOCS] Saved objects - resolve import errors API (elastic#162825) Remove 'Create Rule' button from Rule Group page (elastic#164167) [Security Solution] expandable flyout - fix infinite loop in correlations (elastic#163450) [Remote Clusters] Update copy about port help text (elastic#164442) [api-docs] 2023-08-23 Daily api_docs build (elastic#164524) [data views] Disable scripted fields in serverless environment (elastic#163228) [Reporting] Fix - show diagnostic only when image reporting is enabled (elastic#164336) ...
This was referenced Oct 1, 2023
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
Closes #161827
These buttons were showing in cloud when there was only the cloud agent added:
The ingest dashboard links will now only show if:
Test Scenarios
Checklist
Delete any items that are not applicable to this PR.