Skip to content

Commit

Permalink
Merge branch '7.x' into backport/7.x/pr-112281
Browse files Browse the repository at this point in the history
  • Loading branch information
@kibanamachine
kibanamachine authored Sep 15, 2021
2 parents 42a1efc + edc4a6c commit 9e68f05
Show file tree
Hide file tree
Showing 9 changed files with 168 additions and 159 deletions.
4 changes: 2 additions & 2 deletions ...ns/fleet/public/applications/fleet/sections/agent_policy/components/agent_policy_form.tsx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -420,14 +420,14 @@ export const AgentPolicyForm: React.FunctionComponent<Props> = ({
<>
<FormattedMessage
id="xpack.fleet.agentPolicyForm.systemMonitoringText"
defaultMessage="Collect system metrics"
defaultMessage="Collect system logs and metrics"
/>{' '}
<EuiIconTip
content={i18n.translate(
'xpack.fleet.agentPolicyForm.systemMonitoringTooltipText',
{
defaultMessage:
'Enable this option to bootstrap your policy with an integration that collects system metrics and information.',
'Enable this option to bootstrap your policy with an integration that collects system logs and metrics.',
}
)}
position="right"
Expand Down
134 changes: 70 additions & 64 deletions ...leet/public/applications/fleet/sections/agent_policy/create_package_policy_page/index.tsx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@ import {
EuiFlexItem,
EuiSpacer,
EuiLink,
EuiErrorBoundary,
} from '@elastic/eui';
import type { EuiStepProps } from '@elastic/eui/src/components/steps/step';
import type { ApplicationStart } from 'kibana/public';
Expand Down Expand Up @@ -503,70 +504,75 @@ export const CreatePackagePolicyPage: React.FunctionComponent = () => {

return (
<CreatePackagePolicyPageLayout {...layoutProps} data-test-subj="createPackagePolicy">
{formState === 'CONFIRM' && agentPolicy && (
<ConfirmDeployAgentPolicyModal
agentCount={agentCount}
agentPolicy={agentPolicy}
onConfirm={onSubmit}
onCancel={() => setFormState('VALID')}
/>
)}
{packageInfo && (
<IntegrationBreadcrumb
pkgTitle={integrationInfo?.title || packageInfo.title}
pkgkey={pkgKeyFromPackageInfo(packageInfo)}
integration={integrationInfo?.name}
/>
)}
<StepsWithLessPadding steps={steps} />
<EuiSpacer size="xl" />
<EuiSpacer size="xl" />
<CustomEuiBottomBar data-test-subj="integrationsBottomBar">
<EuiFlexGroup justifyContent="spaceBetween" alignItems="center">
<EuiFlexItem grow={false}>
{!isLoadingAgentPolicyStep && agentPolicy && packageInfo && formState === 'INVALID' ? (
<FormattedMessage
id="xpack.fleet.createPackagePolicy.errorOnSaveText"
defaultMessage="Your integration policy has errors. Please fix them before saving."
/>
) : null}
</EuiFlexItem>
<EuiFlexItem grow={false}>
<EuiFlexGroup gutterSize="s" justifyContent="flexEnd">
<EuiFlexItem grow={false}>
{/* eslint-disable-next-line @elastic/eui/href-or-on-click */}
<EuiButtonEmpty
color="ghost"
href={cancelUrl}
onClick={cancelClickHandler}
data-test-subj="createPackagePolicyCancelButton"
>
<FormattedMessage
id="xpack.fleet.createPackagePolicy.cancelButton"
defaultMessage="Cancel"
/>
</EuiButtonEmpty>
</EuiFlexItem>
<EuiFlexItem grow={false}>
<EuiButton
onClick={onSubmit}
isLoading={formState === 'LOADING'}
disabled={formState !== 'VALID'}
iconType="save"
color="primary"
fill
data-test-subj="createPackagePolicySaveButton"
>
<FormattedMessage
id="xpack.fleet.createPackagePolicy.saveButton"
defaultMessage="Save integration"
/>
</EuiButton>
</EuiFlexItem>
</EuiFlexGroup>
</EuiFlexItem>
</EuiFlexGroup>
</CustomEuiBottomBar>
<EuiErrorBoundary>
{formState === 'CONFIRM' && agentPolicy && (
<ConfirmDeployAgentPolicyModal
agentCount={agentCount}
agentPolicy={agentPolicy}
onConfirm={onSubmit}
onCancel={() => setFormState('VALID')}
/>
)}
{packageInfo && (
<IntegrationBreadcrumb
pkgTitle={integrationInfo?.title || packageInfo.title}
pkgkey={pkgKeyFromPackageInfo(packageInfo)}
integration={integrationInfo?.name}
/>
)}
<StepsWithLessPadding steps={steps} />
<EuiSpacer size="xl" />
<EuiSpacer size="xl" />
<CustomEuiBottomBar data-test-subj="integrationsBottomBar">
<EuiFlexGroup justifyContent="spaceBetween" alignItems="center">
<EuiFlexItem grow={false}>
{!isLoadingAgentPolicyStep &&
agentPolicy &&
packageInfo &&
formState === 'INVALID' ? (
<FormattedMessage
id="xpack.fleet.createPackagePolicy.errorOnSaveText"
defaultMessage="Your integration policy has errors. Please fix them before saving."
/>
) : null}
</EuiFlexItem>
<EuiFlexItem grow={false}>
<EuiFlexGroup gutterSize="s" justifyContent="flexEnd">
<EuiFlexItem grow={false}>
{/* eslint-disable-next-line @elastic/eui/href-or-on-click */}
<EuiButtonEmpty
color="ghost"
href={cancelUrl}
onClick={cancelClickHandler}
data-test-subj="createPackagePolicyCancelButton"
>
<FormattedMessage
id="xpack.fleet.createPackagePolicy.cancelButton"
defaultMessage="Cancel"
/>
</EuiButtonEmpty>
</EuiFlexItem>
<EuiFlexItem grow={false}>
<EuiButton
onClick={onSubmit}
isLoading={formState === 'LOADING'}
disabled={formState !== 'VALID'}
iconType="save"
color="primary"
fill
data-test-subj="createPackagePolicySaveButton"
>
<FormattedMessage
id="xpack.fleet.createPackagePolicy.saveButton"
defaultMessage="Save integration"
/>
</EuiButton>
</EuiFlexItem>
</EuiFlexGroup>
</EuiFlexItem>
</EuiFlexGroup>
</CustomEuiBottomBar>
</EuiErrorBoundary>
</CreatePackagePolicyPageLayout>
);
};
Expand Down
173 changes: 88 additions & 85 deletions .../fleet/public/applications/fleet/sections/agent_policy/edit_package_policy_page/index.tsx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,7 @@ import {
EuiFlyoutBody,
EuiFlyoutHeader,
EuiTitle,
EuiErrorBoundary,
} from '@elastic/eui';
import styled from 'styled-components';

Expand Down Expand Up @@ -510,93 +511,95 @@ export const EditPackagePolicyForm = memo<{

return (
<CreatePackagePolicyPageLayout {...layoutProps} data-test-subj="editPackagePolicy">
{isLoadingData ? (
<Loading />
) : loadingError || !agentPolicy || !packageInfo ? (
<Error
title={
<FormattedMessage
id="xpack.fleet.editPackagePolicy.errorLoadingDataTitle"
defaultMessage="Error loading data"
/>
}
error={
loadingError ||
i18n.translate('xpack.fleet.editPackagePolicy.errorLoadingDataMessage', {
defaultMessage: 'There was an error loading this integration information',
})
}
/>
) : (
<>
<Breadcrumb
agentPolicyName={agentPolicy.name}
from={from}
packagePolicyName={packagePolicy.name}
pkgkey={pkgKeyFromPackageInfo(packageInfo)}
pkgTitle={packageInfo.title}
policyId={policyId}
<EuiErrorBoundary>
{isLoadingData ? (
<Loading />
) : loadingError || !agentPolicy || !packageInfo ? (
<Error
title={
<FormattedMessage
id="xpack.fleet.editPackagePolicy.errorLoadingDataTitle"
defaultMessage="Error loading data"
/>
}
error={
loadingError ||
i18n.translate('xpack.fleet.editPackagePolicy.errorLoadingDataMessage', {
defaultMessage: 'There was an error loading this integration information',
})
}
/>
{formState === 'CONFIRM' && (
<ConfirmDeployAgentPolicyModal
agentCount={agentCount}
agentPolicy={agentPolicy}
onConfirm={onSubmit}
onCancel={() => setFormState('VALID')}
) : (
<>
<Breadcrumb
agentPolicyName={agentPolicy.name}
from={from}
packagePolicyName={packagePolicy.name}
pkgkey={pkgKeyFromPackageInfo(packageInfo)}
pkgTitle={packageInfo.title}
policyId={policyId}
/>
)}
{isUpgrade && dryRunData && (
<>
<UpgradeStatusCallout dryRunData={dryRunData} />
<EuiSpacer size="xxl" />
</>
)}
{configurePackage}
{/* Extra space to accomodate the EuiBottomBar height */}
<EuiSpacer size="xxl" />
<EuiSpacer size="xxl" />
<EuiBottomBar>
<EuiFlexGroup justifyContent="spaceBetween" alignItems="center">
<EuiFlexItem grow={false}>
{agentPolicy && packageInfo && formState === 'INVALID' ? (
<FormattedMessage
id="xpack.fleet.createPackagePolicy.errorOnSaveText"
defaultMessage="Your integration policy has errors. Please fix them before saving."
/>
) : null}
</EuiFlexItem>
<EuiFlexItem grow={false}>
<EuiFlexGroup gutterSize="s" justifyContent="flexEnd">
<EuiFlexItem grow={false}>
<EuiButtonEmpty color="ghost" href={cancelUrl}>
<FormattedMessage
id="xpack.fleet.editPackagePolicy.cancelButton"
defaultMessage="Cancel"
/>
</EuiButtonEmpty>
</EuiFlexItem>
<EuiFlexItem grow={false}>
<EuiButton
onClick={onSubmit}
isLoading={formState === 'LOADING'}
disabled={formState !== 'VALID'}
iconType="save"
color="primary"
fill
data-test-subj="saveIntegration"
>
<FormattedMessage
id="xpack.fleet.editPackagePolicy.saveButton"
defaultMessage="Save integration"
/>
</EuiButton>
</EuiFlexItem>
</EuiFlexGroup>
</EuiFlexItem>
</EuiFlexGroup>
</EuiBottomBar>
</>
)}
{formState === 'CONFIRM' && (
<ConfirmDeployAgentPolicyModal
agentCount={agentCount}
agentPolicy={agentPolicy}
onConfirm={onSubmit}
onCancel={() => setFormState('VALID')}
/>
)}
{isUpgrade && dryRunData && (
<>
<UpgradeStatusCallout dryRunData={dryRunData} />
<EuiSpacer size="xxl" />
</>
)}
{configurePackage}
{/* Extra space to accomodate the EuiBottomBar height */}
<EuiSpacer size="xxl" />
<EuiSpacer size="xxl" />
<EuiBottomBar>
<EuiFlexGroup justifyContent="spaceBetween" alignItems="center">
<EuiFlexItem grow={false}>
{agentPolicy && packageInfo && formState === 'INVALID' ? (
<FormattedMessage
id="xpack.fleet.createPackagePolicy.errorOnSaveText"
defaultMessage="Your integration policy has errors. Please fix them before saving."
/>
) : null}
</EuiFlexItem>
<EuiFlexItem grow={false}>
<EuiFlexGroup gutterSize="s" justifyContent="flexEnd">
<EuiFlexItem grow={false}>
<EuiButtonEmpty color="ghost" href={cancelUrl}>
<FormattedMessage
id="xpack.fleet.editPackagePolicy.cancelButton"
defaultMessage="Cancel"
/>
</EuiButtonEmpty>
</EuiFlexItem>
<EuiFlexItem grow={false}>
<EuiButton
onClick={onSubmit}
isLoading={formState === 'LOADING'}
disabled={formState !== 'VALID'}
iconType="save"
color="primary"
fill
data-test-subj="saveIntegration"
>
<FormattedMessage
id="xpack.fleet.editPackagePolicy.saveButton"
defaultMessage="Save integration"
/>
</EuiButton>
</EuiFlexItem>
</EuiFlexGroup>
</EuiFlexItem>
</EuiFlexGroup>
</EuiBottomBar>
</>
)}
</EuiErrorBoundary>
</CreatePackagePolicyPageLayout>
);
});
Expand Down
2 changes: 1 addition & 1 deletion x-pack/plugins/fleet/public/components/agent_enrollment_flyout/steps.tsx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ export const DownloadStep = () => {
<EuiText size="s">
<FormattedMessage
id="xpack.fleet.agentEnrollment.downloadUseLinuxInstaller"
defaultMessage="Linux users: We recommend using the installers over (RPM/DEB) because they provide the ability to upgrade your agent within Fleet."
defaultMessage="Linux users: We recommend the installer (TAR) over system packages (RPM/DEB) because it lets you upgrade your agent in Fleet."
/>
</EuiText>
<EuiSpacer size="l" />
Expand Down
4 changes: 2 additions & 2 deletions ...ublic/alert_types/geo_containment/query_builder/expressions/boundary_index_expression.tsx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,8 @@ import { ES_GEO_SHAPE_TYPES, GeoContainmentAlertParams } from '../../types';
import { GeoIndexPatternSelect } from '../util_components/geo_index_pattern_select';
import { SingleFieldSelect } from '../util_components/single_field_select';
import { ExpressionWithPopover } from '../util_components/expression_with_popover';
import { IFieldType } from '../../../../../../../../src/plugins/data/common/index_patterns/fields';
import { IIndexPattern } from '../../../../../../../../src/plugins/data/common/index_patterns';
import { IFieldType } from '../../../../../../../../src/plugins/data/common';
import { IIndexPattern } from '../../../../../../../../src/plugins/data/common';

interface Props {
alertParams: GeoContainmentAlertParams;
Expand Down
2 changes: 1 addition & 1 deletion ...rts/public/alert_types/geo_containment/query_builder/expressions/entity_by_expression.tsx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ import _ from 'lodash';
import { IErrorObject } from '../../../../../../triggers_actions_ui/public';
import { SingleFieldSelect } from '../util_components/single_field_select';
import { ExpressionWithPopover } from '../util_components/expression_with_popover';
import { IFieldType } from '../../../../../../../../src/plugins/data/common/index_patterns/fields';
import { IFieldType } from '../../../../../../../../src/plugins/data/common';

interface Props {
errors: IErrorObject;
Expand Down
4 changes: 2 additions & 2 deletions .../public/alert_types/geo_containment/query_builder/expressions/entity_index_expression.tsx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,8 +20,8 @@ import { ES_GEO_FIELD_TYPES } from '../../types';
import { GeoIndexPatternSelect } from '../util_components/geo_index_pattern_select';
import { SingleFieldSelect } from '../util_components/single_field_select';
import { ExpressionWithPopover } from '../util_components/expression_with_popover';
import { IFieldType } from '../../../../../../../../src/plugins/data/common/index_patterns/fields';
import { IIndexPattern } from '../../../../../../../../src/plugins/data/common/index_patterns';
import { IFieldType } from '../../../../../../../../src/plugins/data/common';
import { IIndexPattern } from '../../../../../../../../src/plugins/data/common';

interface Props {
dateField: string;
Expand Down
Loading

0 comments on commit 9e68f05

Please sign in to comment.