Skip to content

Commit be72370

Browse files
theletterfalexandra5000
authored andcommitted
Add optional OpAmp step and tip (elastic#3519)
Fixes elastic#3515 --------- Co-authored-by: Aleksandra Spilkowska <[email protected]>
1 parent 1704af5 commit be72370

File tree

6 files changed

+38
-25
lines changed

6 files changed

+38
-25
lines changed

solutions/_snippets/obs-apm-project.md

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
1-
Bring traces, logs, and metrics into Elastic APM to help you troubleshoot and optimize your applications. You can collect this data using OpenTelemetry or APM Server.
1+
Bring traces, logs, and metrics into Elastic APM to help you troubleshoot and optimize your applications. You can collect this data using OpenTelemetry or {{product.apm-server}}.
22

33
:::::{dropdown} Steps for collecting application traces, metrics, and logs
44

55
::::{tab-set}
66
:::{tab-item} OpenTelemetry
77

8-
The [Elastic Distribution of OpenTelemetry (EDOT) SDKs](opentelemetry://reference/edot-sdks/index.md) facilitate the collection of traces, metrics, and logs in OpenTelemetry format into Elastic APM.
8+
The [{{product.edot-collector}} SDKs](opentelemetry://reference/edot-sdks/index.md) facilitate the collection of traces, metrics, and logs in OpenTelemetry format into Elastic {{product.apm}}.
99

1010
1. Select **Add data** from the main menu and then select **Application**.
1111
2. Select **OpenTelemetry**.
@@ -21,4 +21,5 @@ Use the [APM agents](/solutions/observability/apm/apm-agents/index.md) to collec
2121
3. Select the tab for your language or framework.
2222
4. Follow the instructions in the tab.
2323
:::
24+
::::
2425
:::::

solutions/observability/get-started.md

Lines changed: 21 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ products:
1515
# Get started with Elastic {{observability}} [observability-get-started]
1616

1717
```{note}
18-
Use this guide to get started with the Observability Complete feature tier of {{obs-serverless}}. Refer to the [Logs Essentials getting started](/solutions/observability/get-started/logs-essentials.md) docs to get started with {{obs-serverless}} Logs Essentials. The [{{obs-serverless}} feature tiers](/solutions/observability/observability-serverless-feature-tiers.md) page details the difference between tiers.
18+
Use this guide to get started with the {{observability}} Complete feature tier of {{obs-serverless}}. Refer to the [Logs Essentials getting started](/solutions/observability/get-started/logs-essentials.md) docs to get started with {{obs-serverless}} Logs Essentials. The [{{obs-serverless}} feature tiers](/solutions/observability/observability-serverless-feature-tiers.md) page details the difference between tiers.
1919
```
2020

2121
New to Elastic {{observability}}? Discover more about our observability features and how to get started. The following instructions guides you through setting up your first Elastic {{observability}} deployment, collecting data from infrastructure and applications, and exploring your data.
@@ -26,7 +26,7 @@ Learn how to create an {{obs-serverless}} project and use Elastic {{observabilit
2626

2727
:::::::{stepper}
2828

29-
::::::{step} Create an Observability project
29+
::::::{step} Create an {{observability}} project
3030

3131
:::{include} /solutions/_snippets/obs-serverless-project.md
3232
:::
@@ -39,52 +39,52 @@ For other types of deployments, refer to [Deploy](/deploy-manage/deploy.md). For
3939

4040
::::::{step} Collect infrastructure logs and metrics
4141

42-
Bring logs and metrics from your hosts and services into Elastic {{observability}} to monitor the health and performance of your infrastructure. You can collect this data from hosts, containers, Kubernetes, and Cloud services.
42+
Bring logs and metrics from your hosts and services into Elastic {{observability}} to monitor the health and performance of your infrastructure. You can collect this data from hosts, containers, {{k8s}}, and Cloud services.
4343

4444
:::::{dropdown} Steps for collecting infrastructure logs and metrics
4545

4646
::::{tab-set}
4747
:::{tab-item} Hosts
4848

49-
Elastic {{observability}} can collect telemetry data from hosts, containers, and Kubernetes through the EDOT Collector or the Elastic Agent.
49+
Elastic {{observability}} can collect telemetry data from hosts, containers, and {{k8s}} through the EDOT Collector or the Elastic Agent.
5050

5151
1. Select **Add data** from the main menu and then select **Host**.
5252
2. Select one of these options:
53-
* **OpenTelemetry: Full Observability**: Collect native OpenTelemetry metrics and logs.
54-
* **Elastic Agent: Logs & Metrics**: Bring data from Elastic integrations.
53+
* **OpenTelemetry: Full {{observability}}**: Collect native OpenTelemetry metrics and logs.
54+
* **{{product.elastic-agent}}: Logs & Metrics**: Bring data from Elastic integrations.
5555
3. Follow the instructions for your platform.
5656

57-
For an overview of the Elastic Distribution of OpenTelemetry Collector, refer to [Elastic Distribution of OpenTelemetry (EDOT)](opentelemetry://reference/index.md).
57+
For an overview of the {{product.edot-collector}}, refer to [{{edot}} (EDOT)](opentelemetry://reference/index.md).
5858

5959
:::
6060

61-
:::{tab-item} Kubernetes
61+
:::{tab-item} {{k8s}}
6262

63-
Elastic {{observability}} can collect telemetry data from Kubernetes through the Elastic Distribution of OpenTelemetry Collector or the Elastic Agent.
63+
Elastic {{observability}} can collect telemetry data from {{k8s}} through the Elastic Distribution of OpenTelemetry Collector or the Elastic Agent.
6464

65-
1. Select **Add data** from the main menu and then select **Kubernetes**.
65+
1. Select **Add data** from the main menu and then select **{{k8s}}**.
6666
2. Select one of these options:
67-
* **OpenTelemetry: Full Observability**: Collect native OpenTelemetry metrics and logs.
68-
* **Elastic Agent: Logs & Metrics**: Bring data from Elastic integrations.
67+
* **OpenTelemetry: Full {{observability}}**: Collect native OpenTelemetry metrics and logs.
68+
* **{{product.elastic-agent}}: Logs & Metrics**: Bring data from Elastic {{integrations}}.
6969
3. Follow the instructions for your platform.
7070

71-
For an overview of EDOT, refer to [Elastic Distribution of OpenTelemetry (EDOT)](opentelemetry://reference/index.md).
71+
For an overview of EDOT, refer to [{{edot}} (EDOT)](opentelemetry://reference/index.md).
7272

7373
:::
7474

75-
:::{tab-item} Integrations
75+
:::{tab-item} {{integrations}}
7676

77-
Elastic {{observability}} can collect telemetry data from services through Elastic integrations.
77+
Elastic {{observability}} can collect telemetry data from services through Elastic {{integrations}}.
7878

7979
1. Select **Add data** from the main menu.
80-
2. In **Search through other ways of ingesting data**, type the name of an integration (for example, NGINX).
80+
2. In **Search through other ways of ingesting data**, enter the name of an integration (for example, NGINX).
8181
3. Select the integration you want to add.
8282
4. Select **Add**.
8383
:::
8484

8585
:::{tab-item} Cloud
8686

87-
Elastic {{observability}} can collect telemetry data from cloud services through Elastic integrations.
87+
Elastic {{observability}} can collect telemetry data from cloud services through Elastic {{integrations}}.
8888

8989
1. Select **Add data** from the main menu and then select **Cloud**.
9090
2. Select your Cloud provider to view the collection of integrations available for that provider.
@@ -143,7 +143,7 @@ After you've onboarded your data, you can explore it in the following Elastic {{
143143

144144
::::::{step} Create your first dashboards
145145

146-
Elastic provides a wide range of prebuilt dashboards for visualizing observability data from a variety of sources. These dashboards are loaded automatically when you install [Elastic integrations](https://docs.elastic.co/integrations). You can also create new dashboards and visualizations based on your data views.
146+
Elastic provides a wide range of prebuilt dashboards for visualizing observability data from a variety of sources. These dashboards are loaded automatically when you install [Elastic {{integrations}}](https://docs.elastic.co/integrations). You can also create new dashboards and visualizations based on your data views.
147147

148148
To create a new dashboard, select **Create Dashboard** and begin adding visualizations. You can create charts, graphs, maps, tables, and other types of visualizations from your data, or you can add visualizations from the library. You can also add other types of panels, such as filters and controls.
149149

@@ -153,7 +153,7 @@ For more information about creating dashboards, refer to [Create your first dash
153153

154154
::::::{step} Set up alerts and SLOs
155155

156-
Elastic {{observability}} lets you define rules of different types which detect complex conditions and trigger relevant actions. {{observability}} can send alerts to email, Slack, and other third-party systems. Refer to [](/solutions/observability/incident-management/create-manage-rules.md) to get started.
156+
Elastic {{observability}} lets you define rules of different types which detect complex conditions and trigger relevant actions. {{observability}} can send alerts to email, Slack, and other third-party systems. Refer to [](/solutions/observability/incident-management/create-manage-rules.md) for more information.
157157

158158
{{observability}} also lets you define Service Level Objectives (SLOs) to set clear, measurable targets for your service performance, based on factors like availability, response times, error rates, and other key metrics. Refer to [Create and manage SLOs](/solutions/observability/incident-management/service-level-objectives-slos.md) to get started.
159159

@@ -171,12 +171,12 @@ Quickstarts are compact hands-on guides that help you experiment with {{observab
171171

172172
[Browse the Elastic {{observability}} quickstarts](/solutions/observability/get-started/quickstarts.md) to get started with specific use cases.
173173

174-
### Observability integrations
174+
### {{observability}} integrations
175175

176176
Many [{{observability}} integrations](https://www.elastic.co/integrations/data-integrations?solution=observability) are available to collect and process your data. Refer to [Elastic integrations](https://www.elastic.co/docs/reference/integrations) for more information.
177177

178178
### Other resources
179179

180180
* [What's Elastic {{observability}}](/solutions/observability/get-started/what-is-elastic-observability.md)
181-
* [What's new in Elastic Stack](/release-notes/elastic-observability/index.md)
181+
* [What's new in {{product.elastic-stack}}](/release-notes/elastic-observability/index.md)
182182
* [{{obs-serverless}} billing dimensions](/deploy-manage/cloud-organization/billing/elastic-observability-billing-dimensions.md)

solutions/observability/get-started/opentelemetry/quickstart/ech/docker.md

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ products:
1313
- id: edot-collector
1414
---
1515

16-
# Quickstart for Docker on Elastic Cloud Hosted
16+
# Quickstart for Docker on {{product.cloud-hosted}}
1717

1818
Learn how to set up the EDOT Collector and EDOT SDKs in a Docker environment with {{ech}} (ECH) to collect host metrics, logs, and application traces.
1919

@@ -108,6 +108,10 @@ instrument your target applications following the setup instructions:
108108

109109
Configure your SDKs to send the data to the local EDOT Collector using OTLP/gRPC (`http://localhost:4317`) or OTLP/HTTP (`http://localhost:4318`).
110110

111+
:::{tip}
112+
Activate Central Configuration to configure your EDOT SDKs from within {{product.kibana}}. Refer to [EDOT SDKs Central Configuration](opentelemetry://reference/central-configuration.md).
113+
:::
114+
111115
::::
112116

113117
::::{step} Install the content packs

solutions/observability/get-started/opentelemetry/quickstart/ech/hosts_vms.md

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -122,6 +122,10 @@ instrument your target applications following the setup instructions:
122122
- [Python](elastic-otel-python://reference/edot-python/setup/index.md)
123123

124124
Configure your SDKs to send the data to the local EDOT Collector using OTLP/gRPC (`http://localhost:4317`) or OTLP/HTTP (`http://localhost:4318`).
125+
126+
:::{tip}
127+
Activate Central Configuration to configure your EDOT SDKs from within {{product.kibana}}. Refer to [EDOT SDKs Central Configuration](opentelemetry://reference/central-configuration.md).
128+
:::
125129
:::::
126130

127131
:::::{step} Install the content pack

solutions/observability/get-started/opentelemetry/quickstart/self-managed/hosts_vms.md

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -120,6 +120,9 @@ instrument your target applications following the setup instructions:
120120

121121
Configure your SDKs to send the data to the local EDOT Collector using OTLP/gRPC (`http://localhost:4317`) or OTLP/HTTP (`http://localhost:4318`).
122122

123+
:::{tip}
124+
Activate Central Configuration to configure your EDOT SDKs from within {{product.kibana}}. Refer to [EDOT SDKs Central Configuration](opentelemetry://reference/central-configuration.md).
125+
:::
123126
:::::
124127

125128
:::::{step} Install the content pack

solutions/observability/get-started/quickstart-monitor-your-application-performance.md

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -86,9 +86,10 @@ If your application runs on Kubernetes, the OpenTelemetry operator automatically
8686
- [PHP](elastic-otel-php://reference/edot-php/setup/index.md)
8787
- [Python](elastic-otel-python://reference/edot-python/setup/index.md)
8888
4. Configure your EDOT SDK to send data to the [Managed OTLP endpoint](opentelemetry://reference/motlp.md). The **OpenTelemetry** tab provides the required configuration values.
89+
5. (Optional) Activate Central Configuration to configure your EDOT SDKs from within {{product.kibana}}. Refer to [EDOT SDKs Central Configuration](opentelemetry://reference/central-configuration.md).
8990

9091
:::{note}
91-
If your application runs on Kubernetes, the OpenTelemetry operator automatically instruments your application, provided you've added language-specific annotations. Refer to [Auto-instrument applications](/solutions/observability/get-started/opentelemetry/quickstart/serverless/k8s.md).
92+
If your application runs on {{k8s}}, the OpenTelemetry operator automatically instruments your application, provided you've added language-specific annotations. Refer to [Auto-instrument applications](/solutions/observability/get-started/opentelemetry/quickstart/serverless/k8s.md).
9293
:::
9394

9495
::::

0 commit comments

Comments
 (0)