Skip to content

DOC-17061: Replace remote_include with vendored includes#23297

Open
ebembi-crdb wants to merge 4 commits into
mainfrom
replace-remote-includes
Open

DOC-17061: Replace remote_include with vendored includes#23297
ebembi-crdb wants to merge 4 commits into
mainfrom
replace-remote-includes

Conversation

@ebembi-crdb
Copy link
Copy Markdown
Contributor

Summary

  • Vendors 88 machine-generated doc files from cockroachdb/cockroach into _includes/cockroach-generated/
  • Updates 55 versioned pages to use local {% include %} instead of {% remote_include %} directives
  • Eliminates runtime dependencies on raw.githubusercontent.com for generated reference docs (cluster settings, event log, functions and operators, log formats, logging)

This is PR 7 of 10 splitting #23256 into reviewable chunks.

Jira: DOC-17061

Test plan

  • Verify {% include cockroach-generated/... %} renders the same content as the old {% remote_include %} calls
  • Run local Jekyll build and check cluster-settings, eventlog, functions-and-operators, log-formats, and logging pages across all versions
  • Confirm no remaining remote_include references to cockroachdb/cockroach

🤖 Generated with Claude Code

@netlify
Copy link
Copy Markdown

netlify Bot commented May 12, 2026

Deploy Preview for cockroachdb-api-docs canceled.

Name Link
🔨 Latest commit 466119f
🔍 Latest deploy log https://app.netlify.com/projects/cockroachdb-api-docs/deploys/6a1d486ad176940008e6a6c3

@netlify
Copy link
Copy Markdown

netlify Bot commented May 12, 2026

Deploy Preview for cockroachdb-interactivetutorials-docs canceled.

Name Link
🔨 Latest commit 466119f
🔍 Latest deploy log https://app.netlify.com/projects/cockroachdb-interactivetutorials-docs/deploys/6a1d486a39eb02000837f92a

@github-actions
Copy link
Copy Markdown

github-actions Bot commented May 12, 2026

