Replaced duplicate v2.3 file with symlink and cleaned services topics (#5542)

-  Replaced duplicate v2.3 file with symlink and cleaned services topics
-  Updated the Enable RabbitMQ service instructions to match the other service-enablement procedures and added missing step to verify service relationships
- Cleaned the Set up Elastic search topic to place admonitions more strategically and link to the service-versions topic.
- Removed specific version from enable service procedures to simplify topic maintenance
- Fixed ul and ol spacing to pass lint checks
- Fixed syntax in ELASTICSUITE_CONFIGURATION yaml configuration example

Co-Authored-By: hguthrie <hguthrie@users.noreply.github.com>

Author: meker12

guides/v2.2/cloud/env/variables-deploy.md

@@ -227,7 +227,7 @@ stage:
       indices_settings:
         number_of_shards: 3
         number_of_replicas: 3
-        _merge: true
+      _merge: true
 ```
 
 **Known limitations**—

guides/v2.2/cloud/project/project-conf-files_services-elastic.md

@@ -14,87 +14,67 @@ functional_areas:
 -  Supports stop words and synonyms
 -  Indexing does not impact customers until the reindex operation completes
 
-{{site.data.var.ee}} supports [Elasticsearch]({{ site.baseurl }}/guides/v2.2/config-guide/elasticsearch/es-overview.html) versions 1.4, 1.7, 2.4, and 5.2 (requires {{site.data.var.ee}} v2.2.3 or later). The recommended version is 5.2.
+{% include cloud/service-config-integration-starter.md %}
+
+{: .bs-callout-warning}
+Staging and Production environments that are in the same cluster share a single Elasticsearch instance, so you must specify a unique Elasticsearch prefix for each of these environments.
 
 {:.procedure}
 To enable Elasticsearch:
 
-1.  Add the `elasticsearch` service to the `.magento/services.yaml` file with the Elasticsearch version and allocated disk space in MB.
+1. Add the `elasticsearch` service to the `.magento/services.yaml` file with the Elasticsearch version and allocated disk space in MB.
 
-    ```yaml
-    elasticsearch:
-        type: elasticsearch:5.2
-        disk: 1024
-    ```
+   ```yaml
+   elasticsearch:
+       type: elasticsearch:<version>
+       disk: 1024
+   ```
 
-1.  Set the `relationships` property in the `.magento.app.yaml` file.
+1. Set the `relationships` property in the `.magento.app.yaml` file.
 
-    ```yaml
-    relationships:
-        elasticsearch: "elasticsearch:elasticsearch"
-    ```
+   ```yaml
+   relationships:
+       elasticsearch: "elasticsearch:elasticsearch"
+   ```
 
-1.  Add, commit, and push code changes.
+1. Add, commit, and push code changes.
 
-    ```bash
-    git add -A && git commit -m "Enable Elasticsearch" && git push origin <branch-name>
-    ```
+   ```bash
+   git add -A && git commit -m "Enable Elasticsearch" && git push origin <branch-name>
+   ```
 
-    For information on how these changes affect your environments, see [Services]({{ page.baseurl }}/cloud/project/project-conf-files_services.html).
+   For information on how these changes affect your environments, see [Services]({{   page.baseurl }}/cloud/project/project-conf-files_services.html).
 
-1. [Verify the relationships]({{page.baseurl}}/cloud/project/project-conf-files_services.html#service-relationships) and configure Elasticsearch in the Admin UI.
+1. [Verify the service relationships]({{page.baseurl}}/cloud/project/project-conf-files_services.html#service-relationships) and configure Elasticsearch in the Admin UI.
 
 1. Reindex the Catalog Search index.
 
-    ```bash
-    bin/magento indexer:reindex catalogsearch_fulltext
-    ```
+   ```bash
+   bin/magento indexer:reindex catalogsearch_fulltext
+   ```
 
 1. Clean the cache.
 
-    ```bash
-    bin/magento cache:clean
-    ```
+   ```bash
+   bin/magento cache:clean
+   ```
+
+## Restart the Elasticsearch service
+
+If you need to restart the [Elasticsearch](https://www.elastic.co) service, you must contact Magento support.
 
-## Add Elasticsearch plugins
+## Elasticsearch plugins
 
-Optionally, you can add plugins with the `.magento/services.yaml` file. For example, to enable the ICU analysis plugin and Python script support plugin, add the `configuration:plugins` section with the listed plugin codes:
+Optionally, you can add Elasticsearch plugins by adding the `configuration:plugins` section to the `.magento/services.yaml` file. For example, the following code enables the ICU analysis plugin and Python script support plugins.
 
 ```yaml
 elasticsearch:
-    type: elasticsearch:5.2
+    type: elasticsearch:<service-version>
     disk: 1024
     configuration:
         plugins:
             - analysis-icu
             - lang-python
 ```
 
-The following are supported Elasticsearch plugins for version 2.4:
-
--  `analysis-icu`: ICU Analysis Plugin, Support ICU Unicode text analysis
--  `analysis-kuromoji`: Japanese (kuromoji) Analysis Plugin, Japanese language support
--  `analysis-phonetic`: Phonetic Analysis Plugin, Phonetic analysis
--  `analysis-smartcn`: Smart Chinese Analysis Plugins
--  `analysis-stempel`: Stempel Polish Analysis Plugin
--  `cloud-aws`: AWS Cloud Plugin, allows storing indices on AWS S3
--  `cloud-azure`: Azure Cloud Plugin
--  `cloud-gce`: GCE Cloud Plugin
--  `delete-by-query`: Support for deleting documents matching a given query
--  `discovery-multicast`: Ability to form a cluster using TCP/IP multicast messages
--  `lang-javascript`: JavaScript language plugin, allows the use of JavaScript in Elasticsearch scripts
--  `lang-python`: Python language plugin, allows the use of Python in Elasticsearch scripts
--  `mapper-attachments`: Mapper attachments plugin for indexing common file types
--  `mapper-murmur3`: Murmur3 mapper plugin for computing hashes at index-time
--  `mapper-size`: Size mapper plugin, enables the `_size` meta field
-
-See [Elasticsearch plugin documentation](https://www.elastic.co/guide/en/elasticsearch/plugins/2.4/index.html).
-
-{:.bs-callout-info}
-If you use the ElasticSuite third-party plugin, you must [update the `{{site.data.var.ct}}` package]({{page.baseurl}}/cloud/project/ece-tools-update.html) to version 2002.0.19 or later.
-
-{: .bs-callout-info }
-If you need to restart the [Elasticsearch](https://www.elastic.co) service, you must contact Magento support.
-
-{: .bs-callout-warning}
-Staging and Production environments that are in the same cluster share a single Elasticsearch instance, so you must specify a unique Elasticsearch prefix for each of these environments.
+If you use the ElasticSuite third-party plugin, you must [update the `{{site.data.var.ct}}` package]({{page.baseurl}}/cloud/project/ece-tools-update.html) to version 2002.0.19 or later.

guides/v2.2/cloud/project/project-conf-files_services-mysql.md

@@ -28,26 +28,26 @@ Accessing the MariaDB database directly requires you to use a SSH to log in to t
 
 1. Add the required name, type, and disk value (in MB) to the `.magento/services.yaml` file.
 
-    ```yaml
-    mysql:
-        type: mysql:10.2
-        disk: 2048
-    ```
+   ```yaml
+   mysql:
+       type: mysql:<version>
+       disk: 2048
+   ```
 
 1. Configure the relationships in the `.magento.app.yaml` file.
 
-    ```yaml
-    relationships:
-        database: "mysql:mysql"
-    ```
+   ```yaml
+   relationships:
+       database: "mysql:mysql"
+   ```
 
 1. Add, commit, and push your code changes.
 
-    ```bash
-    git add -A && git commit -m "Enable mysql service" && git push origin <branch-name>
-    ```
+   ```bash
+   git add -A && git commit -m "Enable mysql service" && git push   origin <branch-name>
+   ```
 
-1. [Verify the relationships]({{page.baseurl}}/cloud/project/project-conf-files_services.html#service-relationships).
+1. [Verify the service relationships]({{page.baseurl}}/cloud/project/project-conf-files_services.html#service-relationships).
 
 {: .bs-callout-tip }
 MySQL errors such as `PDO Exception: MySQL server has gone away` may be a result of exhausting existing disk space. Verify that you have allocated sufficient disk space to the service in the [`.magento/services.yaml`]({{ page.baseurl }}/cloud/project/project-conf-files_magento-app.html#disk) file.

guides/v2.2/cloud/project/project-conf-files_services-rabbit.md

@@ -10,31 +10,38 @@ The [Message Queue Framework (MQF)]({{ page.baseurl }}/config-guide/mq/rabbitmq-
 
 The MQF uses [RabbitMQ](http://www.rabbitmq.com) as the messaging broker, which provides a scalable platform for sending and receiving messages. It also includes a mechanism for storing undelivered messages. RabbitMQ is based on the Advanced Message Queuing Protocol (AMQP) 0.9.1 specification.
 
-We support RabbitMQ version 3.5.
-
 {:.bs-callout .bs-callout-warning}
 If you prefer using an existing AMQP-based service, like RabbitMQ, instead of relying on {{site.data.var.ece}} to create it for you, use the [`QUEUE_CONFIGURATION`]({{ page.baseurl }}/cloud/env/variables-deploy.html#queue_configuration) environment variable to connect it to your site.
 
 {% include cloud/service-config-integration-starter.md %}
 
-## Add RabbitMQ in services.yaml and .magento.app.yaml {#settings}
+{:.procedure}
+To enable RabbitMQ:
 
-To enable RabbitMQ, add the following code with your installed version and allocated disk space in MB to the `.magento/services.yaml` file.
+1. Add the required name, type, and disk value (in MB) to the `.magento/services.yaml` file along with the the installed RabbitMQ version.
 
-```yaml
-rabbitmq:
-    type: rabbitmq:<version>
-    disk: 1024
-```
+   ```yaml
+   rabbitmq:
+       type: rabbitmq:<version>
+       disk: 1024
+   ```
 
-To configure the relationships for the environment variable, set a relationship in your `.magento.app.yaml` file. For example:
+1. Configure the relationships in the `.magento.app.yaml` file.
 
-```yaml
-relationships:
-    rabbitmq: "rabbitmq:rabbitmq"
-```
+   ```yaml
+   relationships:
+       rabbitmq: "rabbitmq:rabbitmq"
+   ```
+
+1. Add, commit, and push your code changes.
 
-Merge and deploy the code to set the configurations for RabbitMQ. For information on how these changes affect your environments, see [`services.yaml`]({{ page.baseurl }}/cloud/project/project-conf-files_services.html).
+   ```bash
+   git add -A && git commit -m "Enable RabbitMQ service" && git push origin <branch-name>
+   ```
+
+1. [Verify the service relationships]({{page.baseurl}}/cloud/project/project-conf-files_services.html#service-relationships).
+
+For information on how these changes affect your environments, see [`services.yaml`]({{ page.baseurl }}/cloud/project/project-conf-files_services.html).
 
 ## Connect to RabbitMQ for debugging {#connect}
 
@@ -46,17 +53,17 @@ For debugging purposes, it is useful to directly connect to a service instance i
 
 ### Connect from your local development environment {#cloud-rabbitmq-conn-loc}
 
-1.  Log in to the Magento Cloud CLI and project:
+1. Log in to the Magento Cloud CLI and project:
 
-    ```bash
-    magento-cloud login
-    ```
+   ```bash
+   magento-cloud login
+   ```
 
-1.  Checkout the environment with RabbitMQ installed and configured.
+1. Checkout the environment with RabbitMQ installed and configured.
 
-    ```bash
-    magento-cloud environment:checkout <environment-id>
-    ```
+   ```bash
+   magento-cloud environment:checkout <environment-id>
+   ```
 
 1. Use SSH to connect to the Cloud environment:
 

guides/v2.2/cloud/project/project-conf-files_services-redis.md

@@ -20,14 +20,14 @@ To enable Redis:
 
   ```yaml
   myredis:
-      type: redis:5.0
+      type: redis:<version>
   ```
 
   To provide your own Redis configuration, add a `core_config` key in your `.magento/services.yaml` file:
 
   ```yaml
   cache:
-      type: redis:5.0
+      type: redis:<version>
   ```
 
 1. Configure the relationships in the `.magento.app.yaml` file.
@@ -47,7 +47,7 @@ To enable Redis:
    git add -A && git commit -m "Enable redis service" && git push origin <branch-name>
    ```
 
-1. [Verify the relationships]({{page.baseurl}}/cloud/project/project-conf-files_services.html#service-relationships).
+1. [Verify the service relationships]({{page.baseurl}}/cloud/project/project-conf-files_services.html#service-relationships).
 
 ## Using the Redis CLI
 
@@ -57,6 +57,6 @@ Assuming your Redis relationship is named `redis`, you can access it using the `
 
 1. Open an SSH tunnel to a host.
 
-    ```bash
-    redis-cli -h redis.internal
-    ```
+   ```bash
+   redis-cli -h redis.internal
+   ```

guides/v2.2/cloud/project/project-conf-files_services.md

@@ -101,53 +101,60 @@ The current default storage amount per project is 5GB, or 5120MB. You can distri
 
 ## Service relationships
 
-{{site.data.var.ece}} uses the [`$MAGENTO_CLOUD_RELATIONSHIPS`]({{page.baseurl}}/cloud/env/environment-vars_cloud.html) environment variable to retrieve environment-related relationships. For services to be available to an application in your project, you must specify [*relationships*]({{ page.baseurl }}/cloud/project/project-conf-files_magento-app.html#relationships) between applications and services in the `.magento.app.yaml` file.
+In {{ site.data.var.ece }} projects, service [*relationships*]({{ page.baseurl }}/cloud/project/project-conf-files_magento-app.html#relationships) configured in the `.magento.app.yaml` file determine which services are available to your application.
+
+You can retrieve the configuration data for all service relationships from the [`$MAGENTO_CLOUD_RELATIONSHIPS`]({{page.baseurl}}/cloud/env/environment-vars_cloud.html) environment variable. The configuration data includes service name, type, and version along with any required connection details such as port number and login credentials.
 
 {:.procedure}
 To verify relationships in local environment:
 
 1. In your local environment, show the relationships for the active environment.
 
-    ```bash
-    magento-cloud relationships
-    ```
+   ```bash
+   magento-cloud relationships
+   ```
 
 1. Confirm the `service` and `type` from the response. The response provides connection information, such as the IP address and port number.
 
-    **Abbreviated sample response**:
-
-    ```terminal
-    redis:
-        -
-    ...
-            type: 'redis:3.2'
-            port: 6379
-    elasticsearch:
-        -
-    ...
-            type: 'elasticsearch:6.5'
-            port: 9200
-    database:
-        -
-    ...
-            type: 'mysql:10.0'
-            port: 3306
-
-    ```
-    {:.no-copy}
+   **Abbreviated sample response**:
+
+   ```terminal
+   redis:
+       -
+   ...
+           type: 'redis:3.2'
+           port: 6379
+   elasticsearch:
+       -
+   ...
+           type: 'elasticsearch:6.5'
+           port: 9200
+   database:
+       -
+   ...
+           type: 'mysql:10.0'
+           port: 3306
+   ```
+   {:.no-copy}
 
 {:.procedure}
 To verify relationships in remote environments:
 
 1. Use SSH to log in to the remote environment.
 
-1. Create `pretty-print` to show all relationships for services and configuration data for that environment.
+1. List the relationships configuration data for all services configured in the environment.
 
-    ```bash
-    php -r 'print_r(json_decode(base64_decode($_ENV["MAGENTO_CLOUD_RELATIONSHIPS"])));'
-    ```
+   ```bash
+   echo $MAGENTO_CLOUD_RELATIONSHIPS | base64 -d | json_pp
+   ```
 
-1. Confirm the `service` and `type` from the response. The response provides connection information, such as the IP address and port number.
+   or
+
+   ```bash
+   php -r 'print_r(json_decode(base64_decode($_ENV["MAGENTO_CLOUD_RELATIONSHIPS"])));'
+   ```
+
+1. Confirm the `service` and `type` from the response. The response provides connection information, such as the IP address and port number and any required username and password credentials.
 
 ## Service versions