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

[DOCS] Move x-pack docs to docs/reference dir #99209

Merged
merged 5 commits into from
Sep 12, 2023
Merged

[DOCS] Move x-pack docs to docs/reference dir #99209

merged 5 commits into from
Sep 12, 2023

Conversation

jrodewig
Copy link
Contributor

@jrodewig jrodewig commented Sep 5, 2023

Problem:
For historical reasons, source files for the Elasticsearch Guide's security, watcher, and Logstash API docs are housed in the x-pack/docs directory. This can confuse new contributors who expect Elasticsearch Guide docs to be located in docs/reference.

Solution:

  • Move the security, watcher, and Logstash API doc source files to the docs/reference directory
  • Update doc snippet tests to use security

Rel: https://github.com/elastic/platform-docs-team/issues/208

Notes for reviewers
I recommend reviewing this PR by commit.

This PR doesn't change any URLs. No redirects are needed.

I left the x-pack/docs directory with related build.gradle files in for now. This directory is currently required for the docs build. I'll remove the x-pack/docs directory after I merge this PR and update the docs build config.

@github-actions
Copy link
Contributor

github-actions bot commented Sep 5, 2023

Documentation preview:

@jrodewig jrodewig changed the title [DOCS] Move x-pack docs into reference docs [DOCS] Move x-pack docs into reference dir Sep 6, 2023
@jrodewig jrodewig changed the title [DOCS] Move x-pack docs into reference dir [DOCS] Move x-pack docs to docs/reference dir Sep 6, 2023
@jrodewig jrodewig added :Delivery/Build Build or test infrastructure Team:Docs Meta label for docs team Team:Delivery Meta label for Delivery team v8.10.1 v8.9.3 :Security/Security Security issues without another label :Data Management/Watcher labels Sep 7, 2023
@jrodewig jrodewig marked this pull request as ready for review September 7, 2023 13:56
@jrodewig jrodewig requested review from a team September 7, 2023 13:56
@elasticsearchmachine elasticsearchmachine added Team:Data Management Meta label for data/management team Team:Security Meta label for security team and removed Team:Docs Meta label for docs team labels Sep 7, 2023
@elasticsearchmachine
Copy link
Collaborator

Pinging @elastic/es-security (Team:Security)

@elasticsearchmachine
Copy link
Collaborator

Pinging @elastic/es-delivery (Team:Delivery)

@elasticsearchmachine
Copy link
Collaborator

Pinging @elastic/es-data-management (Team:Data Management)

Copy link
Contributor Author

@jrodewig jrodewig Sep 7, 2023

Choose a reason for hiding this comment

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

Copy link
Contributor Author

Choose a reason for hiding this comment

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

@jrodewig jrodewig added >docs General docs changes >test Issues or PRs that are addressing/adding tests labels Sep 7, 2023
@elasticsearchmachine
Copy link
Collaborator

Pinging @elastic/es-docs (Team:Docs)

@elasticsearchmachine elasticsearchmachine added the Team:Docs Meta label for docs team label Sep 7, 2023
Copy link
Contributor

@abdonpijpelink abdonpijpelink left a comment

Choose a reason for hiding this comment

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

I can't comment on the Gradle changes, but the docs render correctly, and docs snippet tests run successfully, so LGTM

@jrodewig
Copy link
Contributor Author

jrodewig commented Sep 8, 2023

Thanks @abdonpijpelink.

I can't comment on the Gradle changes

This isn't urgent (largely an ergonomics change) so I'll wait on a 👍 from @elastic/es-delivery before merging.

Comment on lines +27 to +29
// These files simply don't pass yet. We should figure out how to fix them.
exclude 'reference/watcher/reference/actions.asciidoc'
exclude 'reference/rest-api/security/ssl.asciidoc'
Copy link
Contributor Author

Choose a reason for hiding this comment

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

'en/watcher/example-watches/watching-time-series-data.asciidoc',
]
}
// tasks.named("buildRestTests").configure {
Copy link
Contributor

Choose a reason for hiding this comment

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

Should we remove this? in fact, can we remove the entire x-pack/docs project?

Copy link
Contributor Author

@jrodewig jrodewig Sep 12, 2023

Choose a reason for hiding this comment

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

Sorry — I left some sentences about this in the top-level comment, but I should have left one here as well.

The x-pack/docs directory is currently required for the docs build. I left these files here so that we don't break the build. I'll remove the x-pack/docs directory and these files after I merge this PR and update the docs build config. I already have related PRs drafted:

If wanted, I can update this PR to replace the files in the x-pack/docs directory with a placeholder txt file. The docs build only needs the directory to exist — even if it doesn't pull anything from it.

Copy link
Contributor

Choose a reason for hiding this comment

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

👍

@jrodewig jrodewig removed the v8.9.3 label Sep 12, 2023
@jrodewig jrodewig merged commit 255c9a7 into elastic:main Sep 12, 2023
@jrodewig jrodewig deleted the move-x-pack-docs branch September 12, 2023 18:53
@jrodewig
Copy link
Contributor Author

💚 All backports created successfully

Status Branch Result
8.10

Questions ?

Please refer to the Backport tool documentation

jrodewig added a commit to elastic/docs that referenced this pull request Sep 13, 2023
**Problem:** With elastic/elasticsearch#99209, the elasticsearch repo's `x-pack/docs` directory no longer contains docs for the Elasticsearch Guide in 8.10+. However, the docs build config still lists the `x-pack/docs` directory as a dependency.

**Solution:** Update the docs build config to remove the `x-pack/docs` dependency for the Elasticsearch Guide in 8.10+.

Depends on elastic/elasticsearch#99209
Rel: https://github.com/elastic/platform-docs-team/issues/208
jrodewig added a commit that referenced this pull request Sep 13, 2023
**Problem:** With #99209, the elasticsearch repo's `x-pack/docs` directory no longer contains docs for the Elasticsearch Guide in 8.10+.

The `gradle.build` files in the directory were only left in so that the docs build doesn't break. That's been fixed with elastic/docs#2753.

**Solution:** Removes the `x-pack/docs` directory.

Depends on #99209, elastic/docs#2753
Closes: https://github.com/elastic/platform-docs-team/issues/208
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
:Data Management/Watcher :Delivery/Build Build or test infrastructure >docs General docs changes :Security/Security Security issues without another label Team:Data Management Meta label for data/management team Team:Delivery Meta label for Delivery team Team:Docs Meta label for docs team Team:Security Meta label for security team >test Issues or PRs that are addressing/adding tests v8.10.1 v8.11.0
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants