Merge branch 'main' into network-sec-core

Author: shainaraskas

deploy-manage/autoscaling/trained-model-autoscaling.md

@@ -81,7 +81,7 @@ Refer to the tables in the [Model deployment resource matrix](#model-deployment-
 
 In {{serverless-full}}, Search projects are given access to more processing resources, while Security and Observability projects have lower limits. This difference is reflected in the UI configuration: Search projects have higher resource limits compared to Security and Observability projects to accommodate their more complex operations.
 
-On {{serverless-short}}, adaptive allocations are automatically enabled for all project types. However, the "Adaptive resources" control is not displayed in {{kib}} for Observability and Security projects.
+On {{serverless-short}}, adaptive allocations are automatically enabled for all project types.
 
 ## Model deployment resource matrix [model-deployment-resource-matrix]
 
@@ -152,16 +152,6 @@ In case of ingest-optimized deployments, we maximize the number of model allocat
 
 :::
 
-:::{tab-item} {{serverless-short}}
-
-| Level | Allocations | Threads | VCUs |
-| --- | --- | --- | --- |
-| Low | Exactly 2 | 1 | 16 |
-| Medium | Exactly 32 | 1 | 256 |
-| High | 512 for Search<br> No static allocations for Security and Observability<br> | 1 | 4096 for Search<br> No static allocations for Security and Observability<br> |
-
-:::
-
 ::::
 
 ### Search optimized
@@ -188,9 +178,9 @@ In case of search-optimized deployments, we maximize the number of threads. The
 
 | Level | Allocations | Threads | VCUs |
 | --- | --- | --- | --- |
-| Low | 0 to 1 dynamically | Always 2 | 0 to 16 dynamically |
-| Medium | 1 to 2 (if threads=16), dynamically | Maximum (for example, 16) | 8 to 256 dynamically |
-| High | 1 to 32 (if threads=16), dynamically<br> 1 to 128 for Security and Observability<br> | Maximum (for example, 16) | 8 to 4096 for Search<br> 8 to 1024 for Security and Observability<br> |
+| Low | 0 to 1 dynamically | 2 | 0 to 16 dynamically |
+| Medium | 0 to 2 dynamically for Search and Observatibility<br> 1 to 2 dynamically for Security | 4 | 0 to 256 dynamically for Search and Observatibility<br> 8 to 256 dynamically for Security |
+| High | 0 to 32 dynamically for Search and Observatibility<br> 1 to 128 dynamically for Security<br> | 8 | 0 to 4096 dynamically for Search<br> 0 to 1024 dynamically for Observability<br>8 to 1014 dynamically for Security |
 
 :::
 
@@ -212,14 +202,4 @@ In case of search-optimized deployments, we maximize the number of threads. The
 
 :::
 
-:::{tab-item} {{serverless-short}}
-
-| Level | Allocations | Threads | VCUs |
-| --- | --- | --- | --- |
-| Low | 1 statically | Always 2 | 16 |
-| Medium | 2 statically (if threads=16) | Maximum (for example, 16) | 256 |
-| High | 32 statically (if threads=16) for Search<br> No static allocations for Security and Observability<br> | Maximum (for example, 16) | 4096 for Search<br> No static allocations for Security and Observability<br> |
-
-:::
-
 ::::

deploy-manage/cloud-organization/billing/serverless-project-billing-dimensions.md

@@ -15,6 +15,7 @@ products:
 * [Offerings](#offerings)
 * [Add-ons](#add-ons)
 
+Specific prices can be found in the [Cloud Pricing Table](https://cloud.elastic.co/cloud-pricing-table?productType=serverless).
 
 ## Offerings [offerings] 
 

deploy-manage/deploy/cloud-enterprise/add-custom-bundles-plugins.md

@@ -71,7 +71,7 @@ Custom plugins can include the official {{es}} plugins not provided with {{ece}}
                     "elasticsearch_version" : "<es_version>" <2>
                   },
                   {
-                    "url": "http://www.MYURL.com/my-custom-plugin.zip",
+                    "url": "<MY_HOST_URL>/my-custom-plugin.zip",
                     "name": "my-custom-plugin",
                     "elasticsearch_version": "7.17.1"
                   }
@@ -105,7 +105,7 @@ This example adds a custom LDAP bundle for deployment level role-based access co
                 "user_bundles": [
                 {
                   "name": "ldap-cert",
-                  "url": "http://www.MYURL.com/ldapcert.zip", <1>
+                  "url": "<MY_HOST_URL>/ldapcert.zip", <1>
                   "elasticsearch_version": "*"
                 }
               ]
@@ -151,7 +151,7 @@ In this example, we assume the Identity Provider does not publish its SAML metad
                 "user_bundles": [
                 {
                   "name": "saml-metadata",
-                  "url": "http://www.MYURL.com/saml-metadata.zip", <1>
+                  "url": "<MY_HOST_URL>/saml-metadata.zip", <1>
                   "elasticsearch_version": "*"
                 }
               ]
@@ -184,7 +184,7 @@ In this example, we assume the Identity Provider does not publish its SAML metad
 
 ## Example: Custom JVM trust store bundle [ece-add-custom-bundle-example-cacerts]
 
-If you are using SSL certificates signed by non-public certificate authorities, {{es}} is not able to communicate with the services using those certificates unless you import a custom JVM trust store containing the certificates of your signing authority into your {{ece}} installation. You’ll need the trust store to access snapshot repositories like Minio, for your {{ece}} proxy, or to reindex from remote.
+If you are using SSL certificates signed by non-public certificate authorities, {{es}} is not able to communicate with the services using those certificates unless you import a custom JVM trust store containing the certificates of your signing authority into your {{ece}} installation. You’ll need the trust store to access snapshot repositories like MinIO, for your {{ece}} proxy, or to reindex from remote.
 
 To import a JVM trust store:
 
@@ -254,7 +254,7 @@ To import a JVM trust store:
                 "user_bundles": [
                 {
                   "name": "custom-ca-certs",
-                  "url": "http://www.MYURL.com/cacerts.zip", <1>
+                  "url": "<MY_HOST_URL>/cacerts.zip", <1>
                   "elasticsearch_version": "*" <2>
                 }
               ]
@@ -309,7 +309,7 @@ To import a JVM trust store:
                 "user_bundles": [
                 {
                   "name": "custom-geoip-db",
-                  "url": "http://www.MYURL.com/my-geoip-file.zip",
+                  "url": "<MY_HOST_URL>/my-geoip-file.zip",
                   "elasticsearch_version": "*"
                 }
               ]
@@ -359,7 +359,7 @@ To import a JVM trust store:
                 "user_bundles": [
                 {
                   "name": "custom-synonyms",
-                  "url": "http://www.MYURL.com/synonyms.zip",
+                  "url": "<MY_HOST_URL>/synonyms.zip",
                   "elasticsearch_version": "*"
                 }
               ]

deploy-manage/deploy/cloud-enterprise/ce-add-support-for-node-roles-autoscaling.md

@@ -1418,7 +1418,7 @@ Having added support for `node_roles` and autoscaling to your custom template, i
 1. Obtain the existing deployment templates by sending the following `GET` request, and take note of the `id` of the template you wish to update.
 
     ```sh
-    curl -k -X GET -H "Authorization: ApiKey $ECE_API_KEY" https://COORDINATOR_HOST:12443/api/v1/deployments/templates?region=ece-region
+    curl -k -X GET -H "Authorization: ApiKey $ECE_API_KEY" https://$COORDINATOR_HOST:12443/api/v1/deployments/templates?region=ece-region
     ```
 
 2. Send a `PUT` request with the updated template on the payload, in order to effectively replace the outdated template with the new one. Note that the following request is just an example, you have to replace `{{template_id}}` with the `id` you collected on step 1. and set the payload to the updated template JSON. Check [set deployment template API](https://www.elastic.co/docs/api/doc/cloud-enterprise/operation/operation-set-deployment-template-v2) for more details.

deploy-manage/deploy/cloud-enterprise/change-endpoint-urls.md

@@ -15,8 +15,8 @@ products:
 By default, the deployments `CNAME` is set to `LOCAL_HOST_IP.ip.es.io`, where `LOCAL_HOST_IP` is the IP address of the first installed ECE host. This results in the following default endpoint URLs:
 
 ```sh
-http://CLUSTER_ID.LOCAL_HOST_IP.ip.es.io:9200
-https://CLUSTER_ID.LOCAL_HOST_IP.ip.es.io:9243
+http://<CLUSTER_ID.LOCAL_HOST_IP>.ip.es.io:9200
+https://<CLUSTER_ID.LOCAL_HOST_IP>.ip.es.io:9243
 ```
 
 ::::{important}

deploy-manage/deploy/cloud-enterprise/configure-allocator-affinity.md

@@ -42,7 +42,7 @@ $$$fill-anti-affinity$$$`fill-anti-affinity` (default)
 To check how allocator affinity is currently configured:
 
 ```sh
-curl -X GET -u admin:PASSWORD -k https://COORDINATOR_HOST:12443/api/v1/platform/configuration/store/constructor
+curl -X GET -u admin:PASSWORD -k https://$COORDINATOR_HOST:12443/api/v1/platform/configuration/store/constructor
 {
   "errors": [{
     "code": "platform.config.store.not_found",
@@ -56,7 +56,7 @@ If a configuration option cannot be found, the default `fill-anti-affinity` stra
 To set allocator affinity to the `distribute-anti-affinity` strategy:
 
 ```sh
-curl -X POST -u admin:PASSWORD -k https://COORDINATOR_HOST:12443/api/v1/platform/configuration/store/constructor -H 'Content-Type: application/json' -d '{ "value": "{ \"allocator_prioritization\": \"distribute-anti-affinity\" }" }'
+curl -X POST -u admin:PASSWORD -k https://$COORDINATOR_HOST:12443/api/v1/platform/configuration/store/constructor -H 'Content-Type: application/json' -d '{ "value": "{ \"allocator_prioritization\": \"distribute-anti-affinity\" }" }'
 {
   "changed": false,
   "name": "constructor",
@@ -67,7 +67,7 @@ curl -X POST -u admin:PASSWORD -k https://COORDINATOR_HOST:12443/api/v1/platform
 To update allocator affinity to the `distribute` strategy:
 
 ```sh
-curl -X PUT -u admin:PASSWORD -k https://COORDINATOR_HOST:12443/api/v1/platform/configuration/store/constructor -H 'Content-Type: application/json' -d '{ "value": "{ \"allocator_prioritization\": \"distribute\" }" }'
+curl -X PUT -u admin:PASSWORD -k https://$COORDINATOR_HOST:12443/api/v1/platform/configuration/store/constructor -H 'Content-Type: application/json' -d '{ "value": "{ \"allocator_prioritization\": \"distribute\" }" }'
 {
   "changed": true,
   "name": "constructor",
@@ -78,7 +78,7 @@ curl -X PUT -u admin:PASSWORD -k https://COORDINATOR_HOST:12443/api/v1/platform/
 To change allocator affinity back to the default behavior:
 
 ```sh
-curl -X DELETE -u admin:PASSWORD -k https://COORDINATOR_HOST:12443/api/v1/platform/configuration/store/constructor
+curl -X DELETE -u admin:PASSWORD -k https://$COORDINATOR_HOST:12443/api/v1/platform/configuration/store/constructor
 {
 
 }

deploy-manage/deploy/cloud-enterprise/configure-host-rhel.md

@@ -144,7 +144,7 @@ Make sure to use a supported combination of Linux distribution and container eng
 
     ```text
     [engine]
-    env = ["HTTP_PROXY=http://{proxy-ip}:{proxy-port}", "HTTPS_PROXY=http://{proxy-ip}:{proxy-port}"]
+    env = ["HTTP_PROXY=http://<PROXY_IP>:<PROXY_PORT>", "HTTPS_PROXY=http://<PROXY_IP>:<PROXY_PORT>"]
     ```
 
 7. Reload systemd configuration

deploy-manage/deploy/cloud-enterprise/connect-elasticsearch.md

@@ -32,7 +32,7 @@ Once you have the endpoint, use it in your client application. To test connectiv
 * Modify the following `curl` example to fit your environment by replacing the URL and proxy CA certificate with your own values.
 
   ```sh
-  curl --cacert /path/to/elastic-ece-ca-cert.pem -u elastic https://f76e96da2a7f4d3f8f3ee25d686b879c.HOST-IP-ADDRESS.ip.es.io:9243
+  curl --cacert /path/to/elastic-ece-ca-cert.pem -u elastic https://<CLUSTER_ID.LOCAL_HOST_IP>.ip.es.io:9243
   {
     "name" : "instance-0000000000",
     "cluster_name" : "f76e96da2a7f4d3f8f3ee25d686b879c",

deploy-manage/deploy/cloud-enterprise/ece-configuring-ece-configure-system-templates.md

@@ -28,7 +28,7 @@ The API user must have the `Platform admin` role in order to configure system te
 1. Obtain the existing system deployment template you wish to modify. Note the `id` of the system deployment template as you will include this value in the API call to edit the template.
 
     ```sh
-    curl -k -X GET -H "Authorization: ApiKey $ECE_API_KEY" https://COORDINATOR_HOST:12443/api/v1/deployments/templates?region=ece-region
+    curl -k -X GET -H "Authorization: ApiKey $ECE_API_KEY" https://$COORDINATOR_HOST:12443/api/v1/deployments/templates?region=ece-region
     ```
 
 2. Edit the JSON of the system deployment template you wish to modify.

deploy-manage/deploy/cloud-enterprise/ece-configuring-ece-create-templates.md

@@ -89,7 +89,7 @@ Before you start creating your own deployment templates, you should have: [tagge
 1. Obtain the existing deployment templates to get some examples of what the required JSON looks like. You can take the JSON for one of the existing templates and modify it to create a new template, similar to what gets shown in the next step.
 
     ```sh
-    curl -k -X GET -H "Authorization: ApiKey $ECE_API_KEY" https://COORDINATOR_HOST:12443/api/v1/deployments/templates?region=ece-region
+    curl -k -X GET -H "Authorization: ApiKey $ECE_API_KEY" https://$COORDINATOR_HOST:12443/api/v1/deployments/templates?region=ece-region
     ```
 
 2. Post the JSON for your new deployment template.