From 7de6871f8b8fd909c6eff563341841555c7e6e96 Mon Sep 17 00:00:00 2001 From: Brandon Morelli Date: Tue, 12 Oct 2021 17:29:30 -0700 Subject: [PATCH 1/4] add apm guide --- conf.yaml | 26 +++++++++++++++++++++++--- doc_build_aliases.sh | 2 ++ shared/attributes.asciidoc | 3 ++- 3 files changed, 27 insertions(+), 4 deletions(-) diff --git a/conf.yaml b/conf.yaml index 94becee709b3d..91e00dd4ec1b3 100644 --- a/conf.yaml +++ b/conf.yaml @@ -499,7 +499,7 @@ contents: - repo: elasticsearch-java path: docs/ - - + - repo: elasticsearch path: docs/java-rest/ - @@ -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 tags: APM Server/Reference subject: APM sources: @@ -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 tags: APM Server/Reference subject: APM sources: @@ -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: diff --git a/doc_build_aliases.sh b/doc_build_aliases.sh index 9e915ba76440c..1cfc62bc2d154 100644 --- a/doc_build_aliases.sh +++ b/doc_build_aliases.sh @@ -145,6 +145,8 @@ 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 docbldapm='$GIT_HOME/docs/build_docs --doc $GIT_HOME/apm-server/docs/integrations-index.asciidoc --chunk 2' + alias docbldamg='$GIT_HOME/docs/build_docs --doc $GIT_HOME/apm-server/docs/guide/index.asciidoc --chunk 1' alias docbldamr='$GIT_HOME/docs/build_docs --doc $GIT_HOME/apm-server/docs/index.asciidoc --chunk 1' diff --git a/shared/attributes.asciidoc b/shared/attributes.asciidoc index fc92404967da9..c71e75cb0040d 100644 --- a/shared/attributes.asciidoc +++ b/shared/attributes.asciidoc @@ -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 @@ -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 From 4537e157026946fe636c18fa9c04cb5a8874f69d Mon Sep 17 00:00:00 2001 From: Brandon Morelli Date: Wed, 13 Oct 2021 10:08:56 -0700 Subject: [PATCH 2/4] Update conf.yaml Co-authored-by: Greg Back <1045796+gtback@users.noreply.github.com> --- conf.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/conf.yaml b/conf.yaml index 91e00dd4ec1b3..9ffec371a8ec8 100644 --- a/conf.yaml +++ b/conf.yaml @@ -1158,7 +1158,7 @@ contents: index: docs/integrations-index.asciidoc current: master branches: [ master ] - live: master + live: [ master ] chunk: 2 tags: APM Guide subject: APM From cd22e705eb5bb426b28ccce7b0bc3982a8b12ece Mon Sep 17 00:00:00 2001 From: Brandon Morelli Date: Wed, 13 Oct 2021 10:12:17 -0700 Subject: [PATCH 3/4] Update doc_build_aliases.sh --- doc_build_aliases.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/doc_build_aliases.sh b/doc_build_aliases.sh index 1cfc62bc2d154..da54c2417f437 100644 --- a/doc_build_aliases.sh +++ b/doc_build_aliases.sh @@ -147,9 +147,9 @@ alias docbldfdg='$GIT_HOME/docs/build_docs --doc $GIT_HOME/observability-docs/do # APM alias docbldapm='$GIT_HOME/docs/build_docs --doc $GIT_HOME/apm-server/docs/integrations-index.asciidoc --chunk 2' -alias docbldamg='$GIT_HOME/docs/build_docs --doc $GIT_HOME/apm-server/docs/guide/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 1' +alias docbldamr='$GIT_HOME/docs/build_docs --doc $GIT_HOME/apm-server/docs/index.asciidoc --chunk 2' alias docbldamn='$GIT_HOME/docs/build_docs --doc $GIT_HOME/apm-agent-nodejs/docs/index.asciidoc --chunk 1' From 1b681dc4691bfec38073fc5dd7fa3f754a68fc59 Mon Sep 17 00:00:00 2001 From: Brandon Morelli Date: Fri, 15 Oct 2021 13:10:47 -0700 Subject: [PATCH 4/4] Apply suggestions from code review Revert chunk level change on deprecated books --- conf.yaml | 4 ++-- doc_build_aliases.sh | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/conf.yaml b/conf.yaml index 9ffec371a8ec8..a30112a9d1b28 100644 --- a/conf.yaml +++ b/conf.yaml @@ -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: 2 + chunk: 1 tags: APM Server/Reference subject: APM sources: @@ -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: 2 + chunk: 1 tags: APM Server/Reference subject: APM sources: diff --git a/doc_build_aliases.sh b/doc_build_aliases.sh index da54c2417f437..1cfc62bc2d154 100644 --- a/doc_build_aliases.sh +++ b/doc_build_aliases.sh @@ -147,9 +147,9 @@ alias docbldfdg='$GIT_HOME/docs/build_docs --doc $GIT_HOME/observability-docs/do # APM alias docbldapm='$GIT_HOME/docs/build_docs --doc $GIT_HOME/apm-server/docs/integrations-index.asciidoc --chunk 2' -alias docbldamg='$GIT_HOME/docs/build_docs --doc $GIT_HOME/apm-server/docs/guide/index.asciidoc --chunk 2' +alias docbldamg='$GIT_HOME/docs/build_docs --doc $GIT_HOME/apm-server/docs/guide/index.asciidoc --chunk 1' -alias docbldamr='$GIT_HOME/docs/build_docs --doc $GIT_HOME/apm-server/docs/index.asciidoc --chunk 2' +alias docbldamr='$GIT_HOME/docs/build_docs --doc $GIT_HOME/apm-server/docs/index.asciidoc --chunk 1' alias docbldamn='$GIT_HOME/docs/build_docs --doc $GIT_HOME/apm-agent-nodejs/docs/index.asciidoc --chunk 1'