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

Asciidoctor migration #12006

Merged
merged 3 commits into from
May 2, 2019
Merged

Conversation

dedemorton
Copy link
Contributor

First pass - removes complex conditionals, but there are still many errors when I build this (and it looks like a lot of the errors are caused by asciidoc files that we generate).

@dedemorton dedemorton added docs in progress Pull request is currently in progress. labels May 1, 2019
@dedemorton dedemorton requested a review from nik9000 May 1, 2019 01:24
@nik9000
Copy link
Member

nik9000 commented May 1, 2019 via email

@dedemorton
Copy link
Contributor Author

Incidentally, if you find out that the problems are caused by the formatting that we use in the "Exported fields" topic...we would like to change the layout anyhow (could be a win-win). Here's what I've proposed: #9519 (POC is here: https://github.com/dedemorton/beats-docs-review/pull/2/files). We should figure out what they've done with ECS and build on that. Eventually we want to pull a lot of the descriptions from the ECS docs, but not sure we want to get all those things figured out before we migrate to asciidoctor. Just an FYI....

Copy link
Member

@nik9000 nik9000 left a comment

Choose a reason for hiding this comment

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

I think I found two things to change. I'm not totally sure though.

journalbeat/docs/index.asciidoc Show resolved Hide resolved
libbeat/docs/command-reference.asciidoc Outdated Show resolved Hide resolved
Copy link
Member

@nik9000 nik9000 left a comment

Choose a reason for hiding this comment

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

❤️

@dedemorton dedemorton marked this pull request as ready for review May 2, 2019 22:14
@dedemorton dedemorton requested a review from a team as a code owner May 2, 2019 22:14
Copy link
Member

@nik9000 nik9000 left a comment

Choose a reason for hiding this comment

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

LGTM

@dedemorton dedemorton merged commit 00ba9e2 into elastic:master May 2, 2019
@dedemorton dedemorton deleted the asciidoctor_migration branch May 2, 2019 23:45
@dedemorton dedemorton added the needs_backport PR is waiting to be backported to other branches. label May 8, 2019
DStape pushed a commit to DStape/beats that referenced this pull request Aug 20, 2019
* Change tagging to work with asciidoctor

* Fix formatting issues

* Changes from review
dedemorton added a commit to dedemorton/beats that referenced this pull request Aug 31, 2019
* Change tagging to work with asciidoctor

* Fix formatting issues

* Changes from review
dedemorton added a commit that referenced this pull request Sep 4, 2019
* Asciidoctor migration (#12006)

* Change tagging to work with asciidoctor

* Fix formatting issues

* Changes from review

* [DOCS] More fixes for asciidoctor migration (#12434)

* [DOCS] More fixes for asciidoctor migration

* Simplify logic for adding delimiter blocks

* Rebase and run make update

* Revert incorrect fix

* Update script to fix broken list format

* Fix script to pass autopep8 test
dedemorton added a commit to dedemorton/beats that referenced this pull request Sep 5, 2019
* Asciidoctor migration (elastic#12006)

* Change tagging to work with asciidoctor

* Fix formatting issues

* Changes from review

* [DOCS] More fixes for asciidoctor migration (elastic#12434)

* [DOCS] More fixes for asciidoctor migration

* Simplify logic for adding delimiter blocks

* Rebase and run make update

* Revert incorrect fix

* Update script to fix broken list format

* Fix script to pass autopep8 test
dedemorton added a commit that referenced this pull request Sep 5, 2019
* [7.1][DOCS] Backport: Fix asciidoctor build (#13460)

* Asciidoctor migration (#12006)

* Change tagging to work with asciidoctor

* Fix formatting issues

* Changes from review

* [DOCS] More fixes for asciidoctor migration (#12434)

* [DOCS] More fixes for asciidoctor migration

* Simplify logic for adding delimiter blocks

* Rebase and run make update

* Revert incorrect fix

* Update script to fix broken list format

* Fix script to pass autopep8 test

* Run make update

* Fix code formatting

* Remove attributes not used in this branch

* Remove unwanted section added during backport

* Revert to 6.8 version of journalbeat example
@dedemorton dedemorton removed the needs_backport PR is waiting to be backported to other branches. label Sep 11, 2019
leweafan pushed a commit to leweafan/beats that referenced this pull request Apr 28, 2023
* Asciidoctor migration (elastic#12006)

* Change tagging to work with asciidoctor

* Fix formatting issues

* Changes from review

* [DOCS] More fixes for asciidoctor migration (elastic#12434)

* [DOCS] More fixes for asciidoctor migration

* Simplify logic for adding delimiter blocks

* Rebase and run make update

* Revert incorrect fix

* Update script to fix broken list format

* Fix script to pass autopep8 test
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
docs in progress Pull request is currently in progress.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants