From e00a143cee647973be93c972893553543dbc599c Mon Sep 17 00:00:00 2001 From: Brandon Morelli Date: Mon, 22 Jan 2024 16:43:21 -0700 Subject: [PATCH 1/3] remove unused attrs (#3554) (cherry picked from commit 094640ed4178c71f48cba69c608bc06e18068d83) # Conflicts: # docs/en/apm-server/version.asciidoc # docs/en/observability/apm.asciidoc --- docs/en/apm-server/version.asciidoc | 3 ++ docs/en/observability/apm.asciidoc | 54 +++++++++++++++++++++++++++++ 2 files changed, 57 insertions(+) diff --git a/docs/en/apm-server/version.asciidoc b/docs/en/apm-server/version.asciidoc index 649cc329b5..4f9dd0e532 100644 --- a/docs/en/apm-server/version.asciidoc +++ b/docs/en/apm-server/version.asciidoc @@ -1,3 +1,4 @@ +<<<<<<< HEAD:docs/en/apm-server/version.asciidoc // doc-branch can be: master, 8.0, 8.1, etc. :doc-branch: master :go-version: 1.19.8 @@ -5,6 +6,8 @@ :docker: 1.12 :docker-compose: 1.11 +======= +>>>>>>> 094640ed (remove unused attrs (#3554)):docs/en/observability/apm/version.asciidoc include::{asciidoc-dir}/../../shared/versions/stack/{source_branch}.asciidoc[] // Agent link attributes diff --git a/docs/en/observability/apm.asciidoc b/docs/en/observability/apm.asciidoc index f857bfe691..5bfd1a58e5 100644 --- a/docs/en/observability/apm.asciidoc +++ b/docs/en/observability/apm.asciidoc @@ -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)) 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, From 41e5741b92729c3b7c8e6a3277f559fc6cc5002d Mon Sep 17 00:00:00 2001 From: Brandon Morelli Date: Mon, 22 Jan 2024 15:45:43 -0800 Subject: [PATCH 2/3] Update docs/en/observability/apm.asciidoc --- docs/en/observability/apm.asciidoc | 54 ------------------------------ 1 file changed, 54 deletions(-) diff --git a/docs/en/observability/apm.asciidoc b/docs/en/observability/apm.asciidoc index 5bfd1a58e5..f857bfe691 100644 --- a/docs/en/observability/apm.asciidoc +++ b/docs/en/observability/apm.asciidoc @@ -1,60 +1,6 @@ [[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)) 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, From a6cc073a211b2dd5a654529eb13a41a647c495c7 Mon Sep 17 00:00:00 2001 From: Brandon Morelli Date: Mon, 22 Jan 2024 15:46:01 -0800 Subject: [PATCH 3/3] Update docs/en/apm-server/version.asciidoc --- docs/en/apm-server/version.asciidoc | 10 ---------- 1 file changed, 10 deletions(-) diff --git a/docs/en/apm-server/version.asciidoc b/docs/en/apm-server/version.asciidoc index 4f9dd0e532..bf1fa31d42 100644 --- a/docs/en/apm-server/version.asciidoc +++ b/docs/en/apm-server/version.asciidoc @@ -1,13 +1,3 @@ -<<<<<<< HEAD:docs/en/apm-server/version.asciidoc -// doc-branch can be: master, 8.0, 8.1, etc. -:doc-branch: master -:go-version: 1.19.8 -:python: 3.7 -:docker: 1.12 -:docker-compose: 1.11 - -======= ->>>>>>> 094640ed (remove unused attrs (#3554)):docs/en/observability/apm/version.asciidoc include::{asciidoc-dir}/../../shared/versions/stack/{source_branch}.asciidoc[] // Agent link attributes