Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Remove soft limit for snapshot repositories #118634

Merged
merged 5 commits into from
Nov 17, 2021
Merged

Remove soft limit for snapshot repositories #118634

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
c9fca49
Remove soft limit for snapshot repositories
jrodewig Nov 15, 2021
dbd2f4c
Merge remote-tracking branch 'upstream/main' into docs__remove-200-sn…
jrodewig Nov 16, 2021
ff3d550
remove unneeded import
jrodewig Nov 16, 2021
c2cbc89
update localization
jrodewig Nov 16, 2021
4174deb
Tweak docs link copy
jrodewig Nov 16, 2021
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
10 changes: 3 additions & 7 deletions ...ugins/snapshot_restore/public/application/components/policy_form/steps/step_retention.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,6 @@ import {
EuiButtonEmpty,
EuiFieldNumber,
EuiSelect,
EuiCode,
} from '@elastic/eui';

import { SlmPolicyPayload } from '../../../../../common/types';
Expand Down Expand Up @@ -139,10 +138,7 @@ export const PolicyStepRetention: React.FunctionComponent<StepProps> = ({
description={
<FormattedMessage
id="xpack.snapshotRestore.policyForm.stepRetention.countDescription"
defaultMessage="The minimum and maximum number of snapshots to store in your cluster. It should not exceed {maxNumber}."
values={{
maxNumber: <EuiCode>200</EuiCode>,
}}
defaultMessage="The minimum and maximum number of snapshots to store for the policy."
/>
}
fullWidth
Expand Down Expand Up @@ -225,13 +221,13 @@ export const PolicyStepRetention: React.FunctionComponent<StepProps> = ({
<EuiButtonEmpty
size="s"
flush="right"
href={docLinks.links.apis.putSnapshotLifecyclePolicy}
href={docLinks.links.snapshotRestore.createSnapshot}
target="_blank"
iconType="help"
>
<FormattedMessage
id="xpack.snapshotRestore.policyForm.stepRetention.docsButtonLabel"
defaultMessage="Snapshot retention docs"
defaultMessage="Snapshot docs"
/>
</EuiButtonEmpty>
</EuiFlexItem>
Expand Down
2 changes: 1 addition & 1 deletion ...t_restore/public/application/components/policy_form/steps/step_settings/step_settings.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -191,7 +191,7 @@ export const PolicyStepSettings: React.FunctionComponent<StepProps> = ({
>
<FormattedMessage
id="xpack.snapshotRestore.policyForm.stepSettings.docsButtonLabel"
defaultMessage="Snapshot settings docs"
defaultMessage="Snapshot docs"
/>
</EuiButtonEmpty>
</EuiFlexItem>
Expand Down
2 changes: 1 addition & 1 deletion x-pack/plugins/translations/translations/ja-JP.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23047,7 +23047,7 @@
"xpack.snapshotRestore.policyForm.stepLogistics.snapshotNameDescription": "スナップショットの名前です。それぞれの名前に自動的に追加される固有の識別子です。",
"xpack.snapshotRestore.policyForm.stepLogistics.snapshotNameDescriptionTitle": "スナップショット名",
"xpack.snapshotRestore.policyForm.stepLogisticsTitle": "ロジスティクス",
"xpack.snapshotRestore.policyForm.stepRetention.countDescription": "クラスターに格納するスナップショットの最少数と最大数。{maxNumber} 以下でなければなりません。",
"xpack.snapshotRestore.policyForm.stepRetention.countDescription": "クラスターに格納するスナップショットの最少数と最大数。",
"xpack.snapshotRestore.policyForm.stepRetention.countTitle": "保存するスナップショット",
"xpack.snapshotRestore.policyForm.stepRetention.docsButtonLabel": "スナップショット保存ドキュメント",
"xpack.snapshotRestore.policyForm.stepRetention.expirationDescription": "スナップショットの削除までに待つ時間です。",
Expand Down
2 changes: 1 addition & 1 deletion x-pack/plugins/translations/translations/zh-CN.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23434,7 +23434,7 @@
"xpack.snapshotRestore.policyForm.stepLogistics.snapshotNameDescription": "快照的名称。唯一标识符将自动添加到每个名称中。",
"xpack.snapshotRestore.policyForm.stepLogistics.snapshotNameDescriptionTitle": "快照名称",
"xpack.snapshotRestore.policyForm.stepLogisticsTitle": "运筹",
"xpack.snapshotRestore.policyForm.stepRetention.countDescription": "在您的集群中要存储的最小和最大快照数目。不应超过 {maxNumber}。",
"xpack.snapshotRestore.policyForm.stepRetention.countDescription": "在您的集群中要存储的最小和最大快照数目。",
"xpack.snapshotRestore.policyForm.stepRetention.countTitle": "要保留的快照",
"xpack.snapshotRestore.policyForm.stepRetention.docsButtonLabel": "快照保留文档",
"xpack.snapshotRestore.policyForm.stepRetention.expirationDescription": "删除快照前要等候的时间。",
Expand Down