Merge branch 'master' into MCLOUD-8642

Author: hguthrie

src/_data/toc/cloud-guide.yml

@@ -445,6 +445,10 @@ pages:
               url: /cloud/project/services-elastic.html
               versionless: true
 
+            - label: Set up OpenSearch service
+              url: /cloud/project/services-opensearch.html
+              versionless: true
+
             - label: Set up RabbitMQ service
               url: /cloud/project/services-rabbit.html
               versionless: true

src/_data/whats-new.yml

@@ -4,8 +4,63 @@ description: This page contains recent changes that we think you'd like to know
   We exclude from this list proofreading, spelling checks, and all minor updates.
 link: "/whats-new.html"
 thread: "/whatsnew-feed.xml"
-updated: Mon Apr 11 14:38:41 2022
+updated: Mon Apr 18 16:08:10 2022
 entries:
+- description: The [Site-Wide Analysis Tool](https://devdocs.magento.com/tools/site-wide-analysis.html)
+    installation topic has moved to [Adobe Experience League](https://experienceleague.adobe.com/docs/commerce-operations/tools/site-wide-analysis-tool/installation.html).
+  versions: 2.4.x
+  type: Technical
+  date: April 13, 2022
+  link: https://github.com/magento-commerce/devdocs/pull/2913
+  merge_commit: e3cc7b1a1aa0811ff7313cb98dc5f0917dce9bb3
+  contributor: jeff-matthews
+  membership: true
+  labels:
+  - Technical
+  - 2.4.x
+- description: Cloud guide updates:<br/>- Updated the [Upgrade version topic](https://devdocs.magento.com/cloud/project/project-upgrade.html)
+    to include instructions for 2.4.4 template.<br/>- Added a new topic for [OpenSearch
+    setup](https://devdocs.magento.com/cloud/project/services-opensearch.html). This
+    is an early version; more to come.<br/>- Updated the [Application Properties topic](https://devdocs.magento.com/cloud/project/magento-app-properties.html)
+    to include 2.4.4 settings and clarified the Composer 2 install.
+  versions: 2.4.4
+  type: Major Update
+  date: April 13, 2022
+  link: https://github.com/magento-commerce/devdocs/pull/2908
+  merge_commit: 5362c1b1392eee3cbf18eafe4f17fa79845fd041
+  contributor: hguthrie
+  membership: true
+  labels:
+  - Major Update
+  - 2.4.4
+- description: Updated the autogenerated topics and the semi-automated topics that
+    use release data such as [Module reference guide](https://devdocs.magento.com/guides/v2.4/mrg/intro.html),
+    [Packages](https://devdocs.magento.com/guides/v2.4/release-notes/packages-open-source.html),
+    [Backwards incompatible changes](https://devdocs.magento.com/guides/v2.4/release-notes/backward-incompatible-changes/reference.html),
+    [Required PHP extensions](https://devdocs.magento.com/guides/v2.4/install-gde/system-requirements.html#php-extensions),
+    [bin/magento CLI](https://devdocs.magento.com/guides/v2.4/reference/cli/magento.html).
+  versions: 2.4.4
+  type: Major Update
+  date: April 12, 2022
+  link: https://github.com/magento-commerce/devdocs/pull/2907
+  merge_commit: 81e9594ffa9c24a761ebd3a3c7c076078443f1e5
+  contributor: dshevtsov
+  membership: true
+  labels:
+  - Major Update
+  - 2.4.4
+- description: Updated the Cloud integration topics to remove the delete remote step
+    and add a note about default remote names.
+  versions: 2.x
+  type: Technical
+  date: April 11, 2022
+  link: https://github.com/magento-commerce/devdocs/pull/2894
+  merge_commit: b584117fd3a6324049c59da591fb2b3cf14b05b6
+  contributor: hguthrie
+  membership: true
+  labels:
+  - 2.x
+  - Technical
 - description: Added a new topic to the _Performance Best Practices_ guide titled
     [High-throughput Order Processing](https://devdocs.magento.com/guides/v2.4/performance-best-practices/high-throughput-order-processing.html),
     which describes how you can improve performance by optimizing the order placement

src/_includes/cloud/cloud-elasticsearch-client-compatibility.md

@@ -72,13 +72,13 @@ Critical errors indicate a problem with the Magento Commerce Cloud project confi
 | 130 | install-update: cache_type | Command failed: `php ./bin/magento cache:enable` | Command `php ./bin/magento cache:enable` runs only when Magento was installed but `./app/etc/env.php` file was absent or empty at the beginning of the deployment. Check the `cloud.log` for more information. Add `VERBOSE_COMMANDS: '-vvv'` into `.magento.env.yaml` for more detailed command output. |
 | 131 | install-update | The `crypt/key`  key value does not exist in the `./app/etc/env.php` file or the `CRYPT_KEY` cloud environment variable | This error occurs if the `./app/etc/env.php` file is not present when Magento deployment begins, or if the `crypt/key` value is undefined. If you migrated the database from another environment, retrieve the crypt key value from that environment. Then, add the value to the [CRYPT_KEY](https://devdocs.magento.com/cloud/env/variables-deploy.html#crypt_key) cloud environment variable in your current environment. See [Add the Magento encryption key](https://devdocs.magento.com/cloud/setup/first-time-setup-import-import.html#encryption-key). If you accidentally removed the `./app/etc/env.php` file, use the following command to restore it from the backup files created from a previous deployment: `./vendor/bin/ece-tools backup:restore` CLI command ." |
 | 132 |  | Cannot connect to the Elasticsearch service | Check for valid Elasticsearch credentials and verify that the service is running |
-| 137 |  | Cannot connect to the Opensearch service | Check for valid Opensearch credentials and verify that the service is running |
+| 137 |  | Cannot connect to the OpenSearch service | Check for valid OpenSearch credentials and verify that the service is running |
 | 133 | validate-config | Remove Magento Braintree module configuration which is no longer supported in Magento 2.4 and later versions. | Support for the Braintree module is no longer included with Magento 2.4.0 and later. Remove the CONFIG__STORES__DEFAULT__PAYMENT__BRAINTREE__CHANNEL variable from the variables section of the .magento.app.yaml file. For Braintree support, use an official Braintree Payments extension from the Magento Marketplace instead. |
 | 134 | validate-config | Magento 2.4.0 requires Elasticsearch service to be installed | Install Elasticsearch service |
-| 138 | validate-config | Magento 2.4.4 requires Opensearch or Elasticsearch service to be installed | Install Opensearch service |
+| 138 | validate-config | Magento 2.4.4 requires OpenSearch or Elasticsearch service to be installed | Install OpenSearch service |
 | 135 | validate-config | The search engine must be set to Elasticsearch for Magento >= 2.4.0 | Check the SEARCH_CONFIGURATION variable for the `engine` option. If it is configured, remove the option, or set the value to "elasticsearch". |
 | 136 | validate-config | Split Database was removed starting from Magento 2.5.0. | If you use split database that you have to revert to or migrate to a single database or use an alternative approach. |
-| 139 | validate-config | Incorrect search engine | This Magento version does not support Opensearch. You must use versions 2.3.7-p3, 2.4.3-p2, or higher |
+| 139 | validate-config | Incorrect search engine | This Magento version does not support OpenSearch. You must use versions 2.3.7-p3, 2.4.3-p2, or higher |
 
 ### Post-deploy stage
 
@@ -156,7 +156,7 @@ Warning errors indicate a problem with the Magento Commerce Cloud project config
 | 2026 | pre-deploy:restore-writable-dirs | Failed to restore some data generated during the build phase to the mounted directories | Check the `cloud.log` for more information. |
 | 2027 | validate-config:mage-mode-variable | Mode value for MAGE_MODE environment variable not supported | Remove the MAGE_MODE environment variable, or change its value to "production". Magento Cloud supports "production" mode only. |
 | 2028 | remote-storage | Remote storage could not be enabled. | Verify remote storage credentials. |
-| 2030 | validate-config | Elasticsearch and Opensearch services are both installed at infrastructure layer. Magento 2.4.4 and higher uses Opensearch by default | Consider removing the Elasticsearch or Opensearch service from the infrastructure layer to optimize resource usage. |
+| 2030 | validate-config | Elasticsearch and OpenSearch services are both installed at infrastructure layer. Magento 2.4.4 and higher uses OpenSearch by default | Consider removing the Elasticsearch or OpenSearch service from the infrastructure layer to optimize resource usage. |
 
 ### Post-deploy stage
 

src/_includes/cloud/error-codes.md

@@ -0,0 +1,2 @@
+ {:.bs-callout-warning}
+  Elasticsearch 7.11 and later is not supported for {{ site.data.var.ece }}. {{ site.data.var.ee }} and {{ site.data.var.ce }} versions 2.4.4, 2.4.3-p2, and 2.3.7-p3 support the OpenSearch service. The on-premises installations continue to support Elasticsearch.

src/_includes/cloud/note-elasticsearch.md

@@ -193,7 +193,8 @@ The Production environment has three virtual machines (VMs) behind an Elastic Lo
    -  `pub/static`
    -  `app/etc`
 -  **Redis**—one server per VM with only one active and the other two as replicas
--  **Elasticsearch**—search for {{site.data.var.ece}} 2.2 and later
+-  **Elasticsearch**—search for {{site.data.var.ece}} 2.2 to 2.4.3-p2
+-  **OpenSearch**—search for {{site.data.var.ece}} 2.3.7-p3, 2.4.3-p2, 2.4.4 and later
 -  **Galera**—database cluster with one MariaDB MySQL database per node with an auto-increment setting of three for unique IDs across every database
 
 The following figure shows the technologies used in the Production environment:
@@ -231,6 +232,7 @@ On Pro plan projects, the Master branch provides an active PaaS environment with
 -  [Redis]({{ site.baseurl }}/cloud/project/services-redis.html)
 -  [RabbitMQ]({{ site.baseurl }}/cloud/project/services-rabbit.html)
 -  [Elasticsearch]({{ site.baseurl }}/cloud/project/services-elastic.html)
+-  [OpenSearch]({{ site.baseurl }}/cloud/project/services-opensearch.html)
 
 For the Staging and Production environments, we recommend installing the latest version of the Fastly CDN module. See [Fastly in Cloud]({{ site.baseurl }}/cloud/cdn/cloud-fastly.html#fastly-cdn-module-for-magento-2).
 

src/cloud/architecture/pro-architecture.md

@@ -21,7 +21,7 @@ Scaling must use the same instance type and size for each node:
 
 ### Core tier scaling
 
-There are 3 nodes (core nodes) for data storage, cache, and services: **ElasticSearch**, **MariaDB**, **Redis**, and more. When the core tier approaches capacity, the only way to scale is to increase the server size, such as boosting the CPU power and memory. Capacity is limited to the size of the node that is available. Because the database cluster is designed for high availability, you cannot scale horizontally in a reliable way with the technologies used.
+There are 3 nodes (core nodes) for data storage, cache, and services: **OpenSearch** or **Elasticsearch**, **MariaDB**, **Redis**, and more. When the core tier approaches capacity, the only way to scale is to increase the server size, such as boosting the CPU power and memory. Capacity is limited to the size of the node that is available. Because the database cluster is designed for high availability, you cannot scale horizontally in a reliable way with the technologies used.
 
 ![Core tier scaling]
 

src/cloud/architecture/scaled-architecture.md

@@ -63,7 +63,7 @@ The Production and Staging environments include the following technologies. You
 
 ### Services {#cloud-arch-services}
 
-{{site.data.var.ece}} currently supports the following services: PHP, MySQL (MariaDB), Elasticsearch ({{site.data.var.ee}} 2.2.x and later), Redis, and RabbitMQ.
+{{site.data.var.ece}} currently supports the following services: PHP, MySQL (MariaDB), Elasticsearch ({{site.data.var.ee}} 2.2 to 2.4.3-p2), OpenSearch (2.3.7-p3, 2.4.3-p2, 2.4.4 and later), Redis, and RabbitMQ.
 
 Each service runs in a separate, secure container. Containers are managed together in the project. Some services are standard, such as the following:
 

src/cloud/architecture/starter-architecture.md

@@ -182,7 +182,8 @@ Optionally, if you used Vagrant with the _hostmanager_ plugin, update the hosts
 For development and testing in an environment as close to Integration as possible, you may also want to install additional tools, software, and services. These services are configured using [`services.yaml`]({{ site.baseurl }}/cloud/project/services.html).
 
 -  [Redis]({{ site.baseurl }}/cloud/project/services-redis.html)
--  [ElasticSearch]({{ site.baseurl }}/cloud/project/services-elastic.html)
+-  [Elasticsearch]({{ site.baseurl }}/cloud/project/services-elastic.html)
+-  [OpenSearch]({{ site.baseurl }}/cloud/project/services-opensearch.html)
 -  [RabbitMQ]({{ site.baseurl }}/cloud/project/services-rabbit.html)
 -  [Additional software]({{ site.baseurl }}/guides/v2.3/install-gde/prereq/optional.html)
 

src/cloud/before/before-setup-env-install.md

@@ -5,19 +5,19 @@ functional_areas:
   - Cloud
 ---
 
-{{site.data.var.ece}} is a managed, automated hosting platform for the {{site.data.var.ee}} software. {{site.data.var.ece}} comes with a variety of additional features that sets it apart from the on-premises {{site.data.var.ee}} and {{site.data.var.ce}} platforms:
+{{site.data.var.ece}} is a managed, automated hosting platform for the {{site.data.var.ee}} software. {{site.data.var.ece}} comes with various additional features that set it apart from the on-premises {{site.data.var.ee}} and {{site.data.var.ce}} platforms:
 
 ![Cloud Benefits]
 
-{{site.data.var.ece}} provides a pre-provisioned infrastructure that includes PHP, MySQL, Redis, RabbitMQ, and Elasticsearch technologies; a Git-based workflow with automatic build and deploy for efficient **Rapid development** and **Continuous deployment** every time you push code changes in a Platform as a Service (PaaS) environment; highly **Customizable** environment configuration files and [tools](#ece-tools-package); and AWS hosting that offers a **Scalable** and **Secure** environment for online sales and retailing.
+{{site.data.var.ece}} provides a pre-provisioned infrastructure that includes PHP, MySQL (MariaDB), Redis, RabbitMQ, and supported search engine technologies; a Git-based workflow with automatic build and deploy for efficient **Rapid development** and **Continuous deployment** every time you push code changes in a Platform as a Service (PaaS) environment; highly **Customizable** environment configuration files and [tools](#ece-tools-package); and AWS hosting that offers a **Scalable** and **Secure** environment for online sales and retailing.
 
 ## Technology stack
 
 Think of the {{site.data.var.ece}} as five functional layers, as shown here:
 
 ![Cloud Stack]
 
-Amazon Web Services (AWS) powers the underlying Infrastructure as a Service (IaaS) for {{site.data.var.ece}}. For {{site.data.var.ece}} Pro projects, you can choose either AWS or Microsoft Azure for IaaS support.
+Amazon Web Services (AWS) powers the underlying Infrastructure as a Service (IaaS) for {{site.data.var.ece}}. For {{site.data.var.ece}} Pro projects, you can choose either AWS or Microsoft® Azure for IaaS support.
 
 Each {{site.data.var.ece}} plan provides a PaaS Integration environment for developing, testing, and integrating services, see [{{site.data.var.ece}} architecture]({{ site.baseurl }}/cloud/architecture/cloud-architecture.html) for a comparison and additional features. New Relic provides granular visibility into the site performance. [Fastly]({{ site.baseurl }}/cloud/cdn/cloud-fastly.html) caches site assets and, as customers access the site and stores, loads the cached assets fast. The [Fastly Image Optimization]({{ site.baseurl }}/cloud/cdn/fastly-image-optimization.html) (IO) offloads image processing and resizing load, freeing servers to process orders and conversions efficiently.
 <!-- Also, the Fastly Web Application Firewall (WAF) prevents malicious traffic and other OWASP Top 10 threats from affecting the site. -->

src/cloud/bk-cloud.md

@@ -13,7 +13,7 @@ You can configure application settings, routes, build and deploy actions, and no
 -  [`.magento.app.yaml`]({{ site.baseurl }}/cloud/project/magento-app.html)—defines how to build and deploy {{site.data.var.ee}}, including services, hooks, and cron jobs.
 -  [`.magento.env.yaml`]({{ site.baseurl }}/cloud/project/magento-env-yaml.html)—centralizes the management of build and deploy actions across all of your environments, including Pro Staging and Production, using environment variables.
 -  [`.magento/routes.yaml`]({{ site.baseurl }}/cloud/project/routes.html)—configure caching, redirects, and server-side includes.
--  [`.magento/services.yaml`]({{ site.baseurl }}/cloud/project/services.html)—defines the services {{site.data.var.ee}} uses by name and version. For example, this file may include versions of MySQL, PHP extensions, Redis, RabbitMQ, and Elasticsearch. You must open a support ticket to push these changes to Pro plan Staging and Production environments.
+-  [`.magento/services.yaml`]({{ site.baseurl }}/cloud/project/services.html)—defines the services {{site.data.var.ee}} uses by name and version. For example, this file may include versions of MariaDB, PHP extensions, Redis, RabbitMQ, and Elasticsearch or OpenSearch. You must open a support ticket to push these changes to Pro plan Staging and Production environments.
 -  [`php.ini`]({{ site.baseurl }}/cloud/project/magento-app-php-ini.html)—an optional file that can be added to the project. The settings contained in this file are appended to the ones maintained by {{site.data.var.ece}}.
 
 When you push code changes, the active environment provisions container updates using the YAML configuration files.

src/cloud/env/environments.md

@@ -400,7 +400,7 @@ The method you choose is up to you. You have the following options:
 {:.procedure}
 To compress files and copy them to your local machine:
 
-1. Use SSH to login to the remote environment.
+1. Use SSH to log in to the remote environment.
 
 1. Compress the files.