Skip to content

Commit

Permalink
Merge branch 'main' into logs-explorer-removal
Browse files Browse the repository at this point in the history
  • Loading branch information
mdbirnstiehl authored Mar 6, 2025
2 parents b5067bd + befdcbf commit 850d762
Show file tree
Hide file tree
Showing 203 changed files with 933 additions and 5,486 deletions.
3 changes: 2 additions & 1 deletion deploy-manage/cloud-organization/billing.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@
mapped_urls:
- https://www.elastic.co/guide/en/cloud/current/ec-billing.html
- https://www.elastic.co/guide/en/serverless/current/general-manage-billing.html
- https://www.elastic.co/guide/en/serverless/current/general-billing-stop-project.html
applies_to:
deployment:
ess: all
Expand All @@ -21,7 +22,7 @@ Elastic charges a recurring fee for using our offerings on {{ecloud}}. In this s
* [Elasticsearch projects](/deploy-manage/cloud-organization/billing/elasticsearch-billing-dimensions.md)
* [Elastic Observability projects](/deploy-manage/cloud-organization/billing/elastic-observability-billing-dimensions.md)
* [Elastic Security projects](/deploy-manage/cloud-organization/billing/security-billing-dimensions.md)

For more information, you can also refer to our [{{ech}}](https://www.elastic.co/pricing) and [{{serverless-full}}](https://www.elastic.co/pricing/serverless-search) pricing pages.

## Billing models
Expand Down
33 changes: 20 additions & 13 deletions deploy-manage/deploy/cloud-enterprise/air-gapped-install.md
Original file line number Diff line number Diff line change
@@ -1,26 +1,33 @@
---
applies_to:
deployment:
ece: all
mapped_urls:
- https://www.elastic.co/guide/en/elastic-stack/current/air-gapped-install.html
- https://www.elastic.co/guide/en/cloud-enterprise/current/ece-install-offline.html
---

# Air gapped install
# Air-gapped install [ece-install-offline]

% What needs to be done: Refine
Installing ECE on hosts without internet access is commonly referred to as an *offline* or *air-gapped* installation. ECE supports two air-gapped installation methods, depending on whether a private Docker registry is available. In both cases, you must download multiple Docker images and the installation script from Elastic, and load them onto your hosts or private registry.

% GitHub issue: https://github.com/elastic/docs-projects/issues/309
::::{note}
The versioning of {{es}} and {{kib}} is synchronized and versions where the major, minor, and patch levels match can be used together. Differences in build versions indicated by a dash do not affect compatibility.
::::

% Scope notes: In the issue
Before you start, you must:

% Use migrated content from existing pages that map to this page:
* Follow the same prerequisites described in [](./install.md#ece-install-prerequisites). This includes [](./identify-deployment-scenario.md) and [](./prepare-environment.md) steps.
* [Configure your operating system](./configure-operating-system.md) in all ECE hosts.
* Be part of the `docker` group to run the installation script. You should not install Elastic Cloud Enterprise as the `root` user.
* Set up and run a local copy of the Elastic Package Repository, otherwise your deployments with APM server and Elastic agent won’t work. Refer to the [Running EPR in air-gapped environments](asciidocalypse://docs/docs-content/docs/reference/ingestion-tools/fleet/air-gapped.md#air-gapped-diy-epr) documentation.

% - [ ] ./raw-migrated-files/stack-docs/elastic-stack/air-gapped-install.md
% - [ ] ./raw-migrated-files/cloud/cloud-enterprise/ece-install-offline.md
% Notes: 3 child docs
When you are ready to install ECE, you can proceed:

⚠️ **This page is a work in progress.** ⚠️
* [With your private Docker registry](./ece-install-offline-with-registry.md)
* [Without a private Docker registry](./ece-install-offline-no-registry.md)

The documentation team is working to combine content pulled from the following pages:
After installing ECE in your hosts, you can continue with [](./post-installation-steps.md).

* [/raw-migrated-files/stack-docs/elastic-stack/air-gapped-install.md](/raw-migrated-files/stack-docs/elastic-stack/air-gapped-install.md)
* [/raw-migrated-files/cloud/cloud-enterprise/ece-install-offline.md](/raw-migrated-files/cloud/cloud-enterprise/ece-install-offline.md)
::::{note}
Deployment End-of-life (EOL) information relies on the connection to [https://www.elastic.co/support/eol.json](https://www.elastic.co/support/eol.json). If EOL information is updated, Elastic may require you to reconnect to [https://www.elastic.co/support/eol.json](https://www.elastic.co/support/eol.json) over the internet to get this information reflected.
::::
Original file line number Diff line number Diff line change
@@ -1,6 +1,10 @@
---
applies_to:
deployment:
ece: all
mapped_pages:
- https://www.elastic.co/guide/en/cloud-enterprise/current/ece-configure-ansible.html
navigation_title: Ansible playbook
---

# Alternative: Install ECE with Ansible [ece-configure-ansible]
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,7 @@
---
applies_to:
deployment:
ece: all
mapped_pages:
- https://www.elastic.co/guide/en/cloud-enterprise/current/ece-change-roles.html
---
Expand Down
Original file line number Diff line number Diff line change
@@ -1,14 +1,19 @@
---
navigation_title: Data tiers and autoscaling support
applies_to:
deployment:
ece: all
mapped_pages:
- https://www.elastic.co/guide/en/cloud-enterprise/current/ce-add-support-for-node-roles-and-autoscaling.html
---

# Updating custom templates to support node_roles and autoscaling [ce-add-support-for-node-roles-and-autoscaling]

Custom deployment templates should be updated in order to take advantage of new Elastic Cloud Enterprise features, such as [Data tiers](../../../manage-data/lifecycle/data-tiers.md) (that is, the new cold and frozen data tiers) and [Deployment autoscaling](../../autoscaling.md). By updating these templates we also ensure forward compatibility with future Elastic Cloud Enterprise versions that will require certain fields such as `node_roles` and `id` to be present in the deployment configuration.

System owned deployment templates have already been updated to support both data tiers with `node_roles` and autoscaling. However, the custom templates that you created need to be manually updated by following the steps in this guide.
Templates created in older versions of ECE should be updated in order to take advantage of new Elastic Cloud Enterprise features, such as [Data tiers](../../../manage-data/lifecycle/data-tiers.md), and [Deployment autoscaling](../../autoscaling.md). By updating these templates we also ensure forward compatibility with future Elastic Cloud Enterprise versions that will require certain fields such as `node_roles` and `id` to be present in the deployment configuration.

::::{note}
System owned deployment templates are automatically updated during the ECE upgrade process to support both data tiers with `node_roles` and autoscaling. However, custom templates that you created must be manually updated by following the steps in this guide.
::::

## Adding support for node_roles [ece_adding_support_for_node_roles]

Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,7 @@
---
applies_to:
deployment:
ece: all
mapped_pages:
- https://www.elastic.co/guide/en/cloud-enterprise/current/ece-change-allocator-disconnect-timeout.html
---
Expand Down
3 changes: 3 additions & 0 deletions deploy-manage/deploy/cloud-enterprise/change-ece-api-url.md
Original file line number Diff line number Diff line change
@@ -1,4 +1,7 @@
---
applies_to:
deployment:
ece: all
mapped_pages:
- https://www.elastic.co/guide/en/cloud-enterprise/current/ece-config-api-base-url.html
---
Expand Down
10 changes: 4 additions & 6 deletions deploy-manage/deploy/cloud-enterprise/change-endpoint-urls.md
Original file line number Diff line number Diff line change
@@ -1,4 +1,7 @@
---
applies_to:
deployment:
ece: all
mapped_pages:
- https://www.elastic.co/guide/en/cloud-enterprise/current/ece-administering-endpoints.html
---
Expand All @@ -9,15 +12,11 @@ For applications without SSL or HTTPS protocol support, you can use a local endp

By default, cluster and Kibana endpoint URLs are constructed according to the following pattern, where `CLUSTER_ID` and `LOCAL_HOST_IP` are values that depend on your specific installation:

::::{admonition}
```text
```sh
http://CLUSTER_ID.LOCAL_HOST_IP.ip.es.io:9200
https://CLUSTER_ID.LOCAL_HOST_IP.ip.es.io:9243
```

::::


For example:

```sh
Expand All @@ -29,7 +28,6 @@ https://2882c82e54d4361.us-west-5.aws.found.io:9243
To find your endpoints, select a deployment review the information on the **Elasticsearch** and **Kibana** pages.
::::


To change endpoints in the Cloud UI:

1. [Log into the Cloud UI](log-into-cloud-ui.md).
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,7 @@
---
applies_to:
deployment:
ece: all
mapped_pages:
- https://www.elastic.co/guide/en/cloud-enterprise/current/ece-configuring-allocator-affinity.html
---
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,7 @@
---
applies_to:
deployment:
ece: all
mapped_pages:
- https://www.elastic.co/guide/en/cloud-enterprise/current/ece-configuring-ece-templates.html
---
Expand Down
Loading

0 comments on commit 850d762

Please sign in to comment.