Merge branch 'main' into dist_arch

Author: georgewallace

deploy-manage/deploy/kibana-reporting-configuration.md

@@ -37,7 +37,7 @@ Refer to the following documentation to learn how to perform key configuration t
 
 * [Configure SSL certificates](/deploy-manage/security/set-up-basic-security-plus-https.md#encrypt-kibana-browser) to encrypt traffic between client browsers and {{kib}}
 * [Enable authentication providers](/deploy-manage/users-roles/cluster-or-deployment-auth/kibana-authentication.md) for {{kib}}
-* Configure the {{kib}} [reporting feature](/deploy-manage/deploy/kibana-reporting-configuration.md)
+* Configure the {{kib}} [reporting feature](/deploy-manage/kibana-reporting-configuration.md)
 * Use [Spaces](/deploy-manage/manage-spaces.md) to organize content in {{kib}}, and restrict access to this content to specific users
 * Use [Connectors](/deploy-manage/manage-connectors.md) to manage connection information between {{es}}, {{kib}}, and third-party systems
 * Present a [user access agreement](/deploy-manage/users-roles/cluster-or-deployment-auth/access-agreement.md) when logging on to {{kib}}

deploy-manage/deploy/self-managed/configure-kibana.md

@@ -334,7 +334,6 @@ toc:
           - file: deploy/self-managed/access-kibana.md
           - file: deploy/self-managed/air-gapped-install.md
           - file: deploy/self-managed/tools-apis.md
-      - file: deploy/kibana-reporting-configuration.md
   - file: distributed-architecture.md
     children:
       - file: distributed-architecture/clusters-nodes-shards.md
@@ -742,6 +741,7 @@ toc:
             children:
               - file: monitor/logging-configuration/kibana-log-settings-examples.md
               - file: monitor/logging-configuration/kibana-logging-cli-configuration.md
+  - file: kibana-reporting-configuration.md
   - file: cloud-organization.md
     children:
       - file: cloud-organization/billing.md
@@ -793,16 +793,17 @@ toc:
       - file: maintenance/add-and-remove-elasticsearch-nodes.md
   - file: upgrade.md
     children:
-      - file: upgrade/prepare-to-upgrade.md
-        children:
-          - file: upgrade/prepare-to-upgrade/upgrade-assistant.md
-          - file: upgrade/prepare-to-upgrade/index-compatibility.md
+      - file: upgrade/plan-upgrade.md
       - file: upgrade/orchestrator.md
         children:
           - file: upgrade/orchestrator/upgrade-cloud-enterprise.md
             children:
               - file: upgrade/orchestrator/re-running-the-ece-upgrade.md
           - file: upgrade/orchestrator/upgrade-cloud-on-k8s.md
+      - file: upgrade/prepare-to-upgrade.md
+        children:
+          - file: upgrade/prepare-to-upgrade/upgrade-assistant.md
+          - file: upgrade/prepare-to-upgrade/index-compatibility.md
       - file: upgrade/deployment-or-cluster.md
         children:
           - file: upgrade/deployment-or-cluster/upgrade-on-ech.md
@@ -811,12 +812,12 @@ toc:
           - file: upgrade/deployment-or-cluster/self-managed.md
             children:
               - file: upgrade/deployment-or-cluster/elasticsearch.md
+                children:
+                  - file: upgrade/deployment-or-cluster/archived-settings.md
+                  - file: upgrade/deployment-or-cluster/reading-indices-from-older-elasticsearch-versions.md
               - file: upgrade/deployment-or-cluster/kibana.md
                 children:
-                  - file: upgrade/deployment-or-cluster/kibana-roll-back.md
-          - file: upgrade/deployment-or-cluster/archived-settings.md
-            children:
-              - file: upgrade/deployment-or-cluster/reading-indices-from-older-elasticsearch-versions.md
+                  - file: upgrade/deployment-or-cluster/kibana-roll-back.md    
       - file: upgrade/ingest-components.md
       - file: upgrade/internal-upgrade-processes.md
         children:

raw-migrated-files/kibana/kibana/secure-reporting.md renamed to deploy-manage/kibana-reporting-configuration.md

@@ -1,4 +1,4 @@
-# Upgrade Elastic on self-managed infrastructure
+# Upgrade Elastic on a self-managed cluster
 
 If you've installed the {{stack}} on your own self-managed infrastructure, once you're [prepared to upgrade](/deploy-manage/upgrade/deployment-or-cluster.md#prepare-to-upgrade), you'll need to upgrade each of your Elastic components individually. 
 

deploy-manage/toc.yml

@@ -0,0 +1 @@
+# Plan your upgrade

deploy-manage/upgrade/deployment-or-cluster/self-managed.md

@@ -33,7 +33,7 @@ $$$securing-reporting$$$
 
 ## Permissions
 
-To be able to share objects or generate reports, you must have a role that allows these actions on the specific {{es}} indices and {{kib}} applications containing the data that you want to share. Check [Configuring reporting](/deploy-manage/deploy/kibana-reporting-configuration.md) for more information.
+To be able to share objects or generate reports, you must have a role that allows these actions on the specific {{es}} indices and {{kib}} applications containing the data that you want to share. Check [Configuring reporting](/deploy-manage/kibana-reporting-configuration.md) for more information.
 
 ## Share with a direct link [share-a-direct-link]
 

deploy-manage/upgrade/plan-upgrade.md

@@ -133,7 +133,6 @@ toc:
       - file: kibana/kibana/apm-settings-kb.md
       - file: kibana/kibana/logging-settings.md
       - file: kibana/kibana/reporting-production-considerations.md
-      - file: kibana/kibana/secure-reporting.md
       - file: kibana/kibana/upgrade-migrations-rolling-back.md
       - file: kibana/kibana/upgrade.md      
       - file: kibana/kibana/xpack-security.md

explore-analyze/report-and-share.md

@@ -24,6 +24,7 @@ redirects:
   'deploy-manage/deploy/self-managed/deploy-cluster.md': '!deploy-manage/deploy/self-managed/installing-elasticsearch.md'
   'deploy-manage/deploy/self-managed/configure.md': '!deploy-manage/deploy/self-managed/configure-kibana.md'
   'deploy-manage/security/manage-traffic-filtering-through-api.md': '!deploy-manage/security/ec-traffic-filtering-through-the-api.md'
+  'deploy-manage/deploy/kibana-reporting-configuration.md': '!deploy-manage/kibana-reporting-configuration.md'
 
   ## audit logging movement to security section
   'deploy-manage/monitor/logging-configuration/configuring-audit-logs.md': 'deploy-manage/security/logging-configuration/configuring-audit-logs.md'