Skip to content

[docs] Prepare for docs-assembler #125118

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

Merged
merged 6 commits into from
Mar 20, 2025

Conversation

colleenmcginnis
Copy link
Contributor

@colleenmcginnis colleenmcginnis commented Mar 18, 2025

Related to elastic/docs-content#792

Restructure content and create toc.yml files needed by docs-assembler.

Restructured content so all toc.yml can be 2 or fewer levels below the docs/ directory:

  • I got rid of the docs/reference/data-analysis directory and put the subdirectories up a level (docs/reference/data-analysis/aggregationsdocs/reference/aggregations and docs/reference/data-analysis/text-analysisdocs/reference/text-analysis).
  • I got rid of the docs/reference/ingestion-tools directory and put the subdirectories up a level (docs/reference/ingestion-tools/enrich-processordocs/reference/enrich-processor and docs/reference/ingestion-tools/search-connectorsdocs/reference/search-connectors).

Because of how we need to distribute files throughout the new IA, I think we need to create 9 unique toc.yml files:

  • docs/reference/aggregations/toc.yml
    • After moving all the content that lived at docs/reference/data-analysis/aggregations/* to docs/reference/aggregations/*, I added a toc.yml file that contains just the pages related to aggregations to be inserted into the Data analysis section of the overall IA.
  • docs/reference/community-contributed/toc.yml
    • I moved docs/reference/community-contributed.md to docs/reference/community-contributed/index.md so we could also add a toc.yml file with one page to be inserted into the Elasticsearch and index management / Clients section of the overall IA.
  • docs/reference/elasticsearch/toc.yml
    • I created a new toc.yml that contains just the pages that belong at the top level of the Elasticsearch and index management section in the overall IA.
  • docs/reference/elasticsearch-plugins/toc.yml
    • I created a new toc.yml that contains just the pages that belong in the Elasticsearch plugins section in the overall IA.
  • docs/reference/enrich-processor/toc.yml
    • After moving all the content that lived at docs/reference/ingestion-docs/enrich-processor/* to docs/reference/enrich-processor/*, I added a toc.yml file that contains just the pages related to enrich processors to be inserted into the Ingestion tools section of the overall IA.
  • docs/reference/query-languages/toc.yml
    • I created a new toc.yml that contains just the pages that belong in the Query languages section in the overall IA.
  • docs/reference/scripting-languages/toc.yml
    • I created a new toc.yml that contains just the pages that belong in the Scripting languages section in the overall IA.
  • docs/reference/search-connectors/toc.yml
    • After moving all the content that lived at docs/reference/ingestion-docs/search-connectors/* to docs/reference/search-connectors/*, I added a toc.yml file that contains just the pages related to search connectors to be inserted into the Ingestion tools section of the overall IA.
  • docs/reference/text-analysis/toc.yml
    • After moving all the content that lived at docs/reference/data-analysis/text-analysis/* to docs/reference/text-analysis/*, I added a toc.yml file that contains just the pages related to text analysis to be inserted into the Data analysis section of the overall IA.

image

cc @Mpdreamz

@colleenmcginnis colleenmcginnis added >docs General docs changes Team:Docs Meta label for docs team documentation labels Mar 18, 2025
@colleenmcginnis colleenmcginnis self-assigned this Mar 18, 2025
@elasticsearchmachine elasticsearchmachine added v9.1.0 external-contributor Pull request authored by a developer outside the Elasticsearch team labels Mar 18, 2025
docs/docset.yml Outdated
Comment on lines 25 to 35
- file: reference/index.md
children:
- toc: reference/elasticsearch
- toc: reference/community-contributed
- toc: reference/enrich-processor
- toc: reference/search-connectors
- toc: reference/elasticsearch-plugins
- toc: reference/query-languages
- toc: reference/scripting-languages
- toc: reference/text-analysis
- toc: reference/aggregations
Copy link
Member

Choose a reason for hiding this comment

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

Suggested change
- file: reference/index.md
children:
- toc: reference/elasticsearch
- toc: reference/community-contributed
- toc: reference/enrich-processor
- toc: reference/search-connectors
- toc: reference/elasticsearch-plugins
- toc: reference/query-languages
- toc: reference/scripting-languages
- toc: reference/text-analysis
- toc: reference/aggregations
- toc: reference

with reference/toc.yml holding:

 children:
    - toc: elasticsearch
    - toc: community-contributed
    - toc: enrich-processor
    - toc: search-connectors
    - toc: elasticsearch-plugins
    - toc: query-languages
    - toc: scripting-languages
    - toc: text-analysis
    - toc: aggregations

Otherwise it will trip the new validations: elastic/docs-builder#767

Copy link
Contributor Author

Choose a reason for hiding this comment

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

I thought toc.yml files couldn't contain toc:s (only docset.yml can use toc:) or does elastic/docs-builder#767 also change that, too?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

I just did this for now 1b4df48.

Copy link
Member

Choose a reason for hiding this comment

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

there is no restriction on files origin, just depth so toc.yml file can hold toc.yml files as long as max_toc_depth is adhered too.

@colleenmcginnis colleenmcginnis changed the title [docs] [work in progress] Prepare for docs-assembler [docs] Prepare for docs-assembler Mar 19, 2025
@colleenmcginnis colleenmcginnis marked this pull request as ready for review March 19, 2025 18:52
@elasticsearchmachine
Copy link
Collaborator

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

@leemthompo
Copy link
Contributor

leemthompo commented Mar 20, 2025

docs/reference/query-languages/toc.yml
I created a new toc.yml that contains just the pages that belong in the Query languages section in the overall IA.

@craigtaverner is this going to impact anything on your side? FYI some paths have been updated for a few esql pages

@leemthompo leemthompo added auto-backport Automatically create backport pull requests when merged v9.0.0 labels Mar 20, 2025
Copy link
Contributor

@leemthompo leemthompo left a comment

Choose a reason for hiding this comment

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

Folder rationalization and link path updates LGTM

@colleenmcginnis colleenmcginnis merged commit 9bcd595 into elastic:main Mar 20, 2025
6 checks passed
@colleenmcginnis colleenmcginnis deleted the docs-assembler-prep branch March 20, 2025 17:09
@leemthompo
Copy link
Contributor

💚 All backports created successfully

Status Branch Result
9.0

Note: Successful backport PRs will be merged automatically after passing CI.

Questions ?

Please refer to the Backport tool documentation

leemthompo pushed a commit to leemthompo/elasticsearch that referenced this pull request Mar 20, 2025
* reorg files for docs-assembler and create toc.yml files

* fix build error, add redirects

* only toc

* move images

(cherry picked from commit 9bcd595)

# Conflicts:
#	docs/reference/aggregations/search-aggregations-pipeline-bucket-script-aggregation.md
#	docs/reference/aggregations/search-aggregations-pipeline-cumulative-cardinality-aggregation.md
#	docs/reference/aggregations/search-aggregations-pipeline-cumulative-sum-aggregation.md
#	docs/reference/aggregations/search-aggregations-pipeline-derivative-aggregation.md
#	docs/reference/aggregations/search-aggregations-pipeline-extended-stats-bucket-aggregation.md
#	docs/reference/aggregations/search-aggregations-pipeline-max-bucket-aggregation.md
#	docs/reference/aggregations/search-aggregations-pipeline-min-bucket-aggregation.md
#	docs/reference/aggregations/search-aggregations-pipeline-percentiles-bucket-aggregation.md
#	docs/reference/aggregations/search-aggregations-pipeline-stats-bucket-aggregation.md
#	docs/reference/aggregations/search-aggregations-pipeline-sum-bucket-aggregation.md
#	docs/reference/query-languages/esql/esql-commands.md
#	docs/reference/query-languages/esql/esql-lookup-join.md
#	docs/reference/query-languages/esql/esql-process-data-with-dissect-grok.md
#	docs/reference/query-languages/images/esql-lookup-join.png
#	docs/reference/query-languages/toc.yml
#	docs/reference/search-connectors/es-connectors-run-from-docker.md
#	docs/reference/text-analysis/analysis-apostrophe-tokenfilter.md
#	docs/reference/toc.yml
leemthompo added a commit that referenced this pull request Mar 20, 2025
* [docs] Prepare for docs-assembler (#125118)

* reorg files for docs-assembler and create toc.yml files

* fix build error, add redirects

* only toc

* move images

(cherry picked from commit 9bcd595)

# Conflicts:
#	docs/reference/aggregations/search-aggregations-pipeline-bucket-script-aggregation.md
#	docs/reference/aggregations/search-aggregations-pipeline-cumulative-cardinality-aggregation.md
#	docs/reference/aggregations/search-aggregations-pipeline-cumulative-sum-aggregation.md
#	docs/reference/aggregations/search-aggregations-pipeline-derivative-aggregation.md
#	docs/reference/aggregations/search-aggregations-pipeline-extended-stats-bucket-aggregation.md
#	docs/reference/aggregations/search-aggregations-pipeline-max-bucket-aggregation.md
#	docs/reference/aggregations/search-aggregations-pipeline-min-bucket-aggregation.md
#	docs/reference/aggregations/search-aggregations-pipeline-percentiles-bucket-aggregation.md
#	docs/reference/aggregations/search-aggregations-pipeline-stats-bucket-aggregation.md
#	docs/reference/aggregations/search-aggregations-pipeline-sum-bucket-aggregation.md
#	docs/reference/query-languages/esql/esql-commands.md
#	docs/reference/query-languages/esql/esql-lookup-join.md
#	docs/reference/query-languages/esql/esql-process-data-with-dissect-grok.md
#	docs/reference/query-languages/images/esql-lookup-join.png
#	docs/reference/query-languages/toc.yml
#	docs/reference/search-connectors/es-connectors-run-from-docker.md
#	docs/reference/text-analysis/analysis-apostrophe-tokenfilter.md
#	docs/reference/toc.yml

* remove markers

---------

Co-authored-by: Colleen McGinnis <colleen.mcginnis@elastic.co>
afoucret pushed a commit to afoucret/elasticsearch that referenced this pull request Mar 21, 2025
* reorg files for docs-assembler and create toc.yml files

* fix build error, add redirects

* only toc

* move images
smalyshev pushed a commit to smalyshev/elasticsearch that referenced this pull request Mar 21, 2025
* reorg files for docs-assembler and create toc.yml files

* fix build error, add redirects

* only toc

* move images
colleenmcginnis added a commit to elastic/docs-content that referenced this pull request Mar 26, 2025
omricohenn pushed a commit to omricohenn/elasticsearch that referenced this pull request Mar 28, 2025
* reorg files for docs-assembler and create toc.yml files

* fix build error, add redirects

* only toc

* move images
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
auto-backport Automatically create backport pull requests when merged >docs General docs changes documentation external-contributor Pull request authored by a developer outside the Elasticsearch team Team:Docs Meta label for docs team v9.0.0 v9.1.0
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants