Skip to content
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

[8.9](backport #3554) Remove unused APM attributes #3564

Merged
merged 2 commits into from
Jan 23, 2024
Merged
Show file tree
Hide file tree
Changes from 1 commit
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
3 changes: 3 additions & 0 deletions docs/en/apm-server/version.asciidoc
Original file line number Diff line number Diff line change
@@ -1,10 +1,13 @@
<<<<<<< HEAD:docs/en/apm-server/version.asciidoc
// doc-branch can be: master, 8.0, 8.1, etc.
:doc-branch: master
:go-version: 1.19.10
:python: 3.7
:docker: 1.12
:docker-compose: 1.11

=======
>>>>>>> 094640ed (remove unused attrs (#3554)):docs/en/observability/apm/version.asciidoc
bmorelli25 marked this conversation as resolved.
Show resolved Hide resolved
include::{asciidoc-dir}/../../shared/versions/stack/{source_branch}.asciidoc[]

// Agent link attributes
Expand Down
54 changes: 54 additions & 0 deletions docs/en/observability/apm.asciidoc
Original file line number Diff line number Diff line change
@@ -1,6 +1,60 @@
[[apm]]
= Application performance monitoring (APM)

<<<<<<< HEAD
=======
:apm-integration-docs:
:obs-repo-dir: {observability-docs-root}/docs/en

:github_repo_link: https://github.com/elastic/apm-server/blob/v{version}
ifeval::["{version}" == "8.0.0"]
:github_repo_link: https://github.com/elastic/apm-server/blob/main
endif::[]


// OTHER ATTRS
// TODO: Check that these are still relevant
:version: {apm_server_version}
:beatname_lc: apm-server
:beatname_uc: APM Server
:beatname_pkg: {beatname_lc}
:beat_kib_app: APM app
:beat_monitoring_user: apm_system
:beat_monitoring_user_version: 6.5.0
:beat_monitoring_version: 6.5
:beat_default_index_prefix: apm
:access_role: {beat_default_index_prefix}_user
:beat_version_key: observer.version
:dockerimage: docker.elastic.co/apm/{beatname_lc}:{version}
:dockergithub: https://github.com/elastic/apm-server-docker/tree/{branch}
:dockerconfig: https://raw.githubusercontent.com/elastic/apm-server/{branch}/apm-server.docker.yml
:discuss_forum: apm
:github_repo_name: apm-server
:sample_date_0: 2019.10.20
:sample_date_1: 2019.10.21
:sample_date_2: 2019.10.22
:repo: apm-server
:no_kibana:
:no_ilm:
:no-pipeline:
:no-processors:
:no-indices-rules:
:no_dashboards:
:apm-server:
:deb_os:
:rpm_os:
:mac_os:
:docker_platform:
:win_os:
:linux_os:

:downloads: https://artifacts.elastic.co/downloads/apm-server

// Temporary attributes
:which-guide: observability
:apm-server-dir: {observability-docs-root}/docs/en/observability/apm

>>>>>>> 094640ed (remove unused attrs (#3554))
bmorelli25 marked this conversation as resolved.
Show resolved Hide resolved
Elastic APM is an application performance monitoring system built on the {stack}.
It allows you to monitor software services and applications in real time, by
collecting detailed performance information on response time for incoming requests,
Expand Down