Skip to content

Edit Android and iOS links, redirects #1455

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
wants to merge 3 commits into
base: main
Choose a base branch
from
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -108,7 +108,7 @@ This table compares Observability capabilities between {{ech}} deployments and S
| **APM integration** | ✅ | ✅ | Use **Managed Intake Service** (supports Elastic APM and OTLP protocols) |
| [**APM Agent Central Configuration**](/solutions/observability/apm/apm-agent-central-configuration.md) | ✅ | ❌ | Not available in Serverless |
| [**APM Tail-based sampling**](/solutions/observability/apm/transaction-sampling.md#apm-tail-based-sampling) | ✅ | ❌ | - Not available in Serverless <br>- Consider **OpenTelemetry** tail sampling processor as an alternative |
| [**Android agent/SDK instrumentation**](apm-agent-android://reference/index.md) | ✅ | ❌ | Not available in Serverless |
| [**Android agent/SDK instrumentation**](opentelemetry://reference/edot-sdks/android/index.md) | ✅ | ❌ | Not available in Serverless |
| [**AWS Firehose integration**](/solutions/observability/cloud/monitor-amazon-web-services-aws-with-amazon-data-firehose.md) | ✅ | ✅ | |
| **Custom roles for Kibana Spaces** | ✅ | **Planned** | Anticipated in a future release |
| [**Data stream lifecycle**](/manage-data/lifecycle/data-stream.md) | ✅ | ✅ | Primary lifecycle management method in Serverless |
Expand All @@ -117,7 +117,7 @@ This table compares Observability capabilities between {{ech}} deployments and S
| **[Fleet Agent policies](/reference/fleet/agent-policy.md)** | ✅ | ✅ | |
| **[Fleet server](/reference/fleet/fleet-server.md)** | - Self-hosted <br>- Hosted | ✅ | Fully managed by Elastic |
| [**Index lifecycle management**](/manage-data/lifecycle/index-lifecycle-management.md) | ✅ | ❌ | Use [**Data stream lifecycle**](/manage-data/lifecycle/data-stream.md) instead |
| **[iOS agent/SDK instrumentation](apm-agent-ios://reference/index.md)** | ✅ | ❌ | Not available in Serverless |
| **[iOS agent/SDK instrumentation](opentelemetry://reference/edot-sdks/ios/index.md)** | ✅ | ❌ | Not available in Serverless |
| **[Kibana Alerts](/deploy-manage/monitor/monitoring-data/configure-stack-monitoring-alerts.md)** | ✅ | ✅ | |
| **[LogsDB index mode](/manage-data/data-store/data-streams/logs-data-stream.md)** | ✅ | ✅ | - Reduces storage footprint <br> - Enabled by default <br>- Cannot be disabled |
| **[Logs management](/solutions/observability/logs.md)** | ✅ | ✅ | |
Expand Down
2 changes: 0 additions & 2 deletions docset.yml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
project: 'Elastic documentation'

Check failure on line 1 in docset.yml

View workflow job for this annotation

GitHub Actions / preview / build

Redirect reference/apm/agents/android points to reference/opentelemetry/edot-sdks/android which does not exist

Check failure on line 1 in docset.yml

View workflow job for this annotation

GitHub Actions / preview / build

Redirect reference/apm/agents/android/getting-started points to reference/opentelemetry/edot-sdks/android/getting-started which does not exist

Check failure on line 1 in docset.yml

View workflow job for this annotation

GitHub Actions / preview / build

Redirect reference/apm/agents/android/configuration points to reference/opentelemetry/edot-sdks/android/configuration which does not exist

Check failure on line 1 in docset.yml

View workflow job for this annotation

GitHub Actions / preview / build

Redirect reference/apm/agents/android/manual-instrumentation points to reference/opentelemetry/edot-sdks/android/manual-instrumentation which does not exist

Check failure on line 1 in docset.yml

View workflow job for this annotation

GitHub Actions / preview / build

Redirect reference/apm/agents/android/automatic-instrumentation points to reference/opentelemetry/edot-sdks/android/automatic-instrumentation which does not exist

Check failure on line 1 in docset.yml

View workflow job for this annotation

GitHub Actions / preview / build

Redirect reference/apm/agents/android/faq points to reference/opentelemetry/edot-sdks/android which does not exist

Check failure on line 1 in docset.yml

View workflow job for this annotation

GitHub Actions / preview / build

Redirect reference/apm/agents/android/how-tos points to reference/opentelemetry/edot-sdks/android/getting-started which does not exist

Check failure on line 1 in docset.yml

View workflow job for this annotation

GitHub Actions / preview / build

Redirect reference/apm/agents/android/troubleshooting points to reference/opentelemetry/edot-sdks/android/troubleshooting which does not exist

Check failure on line 1 in docset.yml

View workflow job for this annotation

GitHub Actions / preview / build

Redirect reference/apm/agents/ios points to reference/opentelemetry/edot-sdks/ios which does not exist

Check failure on line 1 in docset.yml

View workflow job for this annotation

GitHub Actions / preview / build

Redirect reference/apm/agents/ios/supported-technologies points to reference/opentelemetry/edot-sdks/ios/supported-technologies which does not exist

Check notice on line 1 in docset.yml

View workflow job for this annotation

GitHub Actions / preview / build

Substitution key 'edot' is not used in any file

Check notice on line 1 in docset.yml

View workflow job for this annotation

GitHub Actions / preview / build

Substitution key 'ingest-pipelines-app' is not used in any file

Check notice on line 1 in docset.yml

View workflow job for this annotation

GitHub Actions / preview / build

Substitution key 'api-request-title' is not used in any file

Check notice on line 1 in docset.yml

View workflow job for this annotation

GitHub Actions / preview / build

Substitution key 'api-prereq-title' is not used in any file

Check notice on line 1 in docset.yml

View workflow job for this annotation

GitHub Actions / preview / build

Substitution key 'api-description-title' is not used in any file

Check notice on line 1 in docset.yml

View workflow job for this annotation

GitHub Actions / preview / build

Substitution key 'api-path-parms-title' is not used in any file

Check notice on line 1 in docset.yml

View workflow job for this annotation

GitHub Actions / preview / build

Substitution key 'api-request-body-title' is not used in any file

Check notice on line 1 in docset.yml

View workflow job for this annotation

GitHub Actions / preview / build

Substitution key 'release-date' is not used in any file
max_toc_depth: 2

features:
Expand All @@ -9,10 +9,8 @@
- 'raw-migrated-files/**'

cross_links:
- apm-agent-android
- apm-agent-dotnet
- apm-agent-go
- apm-agent-ios
- apm-agent-java
- apm-agent-nodejs
- apm-agent-php
Expand Down
15 changes: 15 additions & 0 deletions redirects.yml
Original file line number Diff line number Diff line change
Expand Up @@ -210,3 +210,18 @@ redirects:

# Related to https://github.com/elastic/docs-content/pull/1329
'manage-data/ingest/transform-enrich/ingest-pipelines-serverless.md': 'manage-data/ingest/transform-enrich/ingest-pipelines.md'

# Related to https://github.com/elastic/opentelemetry/issues/228
'reference/apm/agents/android': 'reference/opentelemetry/edot-sdks/android'
'reference/apm/agents/android/getting-started': 'reference/opentelemetry/edot-sdks/android/getting-started'
'reference/apm/agents/android/configuration': 'reference/opentelemetry/edot-sdks/android/configuration'
'reference/apm/agents/android/manual-instrumentation': 'reference/opentelemetry/edot-sdks/android/manual-instrumentation'
'reference/apm/agents/android/automatic-instrumentation': 'reference/opentelemetry/edot-sdks/android/automatic-instrumentation'
'reference/apm/agents/android/faq': 'reference/opentelemetry/edot-sdks/android'
'reference/apm/agents/android/how-tos': 'reference/opentelemetry/edot-sdks/android/getting-started'
'reference/apm/agents/android/troubleshooting': 'reference/opentelemetry/edot-sdks/android/troubleshooting'
'reference/apm/agents/ios': 'reference/opentelemetry/edot-sdks/ios'
'reference/apm/agents/ios/supported-technologies': 'reference/opentelemetry/edot-sdks/ios/supported-technologies'
'reference/apm/agents/ios/set-up-apm-ios-agent': 'reference/opentelemetry/edot-sdks/ios/set-up-apm-ios-agent'
'reference/apm/agents/ios/configuration': 'reference/opentelemetry/edot-sdks/ios/configuration'
'reference/apm/agents/ios/instrumentation': 'reference/opentelemetry/edot-sdks/ios/instrumentation'
4 changes: 2 additions & 2 deletions solutions/observability/apm/api-keys.md
Original file line number Diff line number Diff line change
Expand Up @@ -151,10 +151,10 @@ To view all API keys for your project:

You can now apply your newly created API keys in the configuration of each of your APM agents. See the relevant agent documentation for additional information:

* **Android**: [`apiKey`](apm-agent-android://reference/configuration.md)
* **Android**: [`apiKey`](opentelemetry://reference/edot-sdks/android/configuration.md)
* **Go agent**: [`ELASTIC_APM_API_KEY`](apm-agent-go://reference/configuration.md#config-api-key)
* **.NET agent**: [`ApiKey`](apm-agent-dotnet://reference/config-reporter.md#config-api-key)
* **iOS**: [`withApiKey`](apm-agent-ios://reference/configuration.md#withapikey)
* **iOS**: [`withApiKey`](opentelemetry://reference/edot-sdks/ios/configuration.md#withapikey)
* **Java agent**: [`api_key`](apm-agent-java://reference/config-reporter.md#config-api-key)
* **Node.js agent**: [`apiKey`](apm-agent-nodejs://reference/configuration.md#api-key)
* **PHP agent**: [`api_key`](apm-agent-php://reference/configuration-reference.md#config-api-key)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -31,13 +31,13 @@ Each APM agent has a list of supported configurations. After selecting a Service
Supported configurations are also tagged with the ![dynamic config](/solutions/images/observability-dynamic-config.svg "") badge in each APM agent’s configuration reference:

Android agent
: [Configuration reference](apm-agent-android://reference/configuration.md)
: [Configuration reference](opentelemetry://reference/edot-sdks/android/configuration.md)

Go agent
: [Configuration reference](apm-agent-go://reference/configuration.md)

iOS agent
: [Configuration reference](apm-agent-ios://reference/configuration.md)
: [Configuration reference](opentelemetry://reference/edot-sdks/ios/configuration.md)

Java agent
: [Configuration reference](apm-agent-java://reference/configuration.md)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -214,7 +214,7 @@ All that’s left is to compile and run your application. That’s it!

**Learn more in the agent reference**

Read more in the [APM Android Agent Reference](apm-agent-android://reference/index.md).
Read more in the [APM Android Agent Reference](opentelemetry://reference/edot-sdks/android/index.md).
::::::

::::::{tab-item} Go
Expand Down Expand Up @@ -340,7 +340,7 @@ var config = AgentConfigBuilder()

**Learn more in the agent reference**

Read more in the [APM iOS Agent Reference](apm-agent-ios://reference/index.md).
Read more in the [APM iOS Agent Reference](opentelemetry://reference/edot-sdks/ios/index.md).
::::::

::::::{tab-item} Java
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -255,7 +255,7 @@ All that’s left is to compile and run your application. That’s it!

**Learn more in the agent reference**

Read more in the [APM Android Agent Reference](apm-agent-android://reference/index.md).
Read more in the [APM Android Agent Reference](opentelemetry://reference/edot-sdks/android/index.md).
::::::

::::::{tab-item} Go
Expand Down Expand Up @@ -381,7 +381,7 @@ var config = AgentConfigBuilder()

**Learn more in the agent reference**

Read more in the [APM iOS Agent Reference](apm-agent-ios://reference/index.md).
Read more in the [APM iOS Agent Reference](opentelemetry://reference/edot-sdks/ios/index.md).
::::::

::::::{tab-item} Java
Expand Down
4 changes: 2 additions & 2 deletions solutions/observability/apm/secret-token.md
Original file line number Diff line number Diff line change
Expand Up @@ -62,9 +62,9 @@ apm-server.auth.secret_token: <secret-token>

Each Elastic {{apm-agent}} has a configuration option to set the value of the secret token:

* **Android agent**: [`secretToken`](apm-agent-android://reference/configuration.md)
* **Android agent**: [`secretToken`](opentelemetry://reference/edot-sdks/android/configuration.md)
* **Go agent**: [`ELASTIC_APM_SECRET_TOKEN`](apm-agent-go://reference/configuration.md#config-secret-token)
* **iOS agent**: [`secretToken`](apm-agent-ios://reference/configuration.md#secrettoken)
* **iOS agent**: [`secretToken`](opentelemetry://reference/edot-sdks/ios/configuration.md#secrettoken)
* **Java agent**: [`secret_token`](apm-agent-java://reference/config-reporter.md#config-secret-token)
* **.NET agent**: [`ELASTIC_APM_SECRET_TOKEN`](apm-agent-dotnet://reference/config-reporter.md#config-secret-token)
* **Node.js agent**: [`Secret Token`](apm-agent-nodejs://reference/configuration.md#secret-token)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ products:

# Troubleshoot APM iOS Agent [troubleshooting]

Is something not working as expected? Don’t worry if you can’t figure out what the problem is; we’re here to help! As a first step, ensure your app is compatible with the agent’s [supported technologies](apm-agent-ios://reference/supported-technologies.md).
Is something not working as expected? Don’t worry if you can’t figure out what the problem is; we’re here to help! As a first step, ensure your app is compatible with the agent’s [supported technologies](opentelemetry://reference/edot-sdks/ios/supported-technologies.md).

If you’re an existing Elastic customer with a support contract, create a ticket in the [Elastic Support portal](https://support.elastic.co/customers/s/login/). Other users can post in the [APM discuss forum](https://discuss.elastic.co/c/apm).

Expand Down
2 changes: 1 addition & 1 deletion troubleshoot/observability/apm.md
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ For additional help with other APM components, see the links below.
{{agent}}, the Applications UI, and each {{apm-agent}} has its own troubleshooting guide:

* [**{{fleet}} and {{agent}}** troubleshooting](../ingest/fleet/fleet-elastic-agent.md)
* [**Android agent** FAQ](apm-agent-android://reference/faq.md)
* [**Android agent** FAQ](opentelemetry://reference/edot-sdks/android/faq.md)
* [**.NET agent** troubleshooting](/troubleshoot/observability/apm-agent-dotnet/apm-net-agent.md)
* [**Go agent** troubleshooting](/troubleshoot/observability/apm-agent-go/apm-go-agent.md)
* [**iOS agent** troubleshooting](/troubleshoot/observability/apm-agent-swift/apm-ios-agent.md)
Expand Down