From 4b55d1e1e13c66e13ade1f83b76a464c1ef06102 Mon Sep 17 00:00:00 2001 From: James Rodewig <40268737+jrodewig@users.noreply.github.com> Date: Wed, 24 Nov 2021 18:20:17 -0500 Subject: [PATCH 1/2] [DOCS] Update xrefs for snapshot restore docs --- docs/reference/redirects.asciidoc | 50 ------------------- .../settings/snapshot-settings.asciidoc | 4 +- .../apis/restore-snapshot-api.asciidoc | 2 +- .../reference/snapshot-restore/index.asciidoc | 6 +-- .../restore-snapshot.asciidoc | 2 +- 5 files changed, 7 insertions(+), 57 deletions(-) diff --git a/docs/reference/redirects.asciidoc b/docs/reference/redirects.asciidoc index bd60fe301ee7d..ab231fca03c5d 100644 --- a/docs/reference/redirects.asciidoc +++ b/docs/reference/redirects.asciidoc @@ -5,56 +5,6 @@ The following pages have moved or been deleted. // [START] Snapshot and restore -[role="exclude",id="snapshot-lifecycle-management"] -=== {slm-cap} ({slm-init}) - -See <>. - -[role="exclude",id="getting-started-snapshot-lifecycle-management"] -=== Tutorial: Automate backups with {slm-init} - -See <>. - -[role="exclude",id="slm-and-security"] -=== Security and {slm-init} - -See <>. - -[role="exclude",id="slm-retention"] -=== Snapshot retention - -See <>. - -[role="exclude",id="delete-snapshots"] -=== Delete a snapshot - -See <>. - -[role="exclude",id="snapshots-monitor-snapshot-restore"] -=== Monitor snapshot progress - -See <>. - -[role="exclude",id="backup-cluster"] -=== Back up a cluster - -See <>. - -[role="exclude",id="backup-cluster-data"] -=== Back up a cluster's data - -See <>. - -[role="exclude",id="backup-cluster-configuration"] -=== Back up a cluster's configuration - -See <>. - -[role="exclude",id="security-backup"] -=== Back up a cluster's security configuration - -See <> and <>. - // [END] Snapshot and restore [role="exclude",id="configuring-tls-docker"] diff --git a/docs/reference/settings/snapshot-settings.asciidoc b/docs/reference/settings/snapshot-settings.asciidoc index 5af62143ffdd6..1f1acc3653d0d 100644 --- a/docs/reference/settings/snapshot-settings.asciidoc +++ b/docs/reference/settings/snapshot-settings.asciidoc @@ -15,7 +15,7 @@ limit. ==== {slm-init} settings -The following cluster settings configure <>. [[slm-history-index-enabled]] @@ -27,7 +27,7 @@ to the `slm-history-*` indices. Defaults to `true`. [[slm-retention-schedule]] `slm.retention_schedule`:: (<>, <>) -Controls when the <> runs. +Controls when the <> runs. Can be a periodic or absolute time schedule. Supports all values supported by the <>. Defaults to daily at 1:30am UTC: `0 30 1 * * ?`. diff --git a/docs/reference/snapshot-restore/apis/restore-snapshot-api.asciidoc b/docs/reference/snapshot-restore/apis/restore-snapshot-api.asciidoc index 3ae765a83cb39..23d7168a5e384 100644 --- a/docs/reference/snapshot-restore/apis/restore-snapshot-api.asciidoc +++ b/docs/reference/snapshot-restore/apis/restore-snapshot-api.asciidoc @@ -92,7 +92,7 @@ the <>: + [source,console] ---- -GET /_index_template/*?filter_path=index_templates.name,index_templates.index_template.index_patterns,index_templates.index_template.data_stream +GET _index_template/*?filter_path=index_templates.name,index_templates.index_template.index_patterns,index_templates.index_template.data_stream ---- + If no such template exists, you can <> or diff --git a/docs/reference/snapshot-restore/index.asciidoc b/docs/reference/snapshot-restore/index.asciidoc index 52bc5b23d66f4..66e93cb213903 100644 --- a/docs/reference/snapshot-restore/index.asciidoc +++ b/docs/reference/snapshot-restore/index.asciidoc @@ -23,9 +23,9 @@ repository. Before you can take or restore snapshots, you must * Microsoft Azure After you register a snapshot repository, you can use -<> to automatically take and -manage snapshots. You can then <> -to recover or transfer its data. +<> to automatically take and manage +snapshots. You can then <> to +recover or transfer its data. [discrete] [[snapshot-contents]] diff --git a/docs/reference/snapshot-restore/restore-snapshot.asciidoc b/docs/reference/snapshot-restore/restore-snapshot.asciidoc index 7f320de5ebca6..0a12f5966617d 100644 --- a/docs/reference/snapshot-restore/restore-snapshot.asciidoc +++ b/docs/reference/snapshot-restore/restore-snapshot.asciidoc @@ -303,7 +303,7 @@ specific indices or data streams instead. If you're restoring to a different cluster, see <> before you start. -. If you <>, you can restore them to each node. This step is optional and requires a <>. + From 92e6e5ac310c096f4fc83356755ec0930188faa3 Mon Sep 17 00:00:00 2001 From: James Rodewig <40268737+jrodewig@users.noreply.github.com> Date: Mon, 29 Nov 2021 10:53:12 -0500 Subject: [PATCH 2/2] revert redirects --- docs/reference/redirects.asciidoc | 50 +++++++++++++++++++++++++++++++ 1 file changed, 50 insertions(+) diff --git a/docs/reference/redirects.asciidoc b/docs/reference/redirects.asciidoc index ab231fca03c5d..bd60fe301ee7d 100644 --- a/docs/reference/redirects.asciidoc +++ b/docs/reference/redirects.asciidoc @@ -5,6 +5,56 @@ The following pages have moved or been deleted. // [START] Snapshot and restore +[role="exclude",id="snapshot-lifecycle-management"] +=== {slm-cap} ({slm-init}) + +See <>. + +[role="exclude",id="getting-started-snapshot-lifecycle-management"] +=== Tutorial: Automate backups with {slm-init} + +See <>. + +[role="exclude",id="slm-and-security"] +=== Security and {slm-init} + +See <>. + +[role="exclude",id="slm-retention"] +=== Snapshot retention + +See <>. + +[role="exclude",id="delete-snapshots"] +=== Delete a snapshot + +See <>. + +[role="exclude",id="snapshots-monitor-snapshot-restore"] +=== Monitor snapshot progress + +See <>. + +[role="exclude",id="backup-cluster"] +=== Back up a cluster + +See <>. + +[role="exclude",id="backup-cluster-data"] +=== Back up a cluster's data + +See <>. + +[role="exclude",id="backup-cluster-configuration"] +=== Back up a cluster's configuration + +See <>. + +[role="exclude",id="security-backup"] +=== Back up a cluster's security configuration + +See <> and <>. + // [END] Snapshot and restore [role="exclude",id="configuring-tls-docker"]