Skip to content

Commit 1064d03

Browse files
authored
Merge branch 'main' into users-roles-2
2 parents 0014762 + 73555df commit 1064d03

File tree

10 files changed

+178
-448
lines changed

10 files changed

+178
-448
lines changed

deploy-manage/deploy/cloud-enterprise.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ Refer to [](./cloud-enterprise/ece-architecture.md) for details about the ECE pl
2727
- **Automated scaling & orchestration**: Handles cluster provisioning, scaling, and upgrades automatically.
2828
- **High availability & resilience**: Ensures uptime through multiple Availability Zones, data replication, and automated restore and snapshot.
2929
- **Centralized monitoring & logging**: Provides insights into cluster performance, resource usage, and logs.
30-
- **Single Sign-On (SSO) & role-based access aontrol (RBAC)**: Allows organizations to manage access and security policies.
30+
- **Single Sign-On (SSO) & role-based access control (RBAC)**: Allows organizations to manage access and security policies.
3131
- **API & UI management**: Offers a web interface and API to create and manage clusters easily.
3232
- **Air-gapped installations**: Support for off-line installations.
3333
- **Microservices architecture**: All services are containerized through Docker.
@@ -71,4 +71,4 @@ To learn about other deployment options, refer to [](../deploy.md).
7171

7272
## Supported versions [ece-supported-versions]
7373

