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

resolve logging auto-generated docs issues #11018

Merged
merged 1 commit into from
Aug 9, 2021
Merged

Conversation

taroface
Copy link
Contributor

@taroface taroface commented Aug 5, 2021

Fixes #10551.

  • Uses remote_include on log-formats.md, pending the fix in util/log,docs/generated: update crdb-v2 example formatting cockroach#68506
  • Removes log-sinks.md because I realized the content in the generated doc is largely redundant with configure-logs.md. I folded some additional information from the generated doc into configure-logs.md.
  • Made some tweaks to configure-logs.md for feature clarity.

@taroface taroface requested a review from thtruo August 5, 2021 20:58
@cockroach-teamcity
Copy link
Member

This change is Reviewable

@github-actions
Copy link

github-actions bot commented Aug 5, 2021

Files changed:

_includes/sidebar-data-v21.1.json
v21.1/configure-logs.md
v21.1/log-formats.md
v21.1/logging-use-cases.md

@taroface
Copy link
Contributor Author

taroface commented Aug 5, 2021

@thtruo This is just some housekeeping for the logging docs, removing some workarounds that were necessary in order to make the generated docs work on the site. Should also prepare us for upcoming logging updates.

@netlify
Copy link

netlify bot commented Aug 5, 2021

✔️ Netlify Preview

🔨 Explore the source changes: d868316

🔍 Inspect the deploy log: https://app.netlify.com/sites/cockroachdb-docs/deploys/610c50f6a8df120008c8b798

😎 Browse the preview: https://deploy-preview-11018--cockroachdb-docs.netlify.app

Copy link
Contributor

@thtruo thtruo left a comment

Choose a reason for hiding this comment

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

Cleanup looks good @taroface ! I also appreciate seeing some language change from passive sentences to active ones!

Reviewed 5 of 5 files at r1, all commit messages.
Reviewable status: :shipit: complete! 0 of 0 LGTMs obtained (waiting on @taroface)

@taroface taroface requested a review from ianjevans August 9, 2021 14:24
craig bot pushed a commit to cockroachdb/cockroach that referenced this pull request Aug 9, 2021
68506: util/log,docs/generated: update crdb-v2 example formatting r=taroface a=taroface

The `crdb-v2` log examples in the autogen docs were not appearing correctly when embedded on the [public docs page](https://www.cockroachlabs.com/docs/v21.1/log-formats.html#examples). As a workaround, that doc is currently using a manually altered copy of the `logformats.md` doc. This change should fix the formatting issues and enable us to embed the generated doc (see: cockroachdb/docs#11018).

Release note: none

68540: backupccl: add option to display descriptor ids to SHOW BACKUP r=rhu713 a=rhu713

Previously there weren't any descriptor ID information displayed by SHOW BACKUP. These IDs provide
useful information during triage and general debugging. To address this, a WITH option debug_ids
was added to populate additional columns in SHOW BACKUP with descriptor IDS of all objects along
with the IDs of its database and parent schema.

Release note (enterprise change): Descriptor IDs of every object are now visible in SHOW BACKUP,
along with the descriptor IDs of the object's database and parent schema. SHOW BACKUP will display
these IDs if the `WITH debug_ids` option is specified.

Co-authored-by: taroface <[email protected]>
Co-authored-by: Rui Hu <[email protected]>
@taroface taroface merged commit 9e446db into master Aug 9, 2021
@taroface taroface deleted the logging-generated branch August 9, 2021 17:47
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.

use remote_include for logsinks.md and logformats.md
4 participants