Files changed:

  • .github/scripts/vendor_cockroach_docs.sh
  • src/current/_includes/cockroach-generated/release-23.1/eventlog.md
  • src/current/_includes/cockroach-generated/release-23.1/logformats.md
  • src/current/_includes/cockroach-generated/release-23.1/logging.md
  • src/current/_includes/cockroach-generated/release-23.1/settings/settings.html
  • src/current/_includes/cockroach-generated/release-23.1/sql/aggregates.md
  • src/current/_includes/cockroach-generated/release-23.1/sql/functions.md
  • src/current/_includes/cockroach-generated/release-23.1/sql/operators.md
  • src/current/_includes/cockroach-generated/release-23.1/sql/window_functions.md
  • src/current/_includes/cockroach-generated/release-23.2/eventlog.md
  • src/current/_includes/cockroach-generated/release-23.2/logformats.md
  • src/current/_includes/cockroach-generated/release-23.2/logging.md
  • src/current/_includes/cockroach-generated/release-23.2/settings/settings.html
  • src/current/_includes/cockroach-generated/release-23.2/sql/aggregates.md
  • src/current/_includes/cockroach-generated/release-23.2/sql/functions.md
  • src/current/_includes/cockroach-generated/release-23.2/sql/operators.md
  • src/current/_includes/cockroach-generated/release-23.2/sql/window_functions.md
  • src/current/_includes/cockroach-generated/release-24.1/eventlog.md
  • src/current/_includes/cockroach-generated/release-24.1/logformats.md
  • src/current/_includes/cockroach-generated/release-24.1/logging.md
  • src/current/_includes/cockroach-generated/release-24.1/settings/settings.html
  • src/current/_includes/cockroach-generated/release-24.1/sql/aggregates.md
  • src/current/_includes/cockroach-generated/release-24.1/sql/functions.md
  • src/current/_includes/cockroach-generated/release-24.1/sql/operators.md
  • src/current/_includes/cockroach-generated/release-24.1/sql/window_functions.md
  • src/current/_includes/cockroach-generated/release-24.2/eventlog.md
  • src/current/_includes/cockroach-generated/release-24.2/logformats.md
  • src/current/_includes/cockroach-generated/release-24.2/logging.md
  • src/current/_includes/cockroach-generated/release-24.2/settings/settings.html
  • src/current/_includes/cockroach-generated/release-24.2/sql/aggregates.md
  • src/current/_includes/cockroach-generated/release-24.2/sql/functions.md
  • src/current/_includes/cockroach-generated/release-24.2/sql/operators.md
  • src/current/_includes/cockroach-generated/release-24.2/sql/window_functions.md
  • src/current/_includes/cockroach-generated/release-24.3/eventlog.md
  • src/current/_includes/cockroach-generated/release-24.3/logformats.md
  • src/current/_includes/cockroach-generated/release-24.3/logging.md
  • src/current/_includes/cockroach-generated/release-24.3/settings/settings.html
  • src/current/_includes/cockroach-generated/release-24.3/sql/aggregates.md
  • src/current/_includes/cockroach-generated/release-24.3/sql/functions.md
  • src/current/_includes/cockroach-generated/release-24.3/sql/operators.md
  • src/current/_includes/cockroach-generated/release-24.3/sql/window_functions.md
  • src/current/_includes/cockroach-generated/release-25.1/eventlog.md
  • src/current/_includes/cockroach-generated/release-25.1/logformats.md
  • src/current/_includes/cockroach-generated/release-25.1/logging.md
  • src/current/_includes/cockroach-generated/release-25.1/settings/settings.html
  • src/current/_includes/cockroach-generated/release-25.1/sql/aggregates.md
  • src/current/_includes/cockroach-generated/release-25.1/sql/functions.md
  • src/current/_includes/cockroach-generated/release-25.1/sql/operators.md
  • src/current/_includes/cockroach-generated/release-25.1/sql/window_functions.md
  • src/current/_includes/cockroach-generated/release-25.2/eventlog.md
  • src/current/_includes/cockroach-generated/release-25.2/logformats.md
  • src/current/_includes/cockroach-generated/release-25.2/logging.md
  • src/current/_includes/cockroach-generated/release-25.2/settings/settings.html
  • src/current/_includes/cockroach-generated/release-25.2/sql/aggregates.md
  • src/current/_includes/cockroach-generated/release-25.2/sql/functions.md
  • src/current/_includes/cockroach-generated/release-25.2/sql/operators.md
  • src/current/_includes/cockroach-generated/release-25.2/sql/window_functions.md
  • src/current/_includes/cockroach-generated/release-25.3/eventlog.md
  • src/current/_includes/cockroach-generated/release-25.3/logformats.md
  • src/current/_includes/cockroach-generated/release-25.3/logging.md
  • src/current/_includes/cockroach-generated/release-25.3/settings/settings.html
  • src/current/_includes/cockroach-generated/release-25.3/sql/aggregates.md
  • src/current/_includes/cockroach-generated/release-25.3/sql/functions.md
  • src/current/_includes/cockroach-generated/release-25.3/sql/operators.md
  • src/current/_includes/cockroach-generated/release-25.3/sql/window_functions.md
  • src/current/_includes/cockroach-generated/release-25.4/eventlog.md
  • src/current/_includes/cockroach-generated/release-25.4/logformats.md
  • src/current/_includes/cockroach-generated/release-25.4/logging.md
  • src/current/_includes/cockroach-generated/release-25.4/settings/settings.html
  • src/current/_includes/cockroach-generated/release-25.4/sql/aggregates.md
  • src/current/_includes/cockroach-generated/release-25.4/sql/functions.md
  • src/current/_includes/cockroach-generated/release-25.4/sql/operators.md
  • src/current/_includes/cockroach-generated/release-25.4/sql/window_functions.md
  • src/current/_includes/cockroach-generated/release-26.1/eventlog.md
  • src/current/_includes/cockroach-generated/release-26.1/logformats.md
  • src/current/_includes/cockroach-generated/release-26.1/logging.md
  • src/current/_includes/cockroach-generated/release-26.1/settings/settings.html
  • src/current/_includes/cockroach-generated/release-26.1/sql/aggregates.md
  • src/current/_includes/cockroach-generated/release-26.1/sql/functions.md
  • src/current/_includes/cockroach-generated/release-26.1/sql/operators.md
  • src/current/_includes/cockroach-generated/release-26.1/sql/window_functions.md
  • src/current/_includes/cockroach-generated/release-26.2/eventlog.md
  • src/current/_includes/cockroach-generated/release-26.2/logformats.md
  • src/current/_includes/cockroach-generated/release-26.2/logging.md
  • src/current/_includes/cockroach-generated/release-26.2/settings/settings.html
  • src/current/_includes/cockroach-generated/release-26.2/sql/aggregates.md
  • src/current/_includes/cockroach-generated/release-26.2/sql/functions.md
  • src/current/_includes/cockroach-generated/release-26.2/sql/operators.md
  • src/current/_includes/cockroach-generated/release-26.2/sql/session_vars_table.html
  • src/current/_includes/cockroach-generated/release-26.2/sql/window_functions.md
  • src/current/_includes/cockroach-generated/release-26.3/eventlog.md
  • src/current/_includes/cockroach-generated/release-26.3/logformats.md
  • src/current/_includes/cockroach-generated/release-26.3/logging.md
  • src/current/_includes/cockroach-generated/release-26.3/settings/settings.html
  • src/current/_includes/cockroach-generated/release-26.3/sql/aggregates.md
  • src/current/_includes/cockroach-generated/release-26.3/sql/functions.md
  • src/current/_includes/cockroach-generated/release-26.3/sql/operators.md
  • src/current/_includes/cockroach-generated/release-26.3/sql/session_vars_table.html
  • src/current/_includes/cockroach-generated/release-26.3/sql/window_functions.md
  • src/current/_includes/v20.2/misc/tooling.md:
    • Warning: include not used in any v20.2 file or include

