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

[apm docs consolidation] Clean up #3476

Merged

Conversation

colleenmcginnis
Copy link
Contributor

@colleenmcginnis colleenmcginnis commented Dec 19, 2023

Dependent on /apm-server PR (coming soon)

There's some content we want to leave behind in /apm-server and include in this repo:

  • Release notes/breaking changes: Manage release notes 100% in the /apm-server repo (9f043cd)
  • Sample data: Keep sample data in /apm server including docs/spec (and docs/data?) directory

@colleenmcginnis colleenmcginnis added backport-7.17 Automated backport with mergify backport-8.11 Automated backport with mergify backport-8.12 Automated backport with mergify labels Dec 19, 2023
@colleenmcginnis colleenmcginnis self-assigned this Dec 19, 2023
Copy link
Contributor

A documentation preview will be available soon:

bmorelli25
bmorelli25 previously approved these changes Dec 19, 2023
Copy link
Member

@bmorelli25 bmorelli25 left a comment

Choose a reason for hiding this comment

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

Pending changes in apm-server, this LGTM!

@colleenmcginnis colleenmcginnis added backport-8.9 Automated backport with mergify backport-8.1 Automated backport with mergify backport-8.2 Automated backport with mergify backport-8.0 Automated backport with mergify backport-8.4 Automated backport with mergify backport-8.5 Automated backport with mergify backport-8.6 Automated backport with mergify backport-8.7 Automated backport with mergify backport-8.8 Automated backport with mergify backport-8.3 Automated backport with mergify backport-8.10 Automated backport with mergify labels Dec 19, 2023
@colleenmcginnis
Copy link
Contributor Author

@elasticmachine, run elasticsearch-ci/docs

@colleenmcginnis
Copy link
Contributor Author

@elasticmachine, run elasticsearch-ci/docs

1 similar comment
@bmorelli25
Copy link
Member

@elasticmachine, run elasticsearch-ci/docs

@colleenmcginnis colleenmcginnis marked this pull request as ready for review December 21, 2023 15:20
mergify bot pushed a commit that referenced this pull request Dec 21, 2023
* use tagged regions for release notes

* rename apm-breaking, point to apm-server

* remove data and spec directories, point to apm-server

(cherry picked from commit d4309b5)

# Conflicts:
#	docs/en/apm-server/apm-breaking.asciidoc
#	docs/en/apm-server/data-model.asciidoc
#	docs/en/apm-server/data/elasticsearch/generated/errors.json
#	docs/en/apm-server/data/elasticsearch/generated/spans.json
#	docs/en/apm-server/data/elasticsearch/generated/transactions.json
#	docs/en/apm-server/data/elasticsearch/metricset.json
#	docs/en/apm-server/release-notes.asciidoc
#	docs/en/apm-server/spec/rumv3/error.json
#	docs/en/apm-server/spec/rumv3/span.json
#	docs/en/apm-server/spec/rumv3/transaction.json
#	docs/en/apm-server/spec/v2/error.json
#	docs/en/apm-server/spec/v2/metadata.json
#	docs/en/apm-server/spec/v2/span.json
#	docs/en/apm-server/spec/v2/transaction.json
mergify bot pushed a commit that referenced this pull request Dec 21, 2023
* use tagged regions for release notes

* rename apm-breaking, point to apm-server

* remove data and spec directories, point to apm-server

(cherry picked from commit d4309b5)

# Conflicts:
#	docs/en/apm-server/apm-breaking.asciidoc
#	docs/en/apm-server/data-model.asciidoc
#	docs/en/apm-server/data/elasticsearch/metricset.json
#	docs/en/apm-server/release-notes.asciidoc
#	docs/en/apm-server/spec/rumv3/span.json
#	docs/en/apm-server/spec/rumv3/transaction.json
#	docs/en/apm-server/spec/v2/metadata.json
#	docs/en/apm-server/spec/v2/span.json
#	docs/en/apm-server/spec/v2/transaction.json
mergify bot pushed a commit that referenced this pull request Dec 21, 2023
* use tagged regions for release notes

* rename apm-breaking, point to apm-server

* remove data and spec directories, point to apm-server

(cherry picked from commit d4309b5)

