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.

Sign up for GitHub

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

Add APM Guide #2246

Merged
merged 4 commits into from
Oct 15, 2021
Merged

Add APM Guide #2246

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
7de6871
add apm guide
bmorelli25 Oct 13, 2021
4537e15
Update conf.yaml
bmorelli25 Oct 13, 2021
cd22e70
Update doc_build_aliases.sh
bmorelli25 Oct 13, 2021
1b681dc
Apply suggestions from code review
bmorelli25 Oct 15, 2021
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
26 changes: 23 additions & 3 deletions conf.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -499,7 +499,7 @@ contents:
-
repo: elasticsearch-java
path: docs/
-
-
repo: elasticsearch
path: docs/java-rest/
-
Expand Down Expand Up @@ -1123,7 +1123,7 @@ contents:
current: *stackcurrent
branches: [ master, 7.15, 7.14, 7.13, 7.12, 7.11, 7.10, 7.9, 7.8, 7.7, 7.6, 7.5, 7.4, 7.3, 7.2, 7.1, 7.0, 6.8, 6.7, 6.6, 6.5, 6.4, 6.3, 6.2, 6.1, 6.0 ]
live: *stacklive
chunk: 1
chunk: 2
bmorelli25 marked this conversation as resolved.
Show resolved Hide resolved
tags: APM Server/Reference
subject: APM
sources:
Expand All @@ -1139,7 +1139,7 @@ contents:
current: *stackcurrent
branches: [ master, 7.15, 7.14, 7.13, 7.12, 7.11, 7.10, 7.9, 7.8, 7.7, 7.6, 7.5, 7.4, 7.3, 7.2, 7.1, 7.0, 6.8, 6.7, 6.6, 6.5, 6.4, 6.3, 6.2, 6.1, 6.0 ]
live: *stacklive
chunk: 1
chunk: 2
bmorelli25 marked this conversation as resolved.
Show resolved Hide resolved
tags: APM Server/Reference
subject: APM
sources:
Expand All @@ -1153,6 +1153,26 @@ contents:
-
repo: apm-server
path: CHANGELOG.asciidoc
- title: APM Guide
prefix: guide
index: docs/integrations-index.asciidoc
current: master
branches: [ master ]
live: [ master ]
chunk: 2
tags: APM Guide
subject: APM
sources:
-
repo: apm-server
path: changelogs
exclude_branches: [ 6.0 ]
-
repo: apm-server
path: docs
-
repo: apm-server
path: CHANGELOG.asciidoc
- title: APM Agents
base_dir: agent
sections:
Expand Down
6 changes: 4 additions & 2 deletions doc_build_aliases.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -145,9 +145,11 @@ alias docbldim='$GIT_HOME/docs/build_docs --doc $GIT_HOME/observability-docs/doc
alias docbldfdg='$GIT_HOME/docs/build_docs --doc $GIT_HOME/observability-docs/docs/en/fleet-developer/index.asciidoc --chunk 2'

# APM
alias docbldamg='$GIT_HOME/docs/build_docs --doc $GIT_HOME/apm-server/docs/guide/index.asciidoc --chunk 1'
alias docbldapm='$GIT_HOME/docs/build_docs --doc $GIT_HOME/apm-server/docs/integrations-index.asciidoc --chunk 2'

bmorelli25 marked this conversation as resolved.
Show resolved Hide resolved
alias docbldamr='$GIT_HOME/docs/build_docs --doc $GIT_HOME/apm-server/docs/index.asciidoc --chunk 1'
alias docbldamg='$GIT_HOME/docs/build_docs --doc $GIT_HOME/apm-server/docs/guide/index.asciidoc --chunk 2'

alias docbldamr='$GIT_HOME/docs/build_docs --doc $GIT_HOME/apm-server/docs/index.asciidoc --chunk 2'
bmorelli25 marked this conversation as resolved.
Show resolved Hide resolved

alias docbldamn='$GIT_HOME/docs/build_docs --doc $GIT_HOME/apm-agent-nodejs/docs/index.asciidoc --chunk 1'

Expand Down
3 changes: 2 additions & 1 deletion shared/attributes.asciidoc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,7 @@
:journalbeat-ref: https://www.elastic.co/guide/en/beats/journalbeat/{branch}
:ingest-guide: https://www.elastic.co/guide/en/ingest-management/{branch}
:fleet-guide: https://www.elastic.co/guide/en/fleet/{branch}
:apm-guide-ref: https://www.elastic.co/guide/en/apm/guide/{branch}
:apm-get-started-ref: https://www.elastic.co/guide/en/apm/get-started/{branch}
:apm-overview-ref-v: https://www.elastic.co/guide/en/apm/get-started/{branch}
:apm-overview-ref-70: https://www.elastic.co/guide/en/apm/get-started/7.0
Expand Down Expand Up @@ -260,7 +261,7 @@ Common words and phrases
:slm-init: SLM
:rollup-features: data rollup features
:ipm: index pattern management
:ipm-cap: Index pattern
:ipm-cap: Index pattern

:rollup: rollup
:rollup-cap: Rollup
Expand Down