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

[do not merge] Move APM guide pages into Observability guide #3477

Closed
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
41 commits
Select commit Hold shift + click to select a range
88eae3e
remove data and spec directories, point to apm-server
colleenmcginnis Dec 19, 2023
2d9b648
move apm guide pages into observability guide
colleenmcginnis Dec 19, 2023
481a3ea
add temporary redirects
colleenmcginnis Dec 19, 2023
2931634
update build command
colleenmcginnis Dec 19, 2023
1f61dbf
fix redirects
colleenmcginnis Dec 19, 2023
dc3a2c5
temporarily comment out 8.12 release notes link
colleenmcginnis Dec 19, 2023
472722f
temporarily comment out release note links
colleenmcginnis Dec 19, 2023
6bd1704
temporarily hide changelog
colleenmcginnis Dec 19, 2023
74f05de
try to fix blank apm guide book
colleenmcginnis Dec 19, 2023
7623f1b
Update docs/en/apm-server/integrations-index.asciidoc
bmorelli25 Dec 20, 2023
be1faf6
Update integrations-index.asciidoc
bmorelli25 Dec 20, 2023
51a9d74
fix broken links attempt one
colleenmcginnis Dec 20, 2023
549c124
fix broken links attempt two
colleenmcginnis Dec 20, 2023
2138d90
fix broken links attempt three
colleenmcginnis Dec 20, 2023
1916a03
restore docs/en/apm-server
colleenmcginnis Dec 20, 2023
a84cc26
remove duplicate quickstart, update links
colleenmcginnis Dec 20, 2023
feb452d
Merge branch 'main' into consolidate-apm-docs
colleenmcginnis Dec 21, 2023
bf8efa9
update release notes
colleenmcginnis Dec 21, 2023
29557eb
delete
bmorelli25 Dec 21, 2023
0bb22c8
copy
bmorelli25 Dec 21, 2023
ee0b068
delete more
bmorelli25 Dec 21, 2023
c6fa52e
move more
bmorelli25 Dec 21, 2023
06c1721
copy new files
bmorelli25 Dec 21, 2023
69c59fe
copy paste
bmorelli25 Dec 21, 2023
5a5cf52
delete again
bmorelli25 Dec 21, 2023
8d74448
add temporary redirects
colleenmcginnis Dec 19, 2023
a384b4e
fix redirects
colleenmcginnis Dec 19, 2023
622c7a6
temporarily comment out 8.12 release notes link
colleenmcginnis Dec 19, 2023
8deb088
temporarily comment out release note links
colleenmcginnis Dec 19, 2023
fa25bb9
temporarily hide changelog
colleenmcginnis Dec 19, 2023
0c1c007
try to fix blank apm guide book
colleenmcginnis Dec 19, 2023
a5ad371
Update docs/en/apm-server/integrations-index.asciidoc
bmorelli25 Dec 20, 2023
19d23e8
Update integrations-index.asciidoc
bmorelli25 Dec 20, 2023
717bb03
fix broken links attempt one
colleenmcginnis Dec 20, 2023
36164f9
fix broken links attempt two
colleenmcginnis Dec 20, 2023
a8ede19
fix broken links attempt three
colleenmcginnis Dec 20, 2023
5238f50
remove duplicate quickstart, update links
colleenmcginnis Dec 20, 2023
57fcb48
delete
bmorelli25 Dec 21, 2023
9544649
update release notes
colleenmcginnis Dec 21, 2023
3bcaaf8
test
bmorelli25 Dec 21, 2023
b7109f8
Revert "test"
bmorelli25 Dec 21, 2023
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
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ To build the docs:
2. Run the `build_docs` script, passing in the path to the `index.asciidoc` and resource paths to other repos that contain source files. For example, to build the Observability Guide and open it in the browser, run:

```
../docs/build_docs --doc ./docs/en/observability/index.asciidoc --chunk 1 --resource ../apm-server/docs/guide --resource ../ingest-docs/docs --open
../docs/build_docs --doc ./docs/en/observability/index.asciidoc --chunk 3 --resource ../apm-server --resource ../ingest-docs/docs --open
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

We should update this in the docs repo as well. I'll update the issue.

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

```

The above command assumes that [elastic/docs](https://github.com/elastic/docs), [elastic/beats](https://github.com/elastic/beats), and [elastic/apm-server](https://github.com/elastic/apm-server) are checked out into the same parent directory.
Expand Down
91 changes: 6 additions & 85 deletions docs/en/apm-server/integrations-index.asciidoc
Original file line number Diff line number Diff line change
@@ -1,91 +1,12 @@
include::./version.asciidoc[]
include::{asciidoc-dir}/../../shared/attributes.asciidoc[]

:apm-integration-docs:
:obs-repo-dir: {observability-docs-root}/docs/en
:tab-widget-dir: {docdir}/tab-widgets

: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/{doc-branch}
:dockerconfig: https://raw.githubusercontent.com/elastic/apm-server/{doc-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
:doctype: book

// END OTHER ATTRS
include::{asciidoc-dir}/../../shared/versions/stack/{source_branch}.asciidoc[]
include::{asciidoc-dir}/../../shared/attributes.asciidoc[]

[[apm-user-guide]]
= APM User Guide

include::apm-overview.asciidoc[]

include::apm-quick-start.asciidoc[]

include::{docdir}/getting-started-apm-server.asciidoc[]

include::data-model.asciidoc[]

include::features.asciidoc[]

include::how-to.asciidoc[]

include::open-telemetry.asciidoc[]

include::manage-storage.asciidoc[]

include::configure/index.asciidoc[leveloffset=+1]

include::{docdir}/setting-up-and-running.asciidoc[]

include::secure-comms.asciidoc[]

include::monitor-apm-server.asciidoc[]

include::api.asciidoc[]

include::troubleshoot-apm.asciidoc[]

include::upgrading.asciidoc[]

include::release-notes.asciidoc[leveloffset=+1]
== About

include::known-issues.asciidoc[leveloffset=+1]
This documentation has moved.

include::{docdir}/redirects.asciidoc[]
include::redirects.asciidoc[]
Loading