Update Cloud service versions for 2.3.5 (#7133)

* Update Cloud service versions for 2.3.5

* Added note that changing service configuration on Pro projects requires 48 hours after Support ticket received

* Add IP addresses for US-5 Region

* Add include file for Elasticsearch note

* Add note about required New Relic upgrade on PHP version

* Update project-upgrade.md

* Fix syntax error

* Noted that PHP version upgrade requires New Relic upgrade

Fixes #6411.

* Updates based on review feedback

Author: meker12

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

@@ -2,6 +2,6 @@ The following table lists compatible versions of the Elasticsearch software supp
 
 Elasticsearch service   |  Elasticsearch composer package | Status
 --------- | ------------- | -------------------------
-1.7 – 2.4.x| 2.x.x | deprecated
-5.2.x | 5.x.x | default versions for {{ site.data.var.ee }} versions 2.2.x - 2.2.7 and 2.3.0
-6.x | 6.x | recommended, default versions for {{ site.data.var.ee }} versions 2.2.8 and 2.3.1 and later.
+5.2.x | 5.x.x | default versions for {{ site.data.var.ee }} versions 2.2.x to 2.2.7 and 2.3.0
+6.5 | 6.5 | recommended, default version for {{ site.data.var.ee }} versions 2.2.8 and 2.3.4
+7.2, 7.5 | 7.x | recommended versions for {{ site.data.var.ee }} versions 2.3.5 and later

src/_includes/cloud/note-pro-using-yaml-support.md

@@ -1,2 +1,2 @@
  {:.bs-callout-info}
-For Pro projects, you must create a [Support ticket](http://support.magento.com) to install or update services in Staging and Production environments. Indicate the service changes needed and include your updated `.magento.app.yaml` and `services.yaml` files in the ticket.
+For Pro projects, you must create a [Support ticket](http://support.magento.com) to install or update services in Staging and Production environments. Indicate the service changes needed and include your updated `.magento.app.yaml` and `services.yaml` files in the ticket. It can take up to 48 hours for the Cloud infrastructure team to update your project.

src/cloud/env/environments-start.md

@@ -116,12 +116,13 @@ If you have a corporate firewall that blocks outgoing SSH connections, you can a
 
 <table>
 <tr>
-<th colspan="6"><b>Incoming IP addresses</b></th>
+<th colspan="7"><b>Incoming IP addresses</b></th>
 </tr>
 <tr>
 <td>US Region</td>
 <td>US-2 Region</td>
 <td>US-3 Region</td>
+<td>US-5 Region</td>
 <td>EU Region</td>
 <td>EU-3 Region</td>
 <td>AP-3 Region</td>
@@ -143,6 +144,11 @@ If you have a corporate firewall that blocks outgoing SSH connections, you can a
 <p>34.215.10.85</p>
 </td>
 <td>
+<p>50.112.160.58</p>
+<p>54.213.195.223</p>
+<p>35.163.170.185</p>
+</td>
+<td>
 <p>52.209.44.44</p>
 <p>52.209.23.96</p>
 <p>52.51.117.101</p>
@@ -162,12 +168,13 @@ If you have a corporate firewall that blocks outgoing SSH connections, you can a
 
 <table>
 <tr>
-<th colspan="6"><b>Outgoing IP addresses</b></th>
+<th colspan="7"><b>Outgoing IP addresses</b></th>
 </tr>
 <tr>
 <td>US Region</td>
 <td>US-2 Region</td>
 <td>US-3 Region</td>
+<td>US-5 Region</td>
 <td>EU Region</td>
 <td>EU-3 Region</td>
 <td>AP-3 Region</td>
@@ -189,6 +196,11 @@ If you have a corporate firewall that blocks outgoing SSH connections, you can a
 <p>34.213.20.158</p>
 </td>
 <td>
+<p>54.70.238.217</p>
+<p>52.88.113.98</p>
+<p>52.36.188.230</p>
+</td>
+<td>
 <p>52.51.163.159</p>
 <p>52.209.44.60</p>
 <p>52.208.156.247</p>

src/cloud/project/new-relic.md

@@ -65,6 +65,9 @@ runtime:
         - newrelic
 ```
 
+{:.bs-callout-warning}
+If you upgrade the PHP version on your {{site.data.var.ece}} project, you must submit a Magento Support ticket to update the New Relic service.
+
 ## Connect to New Relic
 
 To connect a Cloud environment to New Relic, you must add the New Relic license key to the environment.

src/cloud/project/project-conf-files_services-elastic.md

@@ -159,10 +159,12 @@ To check Elasticsearch software compatibility:
 
    If the versions are incompatible, make one of the following updates to your environment configuration:
 
-   -  Change the Elasticsearch service version in the `services.yaml` file to a version that is compatible with the Elasticsearch PHP client. On Pro Staging and Production environments, you must submit a support ticket to change the Elasticsearch service version.
-
    -  [Change the Elasticsearch PHP client]({{ site.baseurl }}/guides/v2.3/config-guide/elasticsearch/es-downgrade.html) to a version that is compatible with the Elasticsearch service version.
 
+   -  Change the Elasticsearch service version in the `services.yaml` file to a version that is compatible with the Elasticsearch PHP client.
+
+      {%include /cloud/note-pro-using-yaml-support.md%}
+
 ## Restart the Elasticsearch service
 
 If you need to restart the [Elasticsearch](https://www.elastic.co) service, you must contact Magento support.

src/cloud/project/project-conf-files_services.md

@@ -15,8 +15,7 @@ This affects the following environments:
 -  All Starter environments including Production `master`
 -  Pro Integration environments
 
-{:.bs-callout-tip}
-For Pro, you must enter a [Support ticket]({{ site.baseurl }}/cloud/trouble/trouble.html) to install or update services in the Staging and Production environments. Indicate the service changes needed and include your updated `.magento.app.yaml` and `services.yaml` files in the ticket.
+{%include cloud/note-pro-using-yaml-support.md%}
 
 ## Default and supported services
 
@@ -161,14 +160,14 @@ The following table lists the services used in {{site.data.var.ece}} and their v
 
 Service   |  Magento 2.3  | Magento 2.2
 --------- | ------------- | ------------
-`elasticsearch` | Magento 2.3.1 and later—1.7, 2.4, 5.2, 6.5<br>Magento 2.3.0—1.7, 2.4, 5.2 | Magento versions 2.2.8 and later—1.7, 2.4, 5.2, 6.5<br>Magento 2.2.0 to 2.2.7—1.7, 2.4, 5.2
+`elasticsearch` | *Magento version 2.3.5 and later*–– 5.2, 6.5, 7.2, 7.5<br>*Magento version 2.3.1 to 2.3.4*–– 6.5<br>*Magento version 2.3.0*–– 2.4, 5.2  | *Magento version 2.2.8 and later*–– 5.2, 6.5 <br>*Magento version 2.2.0 to 2.2.7*–– 5.2
 `mariadb` | 10.0 to 10.2  | 10.0 to 10.2
 `nginx`   | 1.9           | 1.9
 `node`    | 6, 8, 10, 11  | 6, 8, 10, 11
-`php`     | Magento 2.3.3 and later—7.1, 7.2, 7.3<br>Magento 2.3.0 to 2.3.2—7.1, 7.2 | Magento 2.2.10 and later—7.1, 7.2<br>Magento 2.2.5 to 2.2.9—7.0, 7.1<br>Magento 2.2.4 and earlier—7.0.2, 7.0.4, ~7.0.6, 7.1<br><br>**Note:** Beginning with {{ site.data.var.ct }} v2002.1.0, you must use PHP version 7.1.3 or later for both Magento 2.2 and 2.3.
-`rabbitmq`| 3.5, 3.7, 3.8      | 3.5
-`redis`   | 3.2, 4.0, 5.0 | 3.2, 4.0, 5.0
-`varnish` | Magento 2.3.3 and later—4.0, 5.0, 6.2<br>Magento 2.3.0 to 2.3.2—4.0, 5.0 | 4.0, 5.0
+`php`     | *Magento version 2.3.4 and later*–– 7.1, 7.2<br>*Magento version 2.3.3*–– 7.1, 7.2, 7.3<br>*Magento version 2.3.0 to 2.3.2*––  7.1, 7.2 | *Magento version 2.2.10 and later*––  7.1, 7.2<br>*Magento version 2.2.5 to 2.2.9*––  7.0, 7.1<br>*Magento version 2.2.4 and earlier*–– 7.0.2, 7.0.4, ~7.0.6, 7.1<br><br>**Note:** Beginning with {{ site.data.var.ct }} v2002.1.0, you must use PHP version 7.1.3 or later for both Magento 2.2 and 2.3.
+`rabbitmq`| *Magento version 2.3.4*–– 3.7, 3.8<br>*Magento version 2.3.0 to 2.3.3*–– 3.7     | 3.5
+`redis`   | *Magento version 2.3.1 and later*–– 4.0, 5.0<br>*Magento version 2.3.0*–– 3.2, 4.0 | 3.2, 4.0, 5.0
+`varnish` | *Magento version 2.3.3 and later*—– 4.0, 5.0, 6.2<br>*Magento version 2.3.0 to 2.3.2*—– 4.0, 5.0 | 4.0, 5.0
 
 {:.bs-callout-info}
 When you set up the Elasticsearch service, check to ensure that you use a version that is compatible with the installed [Elasticsearch PHP](https://github.com/elastic/elasticsearch-php) client. See [Check Elasticsearch software compatibility]({{ site.baseurl }}/cloud/project/project-conf-files_services-elastic.html#elasticsearch-software-compatibility).

src/cloud/project/project-upgrade.md

@@ -14,14 +14,16 @@ You can upgrade the core {{site.data.var.ee}} code base to a newer version. Befo
 
 ## Upgrade from older versions of the Magento application
 
-If you are upgrading from 2.1.4 or later to 2.2.x or later, review the [{{site.data.var.ece}} service versions][version compatibility matrix] information for the latest software version requirements. Your upgrade tasks may include the following:
+Review the [{{site.data.var.ece}} service versions][version compatibility matrix] information for the latest software version requirements. Your upgrade tasks may include the following:
 
--  Upgrade your PHP version
+-  Update your PHP version Elasticsearch version, and other services
 -  Convert an older configuration management file
 -  Update the `.magento.app.yaml` file with new settings for hooks and environment variables
 -  Upgrade third-party extensions to the latest supported version
 -  Update the `.gitignore` file
 
+{:.bs-callout-info}
+If you upgrade the PHP version, you must also submit a Support ticket to update the New Relic service.
 ### Configuration management
 
 If you are upgrading from 2.1.4 or later to 2.2.x or later and use [Configuration Management], you need to migrate the `config.local.php` file. Older versions used a `config.local.php` file for Configuration Management, but version 2.2.0 and later use the `config.php` file. This file works exactly like the `config.local.php` file, but it has different configuration settings that include a list of your enabled modules and additional configuration options.
@@ -90,15 +92,15 @@ To update the `.magento.app.yaml` file:
 
 Review the [service versions][version compatibility matrix] information for the latest software version requirements before upgrading your Magento application.
 
+{%include cloud/note-pro-using-yaml-support.md%}
+
 ### Back up the database
 
 {% include cloud/backup-db.md %}
 
 ### Complete the upgrade
 
-If you use PHP version 7.2, you must remove the `mcrypt` extension from the [extensions section of the .magento.app.yaml file].
-
- {:.bs-callout-info}
+{:.bs-callout-info}
 When upgrading to 2.3.x from 2.2.x, you must verify that the `composer.json` file contains `"Zend\\Mvc\\Controller\\": "setup/src/Zend/Mvc/Controller/"` in the `"psr-4":` section of the `autoload` property.
 
 {:.procedure}