@netlify
Copy link
Copy Markdown

netlify Bot commented May 12, 2026

Netlify Preview

Name Link
🔨 Latest commit 466119f
🔍 Latest deploy log https://app.netlify.com/projects/cockroachdb-docs/deploys/6a1d486ae4c4890008bc4bcf
😎 Deploy Preview https://deploy-preview-23297--cockroachdb-docs.netlify.app
📱 Preview on mobile
Toggle QR Code...

QR Code

Use your smartphone camera to open QR code link.

To edit notification comments on pull requests, go to your Netlify project configuration.

Copy link
Copy Markdown
Contributor

@rmloveland rmloveland left a comment

Choose a reason for hiding this comment

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

@ebembi-crdb thank you for putting this together! wanted to drop some high level comments based on a quick glance with codex in a local worktree before the Docs Weekly meeting tomorrow where we will discuss this work further:

  • this does not remove all remote_include tags, it leaves a bunch in e.g. _includes/v26.2/misc/tooling.md (to see the remaining uses of remote_include run rg -n 'remote_include https://raw\.githubusercontent\.com/cockroachdb/cockroach' src/current)
  • this appears to be a one-time copying of files, but there is no tooling added to automate this process. any PR we merge needs to at least reference how we plan to use scripts/tools to automate this process, even if those tools actually live elsewhere (eg in CI/GH actions, and not the docs repo itself)

obv these can be fixed! just adding here for visibility / discussion for meeting tomorrow

@ebembi-crdb ebembi-crdb requested a review from a team as a code owner May 20, 2026 11:09
@rmloveland
Copy link
Copy Markdown
Contributor

@ebembi-crdb can you please rebase this on main to pick up the changes in #23251 ?

that PR also adds a remote_include to pull in a session settings file from the cockroachdb/cockroach repo

once you rebase can you please update this PR to pull in the included session settings file from that PR?

@rmloveland
Copy link
Copy Markdown
Contributor

there are two types of remote_include usages this PR does not address:

  1. SQL syntax diagrams
  2. example app includes

i am going to make separate PRs for those that will re-use the same file pattern you're using here, e.g., src/current/_includes/cockroach-generated/release-26.2/sql-diagrams/select_for_update.html

(and something similar for the example app includes)

also I will do a detailed review of this PR today (2026-05-28)

