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

[7.17] [apm docs consolidation] Clean up (backport #3476) #3486

Merged
merged 4 commits into from
Jan 2, 2024

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Dec 21, 2023

This is an automatic backport of pull request #3476 done by Mergify.
Cherry-pick of d4309b5 has failed:

On branch mergify/bp/7.17/pr-3476
Your branch is up to date with 'origin/7.17'.

You are currently cherry-picking commit d4309b55.
  (fix conflicts and run "git cherry-pick --continue")
  (use "git cherry-pick --skip" to skip this patch)
  (use "git cherry-pick --abort" to cancel the cherry-pick operation)

Changes to be committed:
	modified:   docs/en/apm-server/api-error.asciidoc
	modified:   docs/en/apm-server/api-event-example.asciidoc
	modified:   docs/en/apm-server/api-metadata.asciidoc
	modified:   docs/en/apm-server/api-metricset.asciidoc
	modified:   docs/en/apm-server/api-span.asciidoc
	modified:   docs/en/apm-server/api-transaction.asciidoc
	deleted:    docs/en/apm-server/data/elasticsearch/generated/rum_v3_errors.json
	deleted:    docs/en/apm-server/data/elasticsearch/generated/rum_v3_transactions.json
	deleted:    docs/en/apm-server/data/intake-api/generated/events.ndjson
	deleted:    docs/en/apm-server/data/intake-api/generated/rum_v3_events.ndjson
	deleted:    docs/en/apm-server/data/intake-api/generated/sourcemap/bundle.js.map
	modified:   docs/en/apm-server/legacy/metadata-api.asciidoc
	modified:   docs/en/apm-server/legacy/metricset-api.asciidoc
	deleted:    docs/en/apm-server/spec/rumv3/metadata.json
	modified:   docs/en/apm-server/upgrading.asciidoc

Unmerged paths:
  (use "git add/rm <file>..." as appropriate to mark resolution)
	deleted by them: docs/en/apm-server/apm-breaking.asciidoc
	both modified:   docs/en/apm-server/data-model.asciidoc
	deleted by them: docs/en/apm-server/data/elasticsearch/generated/errors.json
	deleted by them: docs/en/apm-server/data/elasticsearch/generated/spans.json
	deleted by them: docs/en/apm-server/data/elasticsearch/generated/transactions.json
	deleted by them: docs/en/apm-server/data/elasticsearch/metricset.json
	both modified:   docs/en/apm-server/release-notes.asciidoc
	deleted by them: docs/en/apm-server/spec/rumv3/error.json
	deleted by them: docs/en/apm-server/spec/rumv3/span.json
	deleted by them: docs/en/apm-server/spec/rumv3/transaction.json
	deleted by them: docs/en/apm-server/spec/v2/error.json
	deleted by them: docs/en/apm-server/spec/v2/metadata.json
	deleted by them: docs/en/apm-server/spec/v2/metricset.json
	deleted by them: docs/en/apm-server/spec/v2/span.json
	deleted by them: docs/en/apm-server/spec/v2/transaction.json

To fix up this pull request, you can check it out locally. See documentation: https://docs.github.com/en/github/collaborating-with-pull-requests/reviewing-changes-in-pull-requests/checking-out-pull-requests-locally


Mergify commands and options

More conditions and actions can be found in the documentation.

You can also trigger Mergify actions by commenting on this pull request:

  • @Mergifyio refresh will re-evaluate the rules
  • @Mergifyio rebase will rebase this PR on its base branch
  • @Mergifyio update will merge the base branch into this PR
  • @Mergifyio backport <destination> will backport this PR on <destination> branch

Additionally, on Mergify dashboard you can:

  • look at your merge queues
  • generate the Mergify configuration with the config editor.

Finally, you can contact us on https://mergify.com

* 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
@mergify mergify bot added backport conflicts There is a conflict in the backported pull request labels Dec 21, 2023
@colleenmcginnis
Copy link
Contributor

Blocked by elastic/apm-server#12259

Copy link
Contributor Author

mergify bot commented Dec 25, 2023

This pull request has not been merged yet. Could you please review and merge it @colleenmcginnis? 🙏

1 similar comment
Copy link
Contributor Author

mergify bot commented Jan 1, 2024

This pull request has not been merged yet. Could you please review and merge it @colleenmcginnis? 🙏

@colleenmcginnis
Copy link
Contributor

@elasticmachine, run elasticsearch-ci/docs

@colleenmcginnis colleenmcginnis merged commit 754f2eb into 7.17 Jan 2, 2024
3 checks passed
@colleenmcginnis colleenmcginnis deleted the mergify/bp/7.17/pr-3476 branch January 2, 2024 23:51
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
backport conflicts There is a conflict in the backported pull request
Projects
None yet
Development

Successfully merging this pull request may close these issues.

1 participant