Merge branch 'main' into split-code-from-types-on-elastic-apm-synthtrace

docs/development/core/public/kibana-plugin-core-public.doclinksstart.links.md

@@ -211,7 +211,11 @@ readonly links: {
             uptimeDurationAnomaly: string;
         }>;
         readonly alerting: Record<string, string>;
-        readonly maps: Record<string, string>;
+        readonly maps: Readonly<{
+            guide: string;
+            importGeospatialPrivileges: string;
+            gdalTutorial: string;
+        }>;
         readonly monitoring: Record<string, string>;
         readonly security: Readonly<{
             apiKeyServiceSettings: string;

docs/index.asciidoc

@@ -13,6 +13,7 @@ include::{docs-root}/shared/versions/stack/{source_branch}.asciidoc[]
 :es-docker-image: {es-docker-repo}:{version}
 :blob:            {kib-repo}blob/{branch}/
 :security-ref:    https://www.elastic.co/community/security/
+:Data-source:     Data view
 :data-source:     data view
 :data-sources:    data views
 :a-data-source:   a data view

docs/redirects.asciidoc

@@ -7,6 +7,14 @@
 The following pages have moved or been deleted.
 
 --
+[role="exclude",id="snapshot-repositories"]
+== Snapshot and Restore
+Refer to {ref}/snapshot-restore.html[Snapshot and Restore].
+
+[role="exclude",id="snapshot-restore-tutorial"]
+== Tutorial: Snapshot and Restore
+Refer to {ref}/snapshot-restore.html[Snapshot and Restore].
+
 [role="exclude",id="configuring-tls"]
 == Encrypt TLS communications in {kib}
 Refer to {ref}/security-basic-setup-https.html#encrypt-kibana-http[Encrypt HTTP client communications for {kib}].

docs/setup/upgrade.asciidoc

@@ -44,12 +44,12 @@ a|
 [[upgrade-before-you-begin]]
 === Before you begin
 
-WARNING: {kib} automatically runs upgrade migrations when required. To roll back to an earlier version in case of an upgrade failure, you **must** have a backup snapshot available. Use <<snapshot-repositories, Snapshot and Restore>> to back up {kib} data by targeting the `.kibana*` indices. For more information see <<upgrade-migrations, upgrade migrations>>.
+WARNING: {kib} automatically runs upgrade migrations when required. To roll back to an earlier version in case of an upgrade failure, you **must** have a {ref}/snapshot-restore.html[backup snapshot] available. This snapshot must include the `kibana` feature state or all `kibana*` indices. For more information see <<upgrade-migrations, upgrade migrations>>.
 
 Before you upgrade {kib}:
 
 * Consult the <<breaking-changes,breaking changes>>.
-* Back up your data with <<snapshot-repositories, Snapshot and Restore>>. To roll back to an earlier version, you **must** have a snapshot of the `.kibana*` indices. 
+* {ref}/snapshots-take-snapshot.html[Take a snapshot] of your data. To roll back to an earlier version, the snapshot must include the `kibana` feature state or all `.kibana*` indices. 
 * Although not a requirement for rollbacks, we recommend taking a snapshot of all {kib} indices created by the plugins you use such as the `.reporting*` indices created by the reporting plugin.  
 * Before you upgrade production servers, test the upgrades in a dev environment.
 * See <<preventing-migration-failures, preventing migration failures>> for common reasons upgrades fail and how to prevent these.

docs/setup/upgrade/upgrade-migrations.asciidoc

@@ -151,17 +151,17 @@ In order to rollback after a failed upgrade migration, the saved object indices
 [float]
 ===== Rollback by restoring a backup snapshot:
 
-1. Before proceeding ensure that you have a recent and successful backup snapshot of all `.kibana*` indices.
+1. Before proceeding, {ref}/snapshots-take-snapshot.html[take a snapshot] that contains the `kibana` feature state or all `.kibana*` indices.
 2. Shutdown all {kib} instances to be 100% sure that there are no instances currently performing a migration.
 3. Delete all saved object indices with `DELETE /.kibana*`
-4. Restore the `.kibana* indices and their aliases from the backup snapshot. See {es} {ref}/modules-snapshots.html[snapshots]
+4. {ref}/snapshots-restore-snapshot.html[Restore] the `kibana` feature state or all `.kibana* indices and their aliases from the snapshot.
 5. Start up all {kib} instances on the older version you wish to rollback to.
 
 [float]
 ===== (Not recommended) Rollback without a backup snapshot:
 
 1. Shutdown all {kib} instances to be 100% sure that there are no {kib} instances currently performing a migration.
-2. Create a backup snapshot of the `.kibana*` indices.
+2. {ref}/snapshots-take-snapshot.html[Take a snapshot] that includes the `kibana` feature state or all `.kibana*` indices.
 3. Delete the version specific indices created by the failed upgrade migration. E.g. if you wish to rollback from a failed upgrade to v7.12.0 `DELETE /.kibana_7.12.0_*,.kibana_task_manager_7.12.0_*`
 4. Inspect the output of `GET /_cat/aliases`. If either the `.kibana` and/or `.kibana_task_manager` alias is missing, these will have to be created manually. Find the latest index from the output of `GET /_cat/indices` and create the missing alias to point to the latest index. E.g. if the `.kibana` alias was missing and the latest index is `.kibana_3` create a new alias with `POST /.kibana_3/_aliases/.kibana`.
 5. Remove the write block from the rollback indices. `PUT /.kibana,.kibana_task_manager/_settings {"index.blocks.write": false}`

docs/template.asciidoc

@@ -26,7 +26,6 @@ Provide a screenshot or video.
 //Screenshots must be 16:9 ratio.
 
 TIP: Need introduction inspiration? Here are some good examples:
-* <<snapshot-repositories, Snapshot and Restore>>
 * <<dashboard, Dashboard>>
 * <<canvas, Canvas>>
 

docs/user/canvas.asciidoc

@@ -112,9 +112,6 @@ Choose the type of element you want to use, then use the preconfigured demo data
 By default, most of the elements you create use the demo data until you change the data source. The demo data includes a small data set that you can use to experiment with your element.
 
 . Click *Add element*, then select the element you want to use.
-+
-[role="screenshot"]
-image::images/canvas-element-select.gif[Canvas elements]
 
 . To connect the element to your data, select *Data*, then select one of the following data sources: