Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -87,6 +87,8 @@ export const HIDDEN_API_REFERENCE_PACKAGES = [
FLEET_SYNTHETICS_PACKAGE,
];

export const EXCLUDED_FROM_PACKAGE_POLICY_COPY_PACKAGES = [FLEET_ENDPOINT_PACKAGE];

export const autoUpgradePoliciesPackages = [
FLEET_APM_PACKAGE,
FLEET_SYNTHETICS_PACKAGE,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -97,6 +97,24 @@ const breadcrumbGetters: {
}),
},
],
copy_integration: ({ policyName, policyId }) => [
BASE_BREADCRUMB,
{
href: pagePathGetters.policies()[1],
text: i18n.translate('xpack.fleet.breadcrumbs.policiesPageTitle', {
defaultMessage: 'Agent policies',
}),
},
{
href: pagePathGetters.policy_details({ policyId })[1],
text: policyName,
},
{
text: i18n.translate('xpack.fleet.breadcrumbs.copyPackagePolicyPageTitle', {
defaultMessage: 'Copy integration',
}),
},
],
upgrade_package_policy: ({ policyName, policyId }) => [
BASE_BREADCRUMB,
{
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,141 @@
/*
* 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 React, { useMemo, memo } from 'react';
import { useRouteMatch, useLocation } from 'react-router-dom';

import { EuiEmptyPrompt, EuiFlexGroup } from '@elastic/eui';
import { FormattedMessage } from '@kbn/i18n-react';
import styled from '@emotion/styled';

import { EXCLUDED_FROM_PACKAGE_POLICY_COPY_PACKAGES } from '../../../../../../common/constants';

import { useGetOnePackagePolicy } from '../../../../integrations/hooks';
import { Loading } from '../../../components';
import type { EditPackagePolicyFrom } from '../create_package_policy_page/types';

import { CreatePackagePolicySinglePage } from '../create_package_policy_page/single_page_layout';
import { useBreadcrumbs, useGetOneAgentPolicy } from '../../../hooks';
import { useBreadcrumbs as useIntegrationsBreadcrumbs } from '../../../../integrations/hooks';

const ContentWrapper = styled(EuiFlexGroup)`
height: 100%;
margin: 0 auto;
`;

const IntegrationsBreadcrumb = memo<{
pkgTitle: string;
policyName: string;
pkgkey: string;
}>(({ pkgTitle, policyName, pkgkey }) => {
useIntegrationsBreadcrumbs('integration_policy_copy', { policyName, pkgTitle, pkgkey });
return null;
});

const PoliciesBreadcrumb: React.FunctionComponent<{
policyName: string;
policyId: string;
}> = ({ policyName, policyId }) => {
useBreadcrumbs('copy_integration', { policyName, policyId });
return null;
};

const InstalledIntegrationsBreadcrumb = memo<{
policyName: string;
}>(({ policyName }) => {
useIntegrationsBreadcrumbs('integration_policy_copy_from_installed', { policyName });
return null;
});

export const CopyPackagePolicyPage = memo(() => {
const {
params: { packagePolicyId, policyId },
} = useRouteMatch<{ packagePolicyId: string; policyId?: string }>();

const packagePolicy = useGetOnePackagePolicy(packagePolicyId);
const agentPolicy = useGetOneAgentPolicy(policyId);

const packagePolicyData = useMemo(() => {
if (packagePolicy.data?.item) {
return {
...packagePolicy.data.item,
name: 'copy-' + packagePolicy.data.item.name,
};
}
}, [packagePolicy.data?.item]);

// Parse the 'from' query parameter to determine navigation after save
const { search } = useLocation();

const from = useMemo(() => {
const qs = new URLSearchParams(search);
const qsFrom = (qs.get('from') as EditPackagePolicyFrom | null) ?? 'fleet-policy-list';

if (qsFrom === 'fleet-policy-list') {
return 'copy-from-fleet-policy-list';
} else if (qsFrom === 'installed-integrations') {
return 'copy-from-installed-integrations';
} else {
return 'copy-from-integrations-policy-list';
}
}, [search]);

if (packagePolicy.isLoading || !packagePolicy.data) {
return (
<>
<Loading />
</>
);
}

const breadcrumb =
from === 'copy-from-fleet-policy-list' && policyId ? (
<PoliciesBreadcrumb policyName={agentPolicy.data?.item?.name || ''} policyId={policyId} />
) : from === 'copy-from-installed-integrations' ? (
<InstalledIntegrationsBreadcrumb policyName={packagePolicy.data?.item?.name || ''} />
) : (
<IntegrationsBreadcrumb
pkgTitle={packagePolicy.data?.item?.package?.title || ''}
policyName={packagePolicy.data?.item?.name || ''}
pkgkey={packagePolicy.data?.item?.package?.name || ''}
Comment thread
juliaElastic marked this conversation as resolved.
/>
);

const pkgName = packagePolicy.data?.item?.package?.name;

if (pkgName && EXCLUDED_FROM_PACKAGE_POLICY_COPY_PACKAGES.includes(pkgName)) {
return (
<ContentWrapper>
{breadcrumb}
<EuiEmptyPrompt
title={
<FormattedMessage
id="xpack.fleet.copyPackagePolicyPage.notAllowedTitle"
defaultMessage="Copying this integration policy is not allowed."
/>
}
color="danger"
iconType="error"
/>
</ContentWrapper>
);
}

return (
<>
{breadcrumb}
<CreatePackagePolicySinglePage
from={from}
pkgName={packagePolicy.data!.item!.package!.name}
pkgVersion={packagePolicy.data!.item!.package!.version}
defaultPolicyData={packagePolicyData}
noBreadcrumb={true}
prerelease={true}
/>
</>
);
});
Original file line number Diff line number Diff line change
Expand Up @@ -173,7 +173,10 @@ export const PackagePolicyInputStreamConfig = memo<Props>(

return (
<>
<EuiFlexGrid columns={2} data-test-subj="streamOptions.inputStreams">
<EuiFlexGrid
columns={2}
data-test-subj={`streamOptions.inputStreams.${packageInputStream.data_stream.dataset}`}
>
<ScrollAnchor ref={containerRef} />
<EuiFlexItem>
<EuiFlexGroup gutterSize="none" alignItems="flexStart">
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@
import { useCallback, useMemo, useEffect, useRef } from 'react';
import type { ApplicationStart } from '@kbn/core-application-browser';

import { splitPkgKey } from '../../../../../../../common/services';
import { PLUGIN_ID, INTEGRATIONS_PLUGIN_ID } from '../../../../constants';
import { pkgKeyFromPackageInfo } from '../../../../services';
import { useStartServices, useLink, useIntraAppState } from '../../../../hooks';
Expand Down Expand Up @@ -48,7 +49,11 @@ export const useCancelAddPackagePolicy = (params: UseCancelParams) => {
if (routeState && routeState.onCancelUrl) {
return routeState.onCancelUrl;
}
return from === 'policy' && agentPolicyId
if (from === 'installed-integrations' || from === 'copy-from-installed-integrations') {
return `${getHref('integrations_installed', {})}?viewPolicies=${splitPkgKey(pkgkey).pkgName}`;
}

return (from === 'policy' || from === 'copy-from-fleet-policy-list') && agentPolicyId
? getHref('policy_details', {
policyId: agentPolicyId,
})
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,12 @@ import {
import { useAgentless } from '../hooks/setup_technology';

import { WithHeaderLayout } from '../../../../../layouts';
import type { AgentPolicy, PackageInfo, RegistryPolicyTemplate } from '../../../../../types';
import type {
AgentPolicy,
PackageInfo,
PackagePolicy,
RegistryPolicyTemplate,
} from '../../../../../types';
import { PackageIcon } from '../../../../../components';
import type { EditPackagePolicyFrom } from '../../types';

Expand All @@ -41,6 +46,7 @@ export const CreatePackagePolicySinglePageLayout: React.FunctionComponent<{
agentPolicy?: AgentPolicy;
packageInfo?: PackageInfo;
integrationInfo?: RegistryPolicyTemplate;
defaultPolicyData?: Partial<PackagePolicy>;
'data-test-subj'?: string;
tabs?: Array<{
title: string;
Expand All @@ -57,6 +63,7 @@ export const CreatePackagePolicySinglePageLayout: React.FunctionComponent<{
packageInfo,
integrationInfo,
children,
defaultPolicyData,
'data-test-subj': dataTestSubj,
tabs = [],
}) => {
Expand All @@ -72,6 +79,16 @@ export const CreatePackagePolicySinglePageLayout: React.FunctionComponent<{
[from]
);

const isCopy = useMemo(
() =>
[
'copy-from-fleet-policy-list',
'copy-from-integrations-policy-list',
'copy-from-installed-integrations',
].includes(from),
[from]
);

const pageTitle = useMemo(() => {
if ((isAdd || isEdit || isUpgrade) && packageInfo) {
let pageTitleText = (
Expand Down Expand Up @@ -152,6 +169,22 @@ export const CreatePackagePolicySinglePageLayout: React.FunctionComponent<{
);
}

if (isCopy) {
return (
<EuiText>
<h1 data-test-subj={`${dataTestSubj}_pageTitle`}>
<FormattedMessage
id="xpack.fleet.copyPackagePolicy.pageTitle"
defaultMessage="Create integration from {packagePolicyName}"
values={{
packagePolicyName: defaultPolicyData?.name?.replace(/^copy-/, '') || '',
}}
/>
</h1>
</EuiText>
);
}

return (
<EuiText>
<h1>
Expand All @@ -168,9 +201,11 @@ export const CreatePackagePolicySinglePageLayout: React.FunctionComponent<{
integrationInfo?.name,
integrationInfo?.title,
packageInfo,
defaultPolicyData?.name,
isAdd,
isEdit,
isUpgrade,
isCopy,
]);

const pageDescription = useMemo(() => {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ import React from 'react';
import { useCallback, useEffect, useMemo, useRef, useState } from 'react';
import { i18n } from '@kbn/i18n';
import { load } from 'js-yaml';
import { isEqual, omit } from 'lodash';
import { isEqual, omit, pick } from 'lodash';
import { DEFAULT_SPACE_ID } from '@kbn/spaces-plugin/common';
import { FormattedMessage } from '@kbn/i18n-react';
import { EuiLink } from '@elastic/eui';
Expand Down Expand Up @@ -284,6 +284,7 @@ export function useOnSubmit({
setNewAgentPolicy,
setSelectedPolicyTab,
isAddIntegrationFlyout,
defaultPolicyData,
}: {
packageInfo?: PackageInfo;
newAgentPolicy: NewAgentPolicy;
Expand All @@ -296,6 +297,7 @@ export function useOnSubmit({
setNewAgentPolicy: (policy: NewAgentPolicy) => void;
setSelectedPolicyTab: (tab: SelectedPolicyTab) => void;
isAddIntegrationFlyout?: boolean;
defaultPolicyData?: Partial<PackagePolicy>;
}) {
const { notifications, docLinks } = useStartServices();
const { spaceId } = useFleetStatus();
Expand Down Expand Up @@ -419,6 +421,29 @@ export function useOnSubmit({
integrationToEnable
);

if (defaultPolicyData) {
Object.assign(
basePackagePolicy,
pick(
defaultPolicyData,
'name',
'description',
'namespace',
'policy_ids',
'output_id',
'cloud_connector_id',
'cloud_connector_name',
'inputs',
'vars',
'elasticsearch',
'overrides',
'supports_agentless',
'supports_cloud_connector',
'additional_datastreams_permissions'
)
);
}

// Set the package policy with the fetched package
updatePackagePolicy(basePackagePolicy);
setIsInitialized(true);
Expand All @@ -440,6 +465,8 @@ export function useOnSubmit({
integration,
setIntegration,
isAddIntegrationFlyout,
defaultPolicyData,
setSelectedPolicyTab,
]);

useEffect(() => {
Expand Down
Loading
Loading