74-
Refer to the [Elastic Support Matrix](https://www.elastic.co/support/matrix#elastic-cloud-enterprise) for more information about supported Operating Systems, Docker, and Podman versions.
74+
Refer to the [Elastic Support Matrix](https://www.elastic.co/support/matrix#elastic-cloud-enterprise) for more information about supported Operating Systems, Docker, and Podman versions.

deploy-manage/deploy/cloud-enterprise/tools-apis.md

Lines changed: 11 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,4 +4,14 @@
44

55
% GitHub issue: https://github.com/elastic/docs-projects/issues/310
66

7-
⚠️ **This page is a work in progress.** ⚠️
7+
⚠️ **This page is a work in progress.** ⚠️
8+
9+
You can use these tools and APIs to interact with the following {{ece}} features:
10+
11+
* [{{ecloud}} Control (ecctl)](asciidocalypse://docs/ecctl/docs/reference/cloud/ecctl/index.md): Wraps typical operations commonly needed by operators within a single command line tool.
12+
* [ECE scripts](asciidocalypse://docs/cloud/docs/reference/cloud/cloud-enterprise/scripts.md): Use the `elastic-cloud-enterprise.sh` script to install {{ece}} or modify your installation.
13+
* [ECE diagnostics tool](/troubleshoot/deployments/cloud-enterprise/run-ece-diagnostics-tool.md): Collect logs and metrics that you can send to Elastic Support for troubleshooting and investigation purposes.
14+
15+
16+
17+

deploy-manage/deploy/cloud-on-k8s/tools-apis.md

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,4 +4,8 @@
44

55
% GitHub issue: https://github.com/elastic/docs-projects/issues/310
66

7-
⚠️ **This page is a work in progress.** ⚠️
7+
⚠️ **This page is a work in progress.** ⚠️
8+
9+
You can use these tools and APIs to interact with the following {{eck}} features:
10+
11+
* [ECK diagnostics tool](/troubleshoot/deployments/cloud-on-k8s/run-eck-diagnostics.md): Use the `eck-diagnostics` command line tool to create a diagnostic archive to help troubleshoot issues with ECK.

deploy-manage/deploy/elastic-cloud/tools-apis.md

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,6 @@ mapped_urls:
2222
% - [ ] https://www.elastic.co/guide/en/tpec/current/index.html
2323
% Notes: reference only, this page wasn't migrated, but you can pull from the live URL if needed.
2424

25-
2625
## REST APIs to orchestrate {{ecloud}}
2726

2827
The following APIs allow you to manage your {{ecloud}} organization, users, security, billing and resources.
@@ -61,13 +60,17 @@ Note that some [restrictions](/deploy-manage/deploy/elastic-cloud/restrictions-k
6160
The following APIs are available for {{es-serverless}} users. These links will take you to the autogenerated API reference documentation.
6261

6362
- [Elasticsearch Serverless APIs](https://www.elastic.co/docs/api/doc/elasticsearch-serverless): Use these APIs to index, manage, search, and analyze your data in {{es-serverless}}. Learn how to [connect to your {{es-serverless}} endpoint](/solutions/search/get-started.md).
63+
64+
::::{tip}
65+
Learn how to [connect to your {{es-serverless}} endpoint](/solutions/search/get-started.md).
66+
::::
67+
6468
- [Kibana Serverless APIs](https://www.elastic.co/docs/api/doc/serverless): Use these APIs to manage resources such as connectors, data views, and saved objects for your {{serverless-full}} project.
6569

6670

6771
**Additional API information**
6872

69-
- [{{es}} API conventions](https://www.elastic.co/guide/en/serverless/current/elasticsearch-api-conventions.html): Reference information about headers and request body conventions for {{es-serverless}} REST APIs.
70-
- [Management API conventions](https://www.elastic.co/guide/en/serverless/current/elasticsearch-kibana-api-conventions.html): Reference information about request header conventions for {{serverless-full}} REST APIs.
73+
- [{{es}} API conventions](asciidocalypse://docs/elasticsearch/docs/reference/elasticsearch/rest-apis/api-conventions.md): Reference information about headers and request body conventions for {{es-serverless}} REST APIs.
7174
::::
7275

7376
::::{tab-item} {{ech}}
@@ -125,4 +128,4 @@ The Elastic Cloud Terraform provider allows you to provision {{ech}} deployments
125128

126129
The provider lets you manage Elastic Cloud deployments as code, and introduce DevOps-driven methodologies to manage and deploy the Elastic Stack and solutions.
127130

128-
To get started, see the [Elastic Cloud Terraform provider documentation](https://registry.terraform.io/providers/elastic/ec/latest/docs).
131+
To get started, see the [Elastic Cloud Terraform provider documentation](https://registry.terraform.io/providers/elastic/ec/latest/docs).

get-started/versioning-availability.md

Lines changed: 77 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -18,30 +18,92 @@ It's important to understand this versioning system, for compatibility and [upgr
1818

1919
## Availability of features
2020

21-
Elastic products and features have different availability states across deployment types:
22-
23-
- **Generally Available**: Feature is production-ready (default if not specified)
24-
- **Beta**: Feature is nearing general availability but is not yet ready for production usage
25-
- **Technical preview**: Feature is in early development
26-
- **Coming**: Feature is announced for a future release
27-
- **Discontinued**: Feature is being phased out
28-
- **Unavailable**: Feature is not supported in this deployment type or version
21+
Elastic products and features have different availability states across deployment types and lifecycle stages.
2922

3023
Features may have different availability states between:
3124

32-
- Elastic Stack versions (for example, 9.0, 9.1)
33-
- Serverless projects (Security, {{es}}, Observability)
34-
- Deployment types (and versions)
25+
- **Deployment type**: The environment where the feature is available (Stack, Serverless, ECE, ECK, etc.)
26+
- **Lifecycle state**: The development or support status of the feature (GA, Beta, etc.)
27+
- **Version**: The specific version the lifecycle state applies to
28+
29+
#### Lifecycle states
30+
31+
| State | Description |
32+
|-------|-------------|
33+
| **Generally Available (GA)** | Production-ready feature (default if not specified) |
34+
| **Beta** | Feature is nearing general availability but not yet production-ready |
35+
| **Technical preview** | Feature is in early development stage |
36+
| **Coming** | Feature announced for a future release |
37+
| **Discontinued** | Feature is being phased out |
38+
| **Unavailable** | Feature is not supported in this deployment type or version |
39+
40+
### Where feature availability may differ
41+
42+
Features may have different states between:
43+
44+
- **[Elastic Stack](the-stack.md)** versions (e.g., 9.0, 9.1)
45+
- **Deployment types** (and deployment versions)
3546
- [Elastic Cloud Hosted](/deploy-manage/deploy/elastic-cloud/cloud-hosted.md)
3647
- [Elastic Cloud Serverless](/deploy-manage/deploy/elastic-cloud/serverless.md)
3748
- [Self-managed deployments](/deploy-manage/deploy/self-managed.md)
3849
- [Elastic Cloud Enterprise (ECE)](/deploy-manage/deploy/cloud-enterprise.md)
3950
- ECE deployment versions (for example, 4.0.0)
4051
- [Elastic Cloud on Kubernetes (ECK)](/deploy-manage/deploy/cloud-on-k8s.md)
4152
- ECK deployment versions (for example, 3.0.0)
53+
- **Serverless project types**
54+
- Security
55+
- Elasticsearch
56+
- Observability
57+
58+
### Important tips when reading the docs
59+
60+
- Always check feature lifecycle state for your specific deployment type and version
61+
- Pay attention to Elastic Stack version requirements
62+
- Note that Serverless features may vary by project type
63+
64+
### Availability badges in the docs
65+
66+
Our documentation uses badges to help you quickly identify where and when features are available for your specific environment.
67+
68+
Badges can appear in two places:
69+
1. **Page headers**: Shows the overall availability across all deployment types
70+
2. **Section headers**: Indicates specific availability for content in that section
71+
72+
### How to read the badges
73+
74+
Here are some examples to help you understand how to read the availability badges.
75+
76+
#### Example #1: Stack only feature
77+
78+
```yaml {applies_to}
79+
stack: ga 9.1
80+
```
81+
- **Deployment type**: Elastic Stack
82+
- **Version**: 9.1
83+
- **Lifecycle**: Generally Available (GA) — default state
84+
85+
#### Example #2: Serverless-only feature with project differences
86+
87+
```yaml {applies_to}
88+
serverless:
89+
security: beta
90+
elasticsearch: ga
91+
```
92+
- **Deployment type**: Serverless
93+
- **Lifecycle**:
94+
- Beta for Security projects
95+
- Generally Available for Elasticsearch projects
96+
97+
#### Example #3: Discontinued feature on one deployment type
4298
43-
When reading the Elastic documentation be sure to:
99+
```yaml {applies_to}
100+
deployment:
101+
ece: discontinued 4.1.0
102+
```
103+
- **Deployment type**: Elastic Cloud Enterprise
104+
- **Lifecycle**: Discontinued
105+
- **Version**: 4.1.0
44106
45-
- Check feature availability for your deployment type and version
46-
- Note stack version requirements
47-
- Be aware that Serverless features may vary by project type
107+
:::{tip}
108+
For contributors and those interested in the technical details, see the [Elastic docs syntax guide](https://elastic.github.io/docs-builder/syntax/applies/) for more information on how these badges are implemented.
109+
:::

images/security-nav-overview.gif

-3.76 MB
Binary file not shown.
-165 KB
Binary file not shown.

0 commit comments

Comments
 (0)