@@ -5,4 +5,4 @@ toc: true
docs_area: reference.logging
---

{% remote_include https://raw.githubusercontent.com/cockroachdb/cockroach/{{ page.release_info.crdb_branch_name }}/docs/generated/eventlog.md %}
Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

codex tells me these eventlog.md files are now stale vs what is in cockroachdb/cockroach and need to be updated

please update the file with the latest versions

PS we will need to make some tickets in EDUENG queue to update going forward, I am planning to do that once we merge these PRs

@rmloveland
Copy link
Copy Markdown
Contributor

@ebembi-crdb this one is close, please see my other comments re:

  • update eventlog.md with latest from cockroachdb/cockroach
  • fix merge conflict in latest_operator_version.md
  • finally, need to rebase to pick up v26.3 and apply all these changes there

otherwise overall LGTM

on my end i plan to file an issue in EDUENG re: maintaining this sync going forward - if you think the bash script is the way forward, so be it. I'll still file the EDUENG issue tho so we can re-assess and make an official decision

ebembi-crdb and others added 3 commits May 29, 2026 20:44
Vendor 88 machine-generated doc files from cockroachdb/cockroach into
_includes/cockroach-generated/ and update 55 versioned pages to use
local {% include %} instead of {% remote_include %} directives.

This eliminates runtime dependencies on raw.githubusercontent.com for
generated reference docs (cluster settings, event log, functions and
operators, log formats, logging).

Part of DOC-17061.

Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>
Resolve review feedback by replacing all remaining remote_include
references to cockroachdb/cockroach in tooling.md files (v20.2–v26.2)
and latest_operator_version.md with vendored values. Add
vendor_cockroach_docs.sh to automate syncing generated docs and
driver/ORM version strings from the cockroach repo.

Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>
…n vars

- Update stale eventlog.md files for all versions (release-23.1 through
  release-26.2) with latest from cockroachdb/cockroach
- Add vendored includes for v26.3 (generated docs, tooling versions,
  session vars)
- Replace remote_include tags in v26.3 doc pages with local includes
- Vendor session_vars table content for v26.2 and v26.3
- Replace remote_include in v26.2 and v26.3 session-vars.md with
  vendored local include
- Update vendor script to skip operator version (now maintained manually
  per #23393)

Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>
@ebembi-crdb ebembi-crdb force-pushed the replace-remote-includes branch from 824753b to 8e058a5 Compare May 29, 2026 15:22
@ebembi-crdb
Copy link
Copy Markdown
Contributor Author

Changes made to address review feedback

  1. Rebased on main — picked up changes from Use auto-generated session settings from CockroachDB source code #23251 (session settings file) and Add content and paths for v26.3 #23371 (v26.3 setup), resolved merge conflict in latest_operator_version.md (file was removed on main by replace legacy Operator version remote include with manual version nu… #23393, accepted deletion).

  2. Updated stale eventlog.md files — re-fetched latest versions from cockroachdb/cockroach for all 11 release branches (release-23.1 through release-26.2).

  3. Added v26.3 vendored includes:

    • Created cockroach-generated/release-26.3/ with all 8 generated doc files (copied from release-26.2 since v26.3 maps to release-26.2 branch per versions.csv)
    • Replaced all remote_include tags in v26.3 doc pages (eventlog.md, functions-and-operators.md, logging.md, log-formats.md, cluster-settings.md) with local {% include %} tags
    • Copied resolved tooling.md from v26.2 to v26.3
  4. Vendored session vars — extracted <table> content from session_vars.md for both release-26.2 and release-26.3, saved as session_vars_table.html, and updated session-vars.md to use local includes.

  5. Updated vendor script — removed update_operator_version() logic since the operator version is now maintained manually (per replace legacy Operator version remote include with manual version nu… #23393).

Verification

Ready for re-review @rmloveland.

Copy link
Copy Markdown
Contributor

@rmloveland rmloveland left a comment

Choose a reason for hiding this comment

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

thanks Eeshan, LGTM! please merge at will / ASAP

@ebembi-crdb ebembi-crdb enabled auto-merge (squash) June 1, 2026 08:53
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants