diff --git a/config/navigation.yml b/config/navigation.yml index e39a84043d..14b502d12d 100644 --- a/config/navigation.yml +++ b/config/navigation.yml @@ -117,7 +117,7 @@ toc: # https://github.com/elastic/apm-agent-android/blob/main/docs/release-notes/toc.yml - toc: apm-agent-android://release-notes path_prefix: release-notes/edot/sdks/android - # EDOT Cloud Forwarder for AWS + # Elastic Cloud Forwarder for AWS # https://github.com/elastic/edot-cloud-forwarder-aws/blob/main/docs/release-notes/toc.yml - toc: edot-cloud-forwarder-aws://release-notes path_prefix: release-notes/edot/cloud-forwarder/aws diff --git a/config/products.yml b/config/products.yml index 31a7fe4bc4..c3695423f6 100644 --- a/config/products.yml +++ b/config/products.yml @@ -60,7 +60,7 @@ products: display: 'Elastic Cloud Terraform Provider' versioning: 'cloud-terraform' terraform-google-edot-cf: - display: 'Terraform Google EDOT CF' + display: 'Terraform Google Elastic Cloud Forwarder' versioning: 'terraform-google-edot-cf' curator: display: 'Elasticsearch Curator' @@ -94,13 +94,13 @@ products: ecs-logging-ruby: display: 'ECS Logging Ruby' edot-cf: - display: 'EDOT Cloud Forwarder' + display: 'Elastic Cloud Forwarder' versioning: 'stack' edot-sdk: display: 'Elastic Distribution of OpenTelemetry SDK' versioning: 'all' edot-collector: - display: 'Elastic Distribution of OpenTelemetry Collector' + display: 'Elastic Agent' versioning: 'stack' edot-ios: display: 'Elastic Distribution of OpenTelemetry iOS' @@ -127,11 +127,11 @@ products: display: 'Elastic Distribution of OpenTelemetry Python' repository: 'elastic-otel-python' edot-cf-aws: - display: 'EDOT Cloud Forwarder for AWS' + display: 'Elastic Cloud Forwarder for AWS' edot-cf-azure: - display: 'EDOT Cloud Forwarder for Azure' + display: 'Elastic Cloud Forwarder for Azure' edot-cf-gcp: - display: 'EDOT Cloud Forwarder for GCP' + display: 'Elastic Cloud Forwarder for GCP' eland: display: 'Eland' versioning: 'stack' diff --git a/config/search.yml b/config/search.yml index b85f8c3c04..e59d10340b 100644 --- a/config/search.yml +++ b/config/search.yml @@ -55,7 +55,9 @@ synonyms: - [ "ech", "elastic cloud hosted", "ess" ] - [ "eck", "elastic cloud on kubernetes" ] - [ "ecs", "elastic common schema" ] - - [ "edot", "elastic distribution of opentelemetry" ] + - [ "edot", "elastic distribution of opentelemetry", "elastic opentelemetry", "elastic otel" ] + - [ "edot collector", "edot-collector", "elastic distribution of opentelemetry collector" ] + - [ "edot cf", "edot cloud forwarder", "elastic distribution of opentelemetry cloud forwarder", "elastic cloud forwarder" ] - [ "edr", "endpoint detection response" ] - [ "eis", "elastic inference service" ] - [ "eks", "elastic kubernetes service" ] diff --git a/docs/_snippets/applies_to-key.md b/docs/_snippets/applies_to-key.md index b9cc4d8c40..202a3e1433 100644 --- a/docs/_snippets/applies_to-key.md +++ b/docs/_snippets/applies_to-key.md @@ -22,10 +22,10 @@ * `curator`: Applies to [Elasticsearch Curator](https://www.elastic.co/docs/reference/elasticsearch/curator) (Curator). * `ecctl`: Applies to [Elastic cloud control](https://www.elastic.co/docs/reference/ecctl) (ECCTL). * `edot_android`: Applies to the [Elastic Distribution of OpenTelemetry Android](https://www.elastic.co/docs/reference/opentelemetry/edot-sdks/android/) (EDOT Android). - * `edot_cf_aws`: Applies to the [Elastic Distribution of OpenTelemetry Cloud Forwarder](https://www.elastic.co/docs/reference/opentelemetry/edot-cloud-forwarder/) (EDOT Cloud Forwarder). - * `edot_cf_azure`: Applies to the [Elastic Distribution of OpenTelemetry Cloud Forwarder](https://www.elastic.co/docs/reference/opentelemetry/edot-cloud-forwarder/) (EDOT Cloud Forwarder). - * `edot_cf_gcp`: Applies to the [Elastic Distribution of OpenTelemetry Cloud Forwarder](https://www.elastic.co/docs/reference/opentelemetry/edot-cloud-forwarder/) (EDOT Cloud Forwarder). - * `edot_collector`: Applies to the [Elastic Distribution of OpenTelemetry Collector](https://www.elastic.co/docs/reference/opentelemetry/edot-collector/) (EDOT Collector). + * `edot_cf_aws`: Applies to the [Elastic Cloud Forwarder](https://www.elastic.co/docs/reference/opentelemetry/edot-cloud-forwarder/) (Elastic Cloud Forwarder). + * `edot_cf_azure`: Applies to the [Elastic Cloud Forwarder](https://www.elastic.co/docs/reference/opentelemetry/edot-cloud-forwarder/) (Elastic Cloud Forwarder). + * `edot_cf_gcp`: Applies to the [Elastic Cloud Forwarder](https://www.elastic.co/docs/reference/opentelemetry/edot-cloud-forwarder/) (Elastic Cloud Forwarder). + * `edot_collector`: Applies to [Elastic Agent in OpenTelemetry mode](https://www.elastic.co/docs/reference/opentelemetry/edot-collector/) (Elastic Agent). * `edot_dotnet`: Applies to the [Elastic Distribution of OpenTelemetry .NET](https://www.elastic.co/docs/reference/opentelemetry/edot-sdks/dotnet/) (EDOT .NET). * `edot_ios`: Applies to the [Elastic Distribution of OpenTelemetry iOS](https://www.elastic.co/docs/reference/opentelemetry/edot-sdks/ios/) (EDOT iOS). * `edot_java`: Applies to the [Elastic Distribution of OpenTelemetry Java](https://www.elastic.co/docs/reference/opentelemetry/edot-sdks/java/) (EDOT Java). diff --git a/docs/configure/site/products.md b/docs/configure/site/products.md index ebe3afb044..b4d3a89cf0 100644 --- a/docs/configure/site/products.md +++ b/docs/configure/site/products.md @@ -8,7 +8,7 @@ products: display: 'APM .NET Agent' versioning: 'apm-agent-dotnet' edot-collector: - display: 'Elastic Distribution of OpenTelemetry Collector' + display: 'Elastic Agent' versioning: 'stack' repository: 'elastic-edot-collector' docs-builder: diff --git a/docs/syntax/frontmatter.md b/docs/syntax/frontmatter.md index 944f433834..a024f7b8c5 100644 --- a/docs/syntax/frontmatter.md +++ b/docs/syntax/frontmatter.md @@ -68,9 +68,9 @@ Only products with the `public-reference` feature enabled in [`products.yml`](ht | `cloud-terraform` | Elastic Cloud Terraform | | `ecs` | Elastic Common Schema (ECS) | | `ecs-logging` | ECS Logging | -| `edot-cf` | EDOT Cloud Forwarder | +| `edot-cf` | Elastic Cloud Forwarder | | `edot-sdk` | Elastic Distribution of OpenTelemetry SDK | -| `edot-collector` | Elastic Distribution of OpenTelemetry Collector | +| `edot-collector` | Elastic Agent | | `elastic-agent` | Elastic Agent | | `elastic-serverless-forwarder` | Elastic Serverless Forwarder | | `elastic-stack` | Elastic Stack | diff --git a/src/Elastic.Markdown/Myst/Components/ApplicabilityMappings.cs b/src/Elastic.Markdown/Myst/Components/ApplicabilityMappings.cs index d20e291c41..22b5188174 100644 --- a/src/Elastic.Markdown/Myst/Components/ApplicabilityMappings.cs +++ b/src/Elastic.Markdown/Myst/Components/ApplicabilityMappings.cs @@ -29,12 +29,12 @@ public record ApplicabilityDefinition(string Key, string DisplayName, Versioning public static readonly ApplicabilityDefinition Ecctl = new("ECCTL", "Elastic Cloud Control", VersioningSystemId.Ecctl); public static readonly ApplicabilityDefinition Curator = new("Curator", "Curator", VersioningSystemId.Curator); - // EDOT Products + // Elastic OTel Products public static readonly ApplicabilityDefinition EdotAndroid = new("EDOT Android", "Elastic Distribution of OpenTelemetry Android", VersioningSystemId.EdotAndroid); - public static readonly ApplicabilityDefinition EdotCfAws = new("EDOT CF AWS", "Elastic Distribution of OpenTelemetry Cloud Forwarder for AWS", VersioningSystemId.EdotCfAws); - public static readonly ApplicabilityDefinition EdotCfAzure = new("EDOT CF Azure", "Elastic Distribution of OpenTelemetry Cloud Forwarder for Azure", VersioningSystemId.EdotCfAzure); - public static readonly ApplicabilityDefinition EdotCfGcp = new("EDOT CF GCP", "Elastic Distribution of OpenTelemetry Cloud Forwarder for GCP", VersioningSystemId.EdotCfGcp); - public static readonly ApplicabilityDefinition EdotCollector = new("EDOT Collector", "Elastic Distribution of OpenTelemetry Collector", VersioningSystemId.EdotCollector); + public static readonly ApplicabilityDefinition EdotCfAws = new("Elastic CF AWS", "Elastic Cloud Forwarder for AWS", VersioningSystemId.EdotCfAws); + public static readonly ApplicabilityDefinition EdotCfAzure = new("Elastic CF Azure", "Elastic Cloud Forwarder for Azure", VersioningSystemId.EdotCfAzure); + public static readonly ApplicabilityDefinition EdotCfGcp = new("Elastic CF GCP", "Elastic Cloud Forwarder for GCP", VersioningSystemId.EdotCfGcp); + public static readonly ApplicabilityDefinition EdotCollector = new("Elastic Agent", "Elastic Agent", VersioningSystemId.EdotCollector); public static readonly ApplicabilityDefinition EdotDotnet = new("EDOT .NET", "Elastic Distribution of OpenTelemetry .NET", VersioningSystemId.EdotDotnet); public static readonly ApplicabilityDefinition EdotIos = new("EDOT iOS", "Elastic Distribution of OpenTelemetry iOS", VersioningSystemId.EdotIos); public static readonly ApplicabilityDefinition EdotJava = new("EDOT Java", "Elastic Distribution of OpenTelemetry Java", VersioningSystemId.EdotJava); diff --git a/src/Elastic.Markdown/Myst/Components/ProductDescriptions.cs b/src/Elastic.Markdown/Myst/Components/ProductDescriptions.cs index bee9e8a7c8..24e16b35f4 100644 --- a/src/Elastic.Markdown/Myst/Components/ProductDescriptions.cs +++ b/src/Elastic.Markdown/Myst/Components/ProductDescriptions.cs @@ -141,9 +141,9 @@ bool IncludeVersionNote IncludeVersionNote: true ), - // EDOT Products + // Elastic OTel Products [VersioningSystemId.EdotCollector] = new ProductInfo( - Description: "The Elastic Distribution of OpenTelemetry (EDOT) Collector retrieves traces, metrics, and logs from your infrastructure and applications, and forwards them to Elastic Observability.", + Description: "Elastic Agent can run in OpenTelemetry mode to retrieve traces, metrics, and logs from your infrastructure and applications, and forward them to Elastic Observability.", AdditionalAvailabilityInfo: null, IncludeVersionNote: true ), @@ -188,7 +188,7 @@ bool IncludeVersionNote IncludeVersionNote: true ), [VersioningSystemId.EdotCfAws] = new ProductInfo( - Description: "The Elastic Distribution of OpenTelemetry (EDOT) Cloud Forwarder allows you to collect and send your telemetry data to Elastic Observability from AWS, GCP, and Azure.", + Description: "The Elastic Cloud Forwarder allows you to collect and send your telemetry data to Elastic Observability from AWS, GCP, and Azure.", AdditionalAvailabilityInfo: null, IncludeVersionNote: true ),