Skip to content
Merged
Show file tree
Hide file tree
Changes from 4 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
14 changes: 9 additions & 5 deletions .github/CODEOWNERS
Original file line number Diff line number Diff line change
Expand Up @@ -9,19 +9,19 @@
# The docs
/cloud-account/ @elastic/admin-docs
/deploy-manage/ @elastic/admin-docs
/explore-analyze/ @elastic/core-docs @elastic/experience-docs
/explore-analyze/ @elastic/core-docs @elastic/experience-docs
/extend/ @elastic/core-docs
/get-started/ @elastic/core-docs @elastic/project-docs

/manage-data/ @elastic/admin-docs
/manage-data/data-store/ @elastic/admin-docs @elastic/developer-docs
/manage-data/data-store/ @elastic/admin-docs @elastic/developer-docs
/manage-data/ingest/ @elastic/ingest-docs

/reference/ @elastic/docs
/reference/apm-agents/ @elastic/ingest-docs
/reference/data-analysis/ @elastic/docs
/reference/data-analysis/observability/ @elastic/experience-docs
/reference/data-analysis/kibana/ @elastic/experience-docs
/reference/data-analysis/kibana/ @elastic/experience-docs
/reference/data-analysis/machine-learning/ @elastic/developer-docs
/reference/data-analysis/observability/ @elastic/experience-docs
/reference/elasticsearch/clients/ @elastic/developer-docs
Expand All @@ -42,8 +42,12 @@
/release-notes/fleet-elastic-agent/ @elastic/ingest-docs
/release-notes/intro/ @elastic/docs

/solutions/ @elastic/experience-docs @elastic/developer-docs
/solutions/ @elastic/experience-docs @elastic/developer-docs
/solutions/observability/ @elastic/experience-docs
/solutions/observability/apm/apm-agents/ @elastic/ingest-docs
/solutions/observability/apm/apm-server/ @elastic/ingest-docs
/solutions/observability/apm/ingest/ @elastic/ingest-docs
/solutions/observability/apm/opentelemetry/ @elastic/ingest-docs
/solutions/observability/get-started/ @elastic/ski-docs @elastic/project-docs
/solutions/search/ @elastic/developer-docs
/solutions/search/get-started/ @elastic/developer-docs @elastic/project-docs
Expand All @@ -54,7 +58,7 @@
/troubleshoot/deployments/ @elastic/admin-docs
/troubleshoot/elasticsearch/ @elastic/admin-docs
/troubleshoot/ingest/ @elastic/ingest-docs
/troubleshoot/kibana/ @elastic/admin-docs @elastic/experience-docs
/troubleshoot/kibana/ @elastic/admin-docs @elastic/experience-docs
/troubleshoot/monitoring/ @elastic/admin-docs @elastic/experience-docs
/troubleshoot/observability/ @elastic/ski-docs
/troubleshoot/security/ @elastic/ski-docs
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ Starting in {{stack}} version 8.0, how you change APM settings and the settings
: New deployments created in {{stack}} version 8.0 and later will be managed by {{fleet}}.

* This mode requires SSL/TLS configuration. Check [TLS configuration for {{fleet}}-managed mode](#ece-edit-apm-fleet-tls) for details.
* Check [APM integration input settings](/solutions/observability/apm/configure-apm-server.md) for all other Elastic APM configuration options in this mode.
* Check [APM integration input settings](/solutions/observability/apm/apm-server/configure.md) for all other Elastic APM configuration options in this mode.


Standalone APM Server (legacy)
Expand All @@ -45,7 +45,7 @@ Pick one of the following options:
{{ece}} supports most of the legacy APM settings. Through a YAML editor in the console, you can append your APM Server properties to the `apm-server.yml` file. Your changes to the configuration file are read on startup.

::::{important}
Be aware that some settings could break your cluster if set incorrectly and that the syntax might change between major versions. Before upgrading, be sure to review the full list of the [latest APM settings and syntax](/solutions/observability/apm/configure-apm-server.md).
Be aware that some settings could break your cluster if set incorrectly and that the syntax might change between major versions. Before upgrading, be sure to review the full list of the [latest APM settings and syntax](/solutions/observability/apm/apm-server/configure.md).
::::


Expand Down
4 changes: 2 additions & 2 deletions deploy-manage/deploy/cloud-on-k8s/advanced-configuration.md
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ This section covers the following topics:
APM Agent central configuration was added in 7.5.1.
:::

[APM Agent configuration management](/solutions/observability/apm/apm-agent-central-configuration.md) allows you to configure your APM Agents centrally from the {{kib}} APM app. To use this feature, the APM Server needs to be configured with connection details of the {{kib}} instance. If {{kib}} is managed by ECK, you can simply add a `kibanaRef` attribute to the APM Server specification:
[APM Agent configuration management](/solutions/observability/apm/apm-server/apm-agent-central-configuration.md) allows you to configure your APM Agents centrally from the {{kib}} APM app. To use this feature, the APM Server needs to be configured with connection details of the {{kib}} instance. If {{kib}} is managed by ECK, you can simply add a `kibanaRef` attribute to the APM Server specification:

```yaml subs=true
cat <<EOF | kubectl apply -f -
Expand Down Expand Up @@ -112,7 +112,7 @@ The APM Server keystore can be used to store sensitive settings in the APM Serve
password: "${ES_PASSWORD}"
```

3. Reference the key in the APM Server configuration, as described in the [Secrets keystore for secure settings](/solutions/observability/apm/secrets-keystore-for-secure-settings.md).
3. Reference the key in the APM Server configuration, as described in the [Secrets keystore for secure settings](/solutions/observability/apm/apm-server/secrets-keystore-for-secure-settings.md).


## Reference an existing {{es}} cluster [k8s-apm-existing-es]
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ products:

# Use an {{es}} cluster managed by ECK [k8s-apm-eck-managed-es]

Managing APM Server, {{kib}} and {{es}} with ECK allows a smooth and secured integration between the stack components. The output configuration of the APM Server is setup automatically to establish a trust relationship with {{es}}. Specifying the {{kib}} reference allows ECK to automatically configure the [{{kib}} endpoint](/solutions/observability/apm/configure-kibana-endpoint.md).
Managing APM Server, {{kib}} and {{es}} with ECK allows a smooth and secured integration between the stack components. The output configuration of the APM Server is setup automatically to establish a trust relationship with {{es}}. Specifying the {{kib}} reference allows ECK to automatically configure the [{{kib}} endpoint](/solutions/observability/apm/apm-server/configure-kibana-endpoint.md).

1. To deploy an APM Server and connect it to the {{es}} cluster and {{kib}} instance you created in [](/deploy-manage/deploy/cloud-on-k8s/elasticsearch-deployment-quickstart.md), apply the following specification:

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -109,7 +109,7 @@ This table compares Observability capabilities between {{ech}} deployments and O
|---------|----------------------|-----------------------------------|------------------|
| [**AI Assistant**](/solutions/observability/observability-ai-assistant.md) | ✅ | ✅ | |
| **APM integration** | ✅ | ✅ | Use **Managed Intake Service** (supports Elastic APM and OTLP protocols) <br> Refer to [Managed OTLP endpoint](opentelemetry://reference/motlp.md) for OTLP data ingestion |
| [**APM Agent Central Configuration**](/solutions/observability/apm/apm-agent-central-configuration.md) | ✅ | ❌ | Not available in Serverless |
| [**APM Agent Central Configuration**](/solutions/observability/apm/apm-server/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/edot-android/index.md) | ✅ | ✅ | |
| [**AWS Firehose integration**](/solutions/observability/cloud/monitor-amazon-web-services-aws-with-amazon-data-firehose.md) | ✅ | ✅ | |
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ For a list of supported settings, check [{{kib}} settings](kibana://reference/cl

### APM settings

Refer to [APM configuration reference](/solutions/observability/apm/configure-apm-server.md) for information on how to configure the {{fleet}}-managed APM integration.
Refer to [APM configuration reference](/solutions/observability/apm/apm-server/configure.md) for information on how to configure the {{fleet}}-managed APM integration.

## Edit settings [ec-add-user-settings]

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -405,7 +405,7 @@ From the deployment **APM & Fleet** page you can also:

### Upgrading to {{stack}} 8.0 [ec-upgrade-apm-stack-8]

The following APM settings have been removed in {{stack}} version 8.0. This change is only relevant to users upgrading a standalone (legacy) deployment of APM Server to {{stack}} version 8.0. Check [Add APM user settings](/solutions/observability/apm/configure-apm-server.md) for more details.
The following APM settings have been removed in {{stack}} version 8.0. This change is only relevant to users upgrading a standalone (legacy) deployment of APM Server to {{stack}} version 8.0. Check [Add APM user settings](/solutions/observability/apm/apm-server/configure.md) for more details.

```yaml
apm-server.api_key.enabled
Expand Down
2 changes: 1 addition & 1 deletion deploy-manage/deploy/self-managed/air-gapped-install.md
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,7 @@ To learn more about installing {{fleet-server}}, refer to the [{{fleet-server}}
Air-gapped setup of the APM server is possible in two ways:

* By setting up one of the {{agent}} deployments with an APM integration, as described in [Switch a self-installation to the APM integration](/solutions/observability/apm/switch-self-installation-to-apm-integration.md). See [air gapped installation guidance for {{agent}}](#air-gapped-elastic-agent).
* Or, by installing a standalone Elastic APM Server, as described in the [APM configuration documentation](/solutions/observability/apm/configure-apm-server.md).
* Or, by installing a standalone Elastic APM Server, as described in the [APM configuration documentation](/solutions/observability/apm/apm-server/configure.md).


## {{ems}} [air-gapped-elastic-maps-service]
Expand Down
2 changes: 1 addition & 1 deletion deploy-manage/monitor/logging-configuration.md
Original file line number Diff line number Diff line change
Expand Up @@ -111,7 +111,7 @@ You can also consume logs using [stack monitoring](/deploy-manage/monitor/stack-

You can also collect and index the following types of logs from other components in your deployments:

[**APM**](/solutions/observability/apm/configure-logging.md)
[**APM**](/solutions/observability/apm/apm-server/configure-logging.md)

* `apm*.log*`

Expand Down
2 changes: 1 addition & 1 deletion deploy-manage/monitor/stack-monitoring.md
Original file line number Diff line number Diff line change
Expand Up @@ -89,7 +89,7 @@ Most of these methods require that you configure monitoring of {{es}} before mon
* [Packetbeat](beats://reference/packetbeat/monitoring.md)
* [Winlogbeat](beats://reference/winlogbeat/monitoring.md)

* [**APM Server**](/solutions/observability/apm/monitor-apm-server.md)
* [**APM Server**](/solutions/observability/apm/apm-server/monitor.md)

* **{{agent}}s**:
* [{{fleet}}-managed {{agent}}s](/reference/fleet/monitor-elastic-agent.md)
Expand Down
Loading
Loading