# Conflicts:
#	docs/en/apm-server/apm-breaking.asciidoc
#	docs/en/apm-server/data-model.asciidoc
#	docs/en/apm-server/data/elasticsearch/metricset.json
#	docs/en/apm-server/release-notes.asciidoc
mergify bot pushed a commit that referenced this pull request Dec 21, 2023
* use tagged regions for release notes

* rename apm-breaking, point to apm-server

* remove data and spec directories, point to apm-server

(cherry picked from commit d4309b5)

# Conflicts:
#	docs/en/apm-server/apm-breaking.asciidoc
#	docs/en/apm-server/data/elasticsearch/service_destination_metric.json
#	docs/en/apm-server/release-notes.asciidoc
mergify bot pushed a commit that referenced this pull request Dec 21, 2023
* use tagged regions for release notes

* rename apm-breaking, point to apm-server

* remove data and spec directories, point to apm-server

(cherry picked from commit d4309b5)

# Conflicts:
#	docs/en/apm-server/apm-breaking.asciidoc
#	docs/en/apm-server/data/elasticsearch/service_destination_metric.json
#	docs/en/apm-server/release-notes.asciidoc
mergify bot pushed a commit that referenced this pull request Dec 21, 2023
* use tagged regions for release notes

* rename apm-breaking, point to apm-server

* remove data and spec directories, point to apm-server

(cherry picked from commit d4309b5)

# Conflicts:
#	docs/en/apm-server/apm-breaking.asciidoc
#	docs/en/apm-server/release-notes.asciidoc
mergify bot pushed a commit that referenced this pull request Dec 21, 2023
* use tagged regions for release notes

* rename apm-breaking, point to apm-server

* remove data and spec directories, point to apm-server

(cherry picked from commit d4309b5)

# Conflicts:
#	docs/en/apm-server/release-notes.asciidoc
mergify bot pushed a commit that referenced this pull request Dec 21, 2023
* use tagged regions for release notes

* rename apm-breaking, point to apm-server

* remove data and spec directories, point to apm-server

(cherry picked from commit d4309b5)

