[Fleet] Allow to install Kibana assets in multiple spaces #186620
There are no files selected for viewing
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
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
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
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
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
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
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
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
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
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -10,6 +10,8 @@ import { Redirect } from 'react-router-dom'; | |
| import { FormattedMessage } from '@kbn/i18n-react'; | ||
| import { EuiFlexGroup, EuiFlexItem, EuiLink, EuiSpacer, EuiTitle, EuiCallOut } from '@elastic/eui'; | ||
|
|
||
| import { ExperimentalFeaturesService } from '../../../../../../../services'; | ||
|
|
||
| import type { | ||
| EsAssetReference, | ||
| AssetSOObject, | ||
|
|
@@ -31,12 +33,11 @@ import { | |
| useAuthz, | ||
| useFleetStatus, | ||
| } from '../../../../../hooks'; | ||
| import { sendGetBulkAssets } from '../../../../../hooks'; | ||
|
|
||
| import { DeferredAssetsSection } from './deferred_assets_accordion'; | ||
| import { AssetsAccordion } from './assets_accordion'; | ||
| import { InstallKibanaAssetsButton } from './install_kibana_assets_button'; | ||
|
|
||
| interface AssetsPanelProps { | ||
| packageInfo: PackageInfo; | ||
|
|
@@ -50,6 +51,8 @@ export const AssetsPage = ({ packageInfo, refetchPackageInfo }: AssetsPanelProps | |
| const { docLinks } = useStartServices(); | ||
| const { spaceId } = useFleetStatus(); | ||
|
|
||
| const { useSpaceAwareness } = ExperimentalFeaturesService.get(); | ||
|
|
||
| const customAssetsExtension = useUIExtension(packageInfo.name, 'package-detail-assets'); | ||
|
|
||
| const canReadPackageSettings = useAuthz().integrations.readPackageInfo; | ||
|
|
@@ -62,23 +65,30 @@ export const AssetsPage = ({ packageInfo, refetchPackageInfo }: AssetsPanelProps | |
| 'installationInfo' in packageInfo ? packageInfo.installationInfo : undefined; | ||
|
|
||
| const installedSpaceId = pkgInstallationInfo?.installed_kibana_space_id; | ||
| const assetsInstalledInCurrentSpace = | ||
| !installedSpaceId || | ||
| installedSpaceId === spaceId || | ||
| pkgInstallationInfo?.additional_spaces_installed_kibana?.[spaceId || 'default']; | ||
| const [assetSavedObjectsByType, setAssetsSavedObjectsByType] = useState< | ||
| Record<string, Record<string, SimpleSOAssetType & { appLink?: string }>> | ||
| >({}); | ||
| const [deferredInstallations, setDeferredInstallations] = useState<EsAssetReference[]>(); | ||
|
|
||
| const kibanaAssets = useMemo(() => { | ||
| return !installedSpaceId || installedSpaceId === spaceId | ||
| ? pkgInstallationInfo?.installed_kibana || [] | ||
| : pkgInstallationInfo?.additional_spaces_installed_kibana?.[spaceId || 'default'] || []; | ||
| }, [ | ||
| installedSpaceId, | ||
| spaceId, | ||
| pkgInstallationInfo?.installed_kibana, | ||
| pkgInstallationInfo?.additional_spaces_installed_kibana, | ||
| ]); | ||
| const pkgAssets = useMemo( | ||
| () => [...kibanaAssets, ...(pkgInstallationInfo?.installed_es || [])], | ||
| [kibanaAssets, pkgInstallationInfo?.installed_es] | ||
| ); | ||
|
|
||
| const pkgAssetsByType = useMemo( | ||
| () => | ||
| pkgAssets.reduce((acc, asset) => { | ||
|
|
@@ -231,6 +241,13 @@ export const AssetsPage = ({ packageInfo, refetchPackageInfo }: AssetsPanelProps | |
| }} | ||
|
There was a problem hiding this comment. is there already a docs issue to update https://www.elastic.co/guide/en/fleet/current/install-uninstall-integration-assets.html once this feature is enabled by default? if not, let's go ahead and create a placeholder issue There was a problem hiding this comment. No there is not, I will create one for the whole space awareness project as there is probably more than this to document. |
||
| /> | ||
| </p> | ||
| {useSpaceAwareness ? ( | ||
| <InstallKibanaAssetsButton | ||
| installInfo={pkgInstallationInfo} | ||
| title={packageInfo.title} | ||
| onSuccess={forceRefreshAssets} | ||
| /> | ||
| ) : null} | ||
| </EuiCallOut> | ||
|
|
||
| <EuiSpacer size="m" /> | ||
|
|
||
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,76 @@ | ||
| /* | ||
| * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one | ||
| * or more contributor license agreements. Licensed under the Elastic License | ||
| * 2.0; you may not use this file except in compliance with the Elastic License | ||
| * 2.0. | ||
| */ | ||
|
|
||
| import { EuiButton } from '@elastic/eui'; | ||
| import React, { useCallback } from 'react'; | ||
| import { FormattedMessage } from '@kbn/i18n-react'; | ||
| import { i18n } from '@kbn/i18n'; | ||
|
|
||
| import type { InstallationInfo } from '../../../../../../../../common/types'; | ||
| import { useAuthz, useInstallKibanaAssetsMutation, useStartServices } from '../../../../../hooks'; | ||
|
|
||
| interface InstallKibanaAssetsButtonProps { | ||
| title: string; | ||
| installInfo: InstallationInfo; | ||
| onSuccess?: () => void; | ||
| } | ||
|
|
||
| export function InstallKibanaAssetsButton({ | ||
| installInfo, | ||
| title, | ||
| onSuccess, | ||
| }: InstallKibanaAssetsButtonProps) { | ||
| const { notifications } = useStartServices(); | ||
| const { name, version } = installInfo; | ||
| const canInstallPackages = useAuthz().integrations.installPackages; | ||
| const { mutateAsync, isLoading } = useInstallKibanaAssetsMutation(); | ||
|
|
||
| const handleClickInstall = useCallback(async () => { | ||
| try { | ||
| await mutateAsync({ | ||
| pkgName: name, | ||
| pkgVersion: version, | ||
| }); | ||
| if (onSuccess) { | ||
| await onSuccess(); | ||
| } | ||
| } catch (err) { | ||
| notifications.toasts.addError(err, { | ||
| title: i18n.translate('xpack.fleet.fleetServerSetup.kibanaInstallAssetsErrorTitle', { | ||
| defaultMessage: 'Error installing kibana assets', | ||
nchaulet marked this conversation as resolved.
Show resolved
Hide resolved
|
||
| }), | ||
| }); | ||
| } | ||
| }, [mutateAsync, onSuccess, name, version, notifications.toasts]); | ||
|
|
||
| return ( | ||
| <EuiButton | ||
| disabled={!canInstallPackages} | ||
| iconType="importAction" | ||
| isLoading={isLoading} | ||
| onClick={handleClickInstall} | ||
| > | ||
| {isLoading ? ( | ||
| <FormattedMessage | ||
| id="xpack.fleet.integrations.installPackage.kibanaAssetsInstallingButtonLabel" | ||
| defaultMessage="Installing {title} kibana assets in current space" | ||
| values={{ | ||
| title, | ||
| }} | ||
| /> | ||
| ) : ( | ||
| <FormattedMessage | ||
| id="xpack.fleet.integrations.installPackage.kibanaAssetsInstallButtonLabel" | ||
| defaultMessage="Install {title} kibana assets in current space" | ||
nchaulet marked this conversation as resolved.
Show resolved
Hide resolved
|
||
| values={{ | ||
| title, | ||
| }} | ||
| /> | ||
| )} | ||
| </EuiButton> | ||
| ); | ||
| } | ||
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
Oops, something went wrong.
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.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Not really related to that feature, but it allow to add some type safety to
allowedExperimentalValues, and fix the autocompletion that was bothering me