Skip to content

Commit

Permalink
[DOCS] Move snapshot-restore out of modules. (elastic#49618)
Browse files Browse the repository at this point in the history
* [DOCS] Move snapshot-restore docs out of modules.

* [DOCS] Incorporates comments from @jrodewig.

* [DOCS] Fix snippet tests
  • Loading branch information
debadair committed Jan 10, 2020
1 parent 4af1ed5 commit 021236a
Show file tree
Hide file tree
Showing 15 changed files with 906 additions and 802 deletions.
2 changes: 1 addition & 1 deletion docs/reference/glossary.asciidoc
Original file line number Diff line number Diff line change
Expand Up @@ -181,7 +181,7 @@ during the following processes:
This type of recovery is called a *local store recovery*.
* <<glossary-replica-shard,Primary shard replication>>.
* Relocation of a shard to a different node in the same cluster.
* {ref}/modules-snapshots.html#restore-snapshot[Snapshot restoration].
* {ref}/snapshots-restore-snapshot.html[Snapshot restoration].
// end::recovery-triggers[]
--

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@

To back up your cluster's data, you can use the <<modules-snapshots,snapshot API>>.

include::{es-repo-dir}/modules/snapshots.asciidoc[tag=snapshot-intro]
include::../snapshot-restore/index.asciidoc[tag=snapshot-intro]

[TIP]
====
Expand Down
2 changes: 1 addition & 1 deletion docs/reference/high-availability/backup-cluster.asciidoc
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
[[backup-cluster]]
== Back up a cluster

include::{es-repo-dir}/modules/snapshots.asciidoc[tag=backup-warning]
include::../snapshot-restore/index.asciidoc[tag=backup-warning]

To have a complete backup for your cluster:

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<titleabbrev>Restore the data</titleabbrev>
++++

include::{es-repo-dir}/modules/snapshots.asciidoc[tag=restore-intro]
include::../snapshot-restore/index.asciidoc[tag=restore-intro]

[TIP]
====
Expand Down
4 changes: 2 additions & 2 deletions docs/reference/ilm/getting-started-slm.asciidoc
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@

Let's get started with snapshot lifecycle management (SLM) by working through a
hands-on scenario. The goal of this example is to automatically back up {es}
indices using the <<modules-snapshots,snapshots>> every day at a particular
indices using the <<snapshot-restore,snapshots>> every day at a particular
time. Once these snapshots have been created, they are kept for a configured
amount of time and then deleted per a configured retention policy.

Expand Down Expand Up @@ -59,7 +59,7 @@ POST /_security/role/slm-read-only
=== Setting up a repository

Before we can set up an SLM policy, we'll need to set up a
<<snapshots-repositories,snapshot repository>> where the snapshots will be
snapshot repository where the snapshots will be
stored. Repositories can use {plugins}/repository.html[many different backends],
including cloud storage providers. You'll probably want to use one of these in
production, but for this example we'll use a shared file system repository:
Expand Down
2 changes: 2 additions & 0 deletions docs/reference/index.asciidoc
Original file line number Diff line number Diff line change
Expand Up @@ -54,6 +54,8 @@ include::data-rollup-transform.asciidoc[]

include::high-availability.asciidoc[]

include::snapshot-restore/index.asciidoc[]

include::{xes-repo-dir}/security/index.asciidoc[]

include::{xes-repo-dir}/watcher/index.asciidoc[]
Expand Down
2 changes: 1 addition & 1 deletion docs/reference/indices/recovery.asciidoc
Original file line number Diff line number Diff line change
Expand Up @@ -77,7 +77,7 @@ This type of recovery is called a local store recovery.

`SNAPSHOT`::
The recovery is related to
a <<restore-snapshot,snapshot restoration>>.
a <<snapshots-restore-snapshot,snapshot restoration>>.

`REPLICA`::
The recovery is related to
Expand Down
2 changes: 0 additions & 2 deletions docs/reference/modules.asciidoc
Original file line number Diff line number Diff line change
Expand Up @@ -91,8 +91,6 @@ include::modules/node.asciidoc[]

include::modules/plugins.asciidoc[]

include::modules/snapshots.asciidoc[]

include::modules/threadpool.asciidoc[]

include::modules/transport.asciidoc[]
Expand Down
Loading

0 comments on commit 021236a

Please sign in to comment.