# Conflicts:
#	docs/en/apm-server/release-notes.asciidoc
colleenmcginnis added a commit that referenced this pull request Dec 21, 2023
* [apm docs consolidation] Clean up  (#3476)

* use tagged regions for release notes

* rename apm-breaking, point to apm-server

* remove data and spec directories, point to apm-server

(cherry picked from commit d4309b5)

# Conflicts:
#	docs/en/apm-server/release-notes.asciidoc

* fix conflict

---------

Co-authored-by: Colleen McGinnis <colleen.mcginnis@elastic.co>
colleenmcginnis added a commit that referenced this pull request Dec 21, 2023
* [apm docs consolidation] Clean up  (#3476)

* use tagged regions for release notes

* rename apm-breaking, point to apm-server

* remove data and spec directories, point to apm-server

(cherry picked from commit d4309b5)

# Conflicts:
#	docs/en/apm-server/apm-breaking.asciidoc
#	docs/en/apm-server/release-notes.asciidoc

* fix conflicts

---------

Co-authored-by: Colleen McGinnis <colleen.mcginnis@elastic.co>
colleenmcginnis added a commit that referenced this pull request Dec 21, 2023
* [apm docs consolidation] Clean up  (#3476)

* use tagged regions for release notes

* rename apm-breaking, point to apm-server

* remove data and spec directories, point to apm-server

(cherry picked from commit d4309b5)

# Conflicts:
#	docs/en/apm-server/apm-breaking.asciidoc
#	docs/en/apm-server/data/elasticsearch/service_destination_metric.json
#	docs/en/apm-server/release-notes.asciidoc

* fix conflicts

---------

Co-authored-by: Colleen McGinnis <colleen.mcginnis@elastic.co>
colleenmcginnis added a commit that referenced this pull request Dec 21, 2023
* [apm docs consolidation] Clean up  (#3476)

* use tagged regions for release notes

* rename apm-breaking, point to apm-server

* remove data and spec directories, point to apm-server

(cherry picked from commit d4309b5)

# Conflicts:
#	docs/en/apm-server/apm-breaking.asciidoc
#	docs/en/apm-server/data/elasticsearch/service_destination_metric.json
#	docs/en/apm-server/release-notes.asciidoc

* fix conflicts

---------

Co-authored-by: Colleen McGinnis <colleen.mcginnis@elastic.co>
colleenmcginnis added a commit that referenced this pull request Dec 21, 2023
* [apm docs consolidation] Clean up  (#3476)

* use tagged regions for release notes

* rename apm-breaking, point to apm-server

* remove data and spec directories, point to apm-server

(cherry picked from commit d4309b5)

# Conflicts:
#	docs/en/apm-server/release-notes.asciidoc

* fix conflicts

---------

Co-authored-by: Colleen McGinnis <colleen.mcginnis@elastic.co>
colleenmcginnis added a commit that referenced this pull request Jan 2, 2024
* [apm docs consolidation] Clean up  (#3476)

* use tagged regions for release notes

* rename apm-breaking, point to apm-server

* remove data and spec directories, point to apm-server

(cherry picked from commit d4309b5)

# Conflicts:
#	docs/en/apm-server/apm-breaking.asciidoc
#	docs/en/apm-server/data-model.asciidoc
#	docs/en/apm-server/data/elasticsearch/metricset.json
#	docs/en/apm-server/release-notes.asciidoc

* fix conflicts

* fix build errors (hopefully)

* whoops

* fix more errors

---------

Co-authored-by: Colleen McGinnis <colleen.mcginnis@elastic.co>
colleenmcginnis added a commit that referenced this pull request Jan 2, 2024
* [apm docs consolidation] Clean up  (#3476)

* use tagged regions for release notes

* rename apm-breaking, point to apm-server

* remove data and spec directories, point to apm-server

(cherry picked from commit d4309b5)

# Conflicts:
#	docs/en/apm-server/apm-breaking.asciidoc
#	docs/en/apm-server/data-model.asciidoc
#	docs/en/apm-server/data/elasticsearch/metricset.json
#	docs/en/apm-server/release-notes.asciidoc
#	docs/en/apm-server/spec/rumv3/span.json
#	docs/en/apm-server/spec/rumv3/transaction.json
#	docs/en/apm-server/spec/v2/metadata.json
#	docs/en/apm-server/spec/v2/span.json
#	docs/en/apm-server/spec/v2/transaction.json

* fix conflicts

* fix build errors

* update reference to bundle.js.map file

---------

Co-authored-by: Colleen McGinnis <colleen.mcginnis@elastic.co>
colleenmcginnis added a commit that referenced this pull request Jan 2, 2024
* [apm docs consolidation] Clean up  (#3476)

* use tagged regions for release notes

* rename apm-breaking, point to apm-server

* remove data and spec directories, point to apm-server

(cherry picked from commit d4309b5)

# Conflicts:
#	docs/en/apm-server/apm-breaking.asciidoc
#	docs/en/apm-server/data-model.asciidoc
#	docs/en/apm-server/data/elasticsearch/generated/errors.json
#	docs/en/apm-server/data/elasticsearch/generated/spans.json
#	docs/en/apm-server/data/elasticsearch/generated/transactions.json
#	docs/en/apm-server/data/elasticsearch/metricset.json
#	docs/en/apm-server/release-notes.asciidoc
#	docs/en/apm-server/spec/rumv3/error.json
#	docs/en/apm-server/spec/rumv3/span.json
#	docs/en/apm-server/spec/rumv3/transaction.json
#	docs/en/apm-server/spec/v2/error.json
#	docs/en/apm-server/spec/v2/metadata.json
#	docs/en/apm-server/spec/v2/span.json
#	docs/en/apm-server/spec/v2/transaction.json

* fix conflicts

* fix build errors

* update reference to bundle.js.map file

---------

Co-authored-by: Colleen McGinnis <colleen.mcginnis@elastic.co>
colleenmcginnis added a commit that referenced this pull request Jan 2, 2024
* [apm docs consolidation] Clean up  (#3476)

* use tagged regions for release notes

* rename apm-breaking, point to apm-server

* remove data and spec directories, point to apm-server

(cherry picked from commit d4309b5)

# Conflicts:
#	docs/en/apm-server/apm-breaking.asciidoc
#	docs/en/apm-server/data-model.asciidoc
#	docs/en/apm-server/data/elasticsearch/generated/errors.json
#	docs/en/apm-server/data/elasticsearch/generated/spans.json
#	docs/en/apm-server/data/elasticsearch/generated/transactions.json
#	docs/en/apm-server/data/elasticsearch/metricset.json
#	docs/en/apm-server/release-notes.asciidoc
#	docs/en/apm-server/spec/rumv3/error.json
#	docs/en/apm-server/spec/rumv3/span.json
#	docs/en/apm-server/spec/rumv3/transaction.json
#	docs/en/apm-server/spec/v2/error.json
#	docs/en/apm-server/spec/v2/metadata.json
#	docs/en/apm-server/spec/v2/span.json
#	docs/en/apm-server/spec/v2/transaction.json

* fix conflicts

* fix build errors

* update reference to bundle.js.map file

---------

Co-authored-by: Colleen McGinnis <colleen.mcginnis@elastic.co>
colleenmcginnis added a commit that referenced this pull request Jan 2, 2024
* [apm docs consolidation] Clean up  (#3476)

* use tagged regions for release notes

* rename apm-breaking, point to apm-server

* remove data and spec directories, point to apm-server

(cherry picked from commit d4309b5)

# Conflicts:
#	docs/en/apm-server/apm-breaking.asciidoc
#	docs/en/apm-server/data-model.asciidoc
#	docs/en/apm-server/data/elasticsearch/generated/errors.json
#	docs/en/apm-server/data/elasticsearch/generated/spans.json
#	docs/en/apm-server/data/elasticsearch/generated/transactions.json
#	docs/en/apm-server/data/elasticsearch/metricset.json
#	docs/en/apm-server/release-notes.asciidoc
#	docs/en/apm-server/spec/rumv3/error.json
#	docs/en/apm-server/spec/rumv3/span.json
#	docs/en/apm-server/spec/rumv3/transaction.json
#	docs/en/apm-server/spec/v2/error.json
#	docs/en/apm-server/spec/v2/metadata.json
#	docs/en/apm-server/spec/v2/metricset.json
#	docs/en/apm-server/spec/v2/span.json
#	docs/en/apm-server/spec/v2/transaction.json

* fix conflicts

* fix build errors

* update reference to bundle.js.map file

---------

Co-authored-by: Colleen McGinnis <colleen.mcginnis@elastic.co>
colleenmcginnis added a commit that referenced this pull request Jan 2, 2024
* [apm docs consolidation] Clean up  (#3476)

* use tagged regions for release notes

* rename apm-breaking, point to apm-server

* remove data and spec directories, point to apm-server

(cherry picked from commit d4309b5)

# Conflicts:
#	docs/en/apm-server/apm-breaking.asciidoc
#	docs/en/apm-server/data-model.asciidoc
#	docs/en/apm-server/data/elasticsearch/generated/errors.json
#	docs/en/apm-server/data/elasticsearch/generated/spans.json
#	docs/en/apm-server/data/elasticsearch/generated/transactions.json
#	docs/en/apm-server/data/elasticsearch/metricset.json
#	docs/en/apm-server/release-notes.asciidoc
#	docs/en/apm-server/spec/rumv3/error.json
#	docs/en/apm-server/spec/rumv3/span.json
#	docs/en/apm-server/spec/rumv3/transaction.json
#	docs/en/apm-server/spec/v2/error.json
#	docs/en/apm-server/spec/v2/metadata.json
#	docs/en/apm-server/spec/v2/metricset.json
#	docs/en/apm-server/spec/v2/span.json
#	docs/en/apm-server/spec/v2/transaction.json

* fix conflicts

* fix build errors

* update reference to bundle.js.map file

---------

Co-authored-by: Colleen McGinnis <colleen.mcginnis@elastic.co>
colleenmcginnis added a commit that referenced this pull request Jan 2, 2024
* [apm docs consolidation] Clean up  (#3476)

* use tagged regions for release notes

* rename apm-breaking, point to apm-server

* remove data and spec directories, point to apm-server

(cherry picked from commit d4309b5)

# Conflicts:
#	docs/en/apm-server/apm-breaking.asciidoc
#	docs/en/apm-server/data-model.asciidoc
#	docs/en/apm-server/data/elasticsearch/generated/errors.json
#	docs/en/apm-server/data/elasticsearch/generated/spans.json
#	docs/en/apm-server/data/elasticsearch/generated/transactions.json
#	docs/en/apm-server/data/elasticsearch/metricset.json
#	docs/en/apm-server/release-notes.asciidoc
#	docs/en/apm-server/spec/rumv3/error.json
#	docs/en/apm-server/spec/rumv3/span.json
#	docs/en/apm-server/spec/rumv3/transaction.json
#	docs/en/apm-server/spec/v2/error.json
#	docs/en/apm-server/spec/v2/metadata.json
#	docs/en/apm-server/spec/v2/metricset.json
#	docs/en/apm-server/spec/v2/span.json
#	docs/en/apm-server/spec/v2/transaction.json

* fix conflicts

* fix build errors

* update reference to bundle.js.map file

---------

Co-authored-by: Colleen McGinnis <colleen.mcginnis@elastic.co>
colleenmcginnis added a commit that referenced this pull request Jan 2, 2024
* [apm docs consolidation] Clean up  (#3476)

* use tagged regions for release notes

* rename apm-breaking, point to apm-server

* remove data and spec directories, point to apm-server

(cherry picked from commit d4309b5)

# Conflicts:
#	docs/en/apm-server/apm-breaking.asciidoc
#	docs/en/apm-server/data-model.asciidoc
#	docs/en/apm-server/data/elasticsearch/generated/errors.json
#	docs/en/apm-server/data/elasticsearch/generated/spans.json
#	docs/en/apm-server/data/elasticsearch/generated/transactions.json
#	docs/en/apm-server/data/elasticsearch/metricset.json
#	docs/en/apm-server/release-notes.asciidoc
#	docs/en/apm-server/spec/rumv3/error.json
#	docs/en/apm-server/spec/rumv3/span.json
#	docs/en/apm-server/spec/rumv3/transaction.json
#	docs/en/apm-server/spec/v2/error.json
#	docs/en/apm-server/spec/v2/metadata.json
#	docs/en/apm-server/spec/v2/metricset.json
#	docs/en/apm-server/spec/v2/span.json
#	docs/en/apm-server/spec/v2/transaction.json

* fix conflicts

* fix build errors

* update reference to bundle.js.map file

---------

Co-authored-by: Colleen McGinnis <colleen.mcginnis@elastic.co>
colleenmcginnis added a commit that referenced this pull request Jan 2, 2024
* [apm docs consolidation] Clean up  (#3476)

* use tagged regions for release notes

* rename apm-breaking, point to apm-server

* remove data and spec directories, point to apm-server

(cherry picked from commit d4309b5)

# Conflicts:
#	docs/en/apm-server/apm-breaking.asciidoc
#	docs/en/apm-server/data-model.asciidoc
#	docs/en/apm-server/data/elasticsearch/generated/errors.json
#	docs/en/apm-server/data/elasticsearch/generated/spans.json
#	docs/en/apm-server/data/elasticsearch/generated/transactions.json
#	docs/en/apm-server/data/elasticsearch/metricset.json
#	docs/en/apm-server/release-notes.asciidoc
#	docs/en/apm-server/spec/rumv3/error.json
#	docs/en/apm-server/spec/rumv3/span.json
#	docs/en/apm-server/spec/rumv3/transaction.json
#	docs/en/apm-server/spec/v2/error.json
#	docs/en/apm-server/spec/v2/metadata.json
#	docs/en/apm-server/spec/v2/metricset.json
#	docs/en/apm-server/spec/v2/span.json
#	docs/en/apm-server/spec/v2/transaction.json

* fix conflicts

* fix build errors

* update reference to bundle.js.map file

---------

Co-authored-by: Colleen McGinnis <colleen.mcginnis@elastic.co>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
backport-7.17 Automated backport with mergify backport-8.0 Automated backport with mergify backport-8.1 Automated backport with mergify backport-8.2 Automated backport with mergify backport-8.3 Automated backport with mergify backport-8.4 Automated backport with mergify backport-8.5 Automated backport with mergify backport-8.6 Automated backport with mergify backport-8.7 Automated backport with mergify backport-8.8 Automated backport with mergify backport-8.9 Automated backport with mergify backport-8.10 Automated backport with mergify backport-8.11 Automated backport with mergify backport-8.12 Automated backport with mergify
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants