Skip to content

tidb-monitoring-framework: add TiDB Dashboard (#20776) #20789

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

Conversation

ti-chi-bot
Copy link
Member

This is an automated cherry-pick of #20776

First-time contributors' checklist

What is changed, added or deleted? (Required)

close pingcap/docs-cn#20206

Which TiDB version(s) do your changes apply to? (Required)

Tips for choosing the affected version(s):

By default, CHOOSE MASTER ONLY so your changes will be applied to the next TiDB major or minor releases. If your PR involves a product feature behavior change or a compatibility change, CHOOSE THE AFFECTED RELEASE BRANCH(ES) AND MASTER.

For details, see tips for choosing the affected versions (in Chinese).

  • master (the latest development version)
  • v9.0 (TiDB 9.0 versions)
  • v8.5 (TiDB 8.5 versions)
  • v8.4 (TiDB 8.4 versions)
  • v8.3 (TiDB 8.3 versions)
  • v8.1 (TiDB 8.1 versions)
  • v7.5 (TiDB 7.5 versions)
  • v7.1 (TiDB 7.1 versions)
  • v6.5 (TiDB 6.5 versions)
  • v6.1 (TiDB 6.1 versions)
  • v5.4 (TiDB 5.4 versions)

What is the related PR or file link(s)?

Do your changes match any of the following descriptions?

  • Delete files
  • Change aliases
  • Need modification after applied to another branch
  • Might cause conflicts after applied to another branch

@ti-chi-bot ti-chi-bot added area/diagnosis Indicates that the Issue or PR belongs to the area of diagnosis and monitoring. do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. lgtm needs-1-more-lgtm Indicates a PR needs 1 more LGTM. ONCALL Relates to documentation oncall. size/M Denotes a PR that changes 30-99 lines, ignoring generated files. type/cherry-pick-for-release-8.5 This PR is cherry-picked to release-8.5 from a source PR. type/enhancement The issue or PR belongs to an enhancement. labels Apr 17, 2025
@ti-chi-bot
Copy link
Member Author

@Oreoxmt This PR has conflicts, I have hold it.
Please resolve them or ask others to resolve them, then comment /unhold to remove the hold label.

Copy link

@gemini-code-assist gemini-code-assist bot left a comment

Choose a reason for hiding this comment

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

Hello @ti-chi-bot, I'm Gemini Code Assist1! I'm currently reviewing this pull request and will post my feedback shortly. In the meantime, here's a summary to help you and other reviewers quickly get up to speed!

Summary of Changes

This pull request integrates TiDB Dashboard into the TiDB monitoring framework documentation. The changes involve updating the table of contents (TOC) to include TiDB Dashboard and its related sub-pages, modifying the index page to reflect the inclusion of TiDB Dashboard in the monitoring setup, and adding a note about TiDB Dashboard's deployment within the deploy-monitoring-services.md file. Additionally, the tidb-monitoring-framework.md file is updated to include TiDB Dashboard as part of the monitoring framework overview.

Highlights

  • TOC Update: The table of contents is updated to include TiDB Dashboard and its sub-pages, providing a structured navigation for users to access documentation related to TiDB Dashboard features and functionalities.
  • Index Page Modification: The index page is modified to reflect the inclusion of TiDB Dashboard alongside Prometheus and Grafana in the monitoring setup, guiding users to the relevant documentation.
  • Deployment Note: A note is added to deploy-monitoring-services.md clarifying that TiDB Dashboard is built into the PD component and does not require separate deployment, simplifying the deployment process for users.
  • Framework Overview Update: The tidb-monitoring-framework.md file is updated to include TiDB Dashboard as an integral part of the monitoring framework, providing users with a comprehensive overview of the monitoring tools available.

Changelog

  • TOC.md
    • Added TiDB Dashboard section with links to its sub-pages.
    • Removed duplicate TiDB Dashboard section under UI.
  • _index.md
    • Updated the monitoring learning path to include TiDB Dashboard.
  • deploy-monitoring-services.md
    • Added a note indicating that TiDB Dashboard is built into the PD component and does not require independent deployment.
  • tidb-monitoring-framework.md
    • Updated the summary to include TiDB Dashboard.
    • Added a section introducing TiDB Dashboard as part of the monitoring framework.
Using Gemini Code Assist

The full guide for Gemini Code Assist can be found on our documentation page, here are some quick tips.

Invoking Gemini

You can request assistance from Gemini at any point in your pull request via creating an issue comment (i.e. comment on the pull request page) using either /gemini <command> or @gemini-code-assist <command>. Below is a summary of the supported commands.

Feature Command Description
Code Review /gemini review Performs a code review for the current pull request in its current state.
Pull Request Summary /gemini summary Provides a summary of the current pull request in its current state.
Comment @gemini-code-assist Responds in comments when explicitly tagged, both in issue comments and review comments.
Help /gemini help Displays a list of available commands.

Customization

To customize Gemini Code Assist for GitHub experience, repository maintainers can create a configuration file and/or provide a custom code review style guide (such as PEP-8 for Python) by creating and adding files to a .gemini/ folder in the base of the repository. Detailed instructions can be found here.

Limitations & Feedback

Gemini Code Assist is currently in preview and may make mistakes. Please leave feedback on any instances where its feedback is incorrect or counter productive. You can react with 👍 and 👎 on @gemini-code-assist comments to provide feedback.

You can also get AI-powered code generation, chat, as well as code reviews directly in the IDE at no cost with the Gemini Code Assist IDE Extension.


A dashboard's clear view,
Insights into what's askew,
Metrics align,
Problems decline,
Systems hum, fresh and new.

Footnotes

  1. Review the Privacy Notices, Generative AI Prohibited Use Policy, Terms of Service, and learn how to configure Gemini Code Assist in GitHub here. Gemini can make mistakes, so double check it and use code with caution.

Copy link

@gemini-code-assist gemini-code-assist bot left a comment

Choose a reason for hiding this comment

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

Code Review

This pull request introduces TiDB Dashboard to the monitoring framework documentation. The changes involve updating the table of contents, modifying the index page, and adding information about TiDB Dashboard to the monitoring framework overview and deployment documentation. The changes look good overall, but there are a few issues that should be addressed before merging.

Summary of Findings

  • Inconsistent version references: The _index.md file contains a mix of version references (v8.5 and dev). It's better to keep these consistent to avoid confusion. I did not add a review comment for this due to the review settings.
  • Typos in alert descriptions: The alert-rules.md file contains a few typos, such as "that the command executes" and "retry times is over". I did not add review comments for these due to the review settings.
  • Inconsistent linking in deploy-monitoring-services.md: The deploy-monitoring-services.md file links to dashboard-intro.md without specifying the dashboard/ directory. I did not add a review comment for this due to the review settings.
  • Duplicated TiDB Dashboard entries in TOC.md: The TOC.md file initially adds TiDB Dashboard entries and then removes a duplicated section later on. This could be simplified. I did not add a review comment for this due to the review settings.
  • Inconsistent summary in tidb-monitoring-framework.md: The tidb-monitoring-framework.md file has conflicting summaries due to merge conflicts. This should be resolved. I did not add a review comment for this due to the review settings.

Merge Readiness

The pull request introduces TiDB Dashboard to the monitoring framework documentation. While the changes are generally good, there are a few issues that need to be addressed before merging, particularly the merge conflicts in _index.md and tidb-monitoring-framework.md. I am unable to approve this pull request, and recommend that another reviewer also reviews this code before merging. I recommend that this pull request not be merged until the merge conflicts and high severity issues are resolved.

_index.md Outdated
Comment on lines 84 to 88
<<<<<<< HEAD
[Use Prometheus and Grafana](https://docs.pingcap.com/tidb/v8.5/tidb-monitoring-framework)
=======
[Use Prometheus, Grafana, and TiDB Dashboard](https://docs.pingcap.com/tidb/dev/tidb-monitoring-framework)
>>>>>>> c98fa53442 (tidb-monitoring-framework: add TiDB Dashboard (#20776))

Choose a reason for hiding this comment

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

high

This looks like a merge conflict that needs to be resolved. Please choose one of the options, or merge them together if appropriate.

Suggested change
<<<<<<< HEAD
[Use Prometheus and Grafana](https://docs.pingcap.com/tidb/v8.5/tidb-monitoring-framework)
=======
[Use Prometheus, Grafana, and TiDB Dashboard](https://docs.pingcap.com/tidb/dev/tidb-monitoring-framework)
>>>>>>> c98fa53442 (tidb-monitoring-framework: add TiDB Dashboard (#20776))
[Use Prometheus, Grafana, and TiDB Dashboard](https://docs.pingcap.com/tidb/dev/tidb-monitoring-framework)

Copy link

ti-chi-bot bot commented Apr 17, 2025

@gemini-code-assist[bot]: adding LGTM is restricted to approvers and reviewers in OWNERS files.

In response to this:

Code Review

This pull request introduces TiDB Dashboard to the monitoring framework documentation. The changes involve updating the table of contents, modifying the index page, and adding information about TiDB Dashboard to the monitoring framework overview and deployment documentation. The changes look good overall, but there are a few issues that should be addressed before merging.

Summary of Findings

  • Inconsistent version references: The _index.md file contains a mix of version references (v8.5 and dev). It's better to keep these consistent to avoid confusion. I did not add a review comment for this due to the review settings.
  • Typos in alert descriptions: The alert-rules.md file contains a few typos, such as "that the command executes" and "retry times is over". I did not add review comments for these due to the review settings.
  • Inconsistent linking in deploy-monitoring-services.md: The deploy-monitoring-services.md file links to dashboard-intro.md without specifying the dashboard/ directory. I did not add a review comment for this due to the review settings.
  • Duplicated TiDB Dashboard entries in TOC.md: The TOC.md file initially adds TiDB Dashboard entries and then removes a duplicated section later on. This could be simplified. I did not add a review comment for this due to the review settings.
  • Inconsistent summary in tidb-monitoring-framework.md: The tidb-monitoring-framework.md file has conflicting summaries due to merge conflicts. This should be resolved. I did not add a review comment for this due to the review settings.

Merge Readiness

The pull request introduces TiDB Dashboard to the monitoring framework documentation. While the changes are generally good, there are a few issues that need to be addressed before merging, particularly the merge conflicts in _index.md and tidb-monitoring-framework.md. I am unable to approve this pull request, and recommend that another reviewer also reviews this code before merging. I recommend that this pull request not be merged until the merge conflicts and high severity issues are resolved.

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes-sigs/prow repository.

@Oreoxmt Oreoxmt force-pushed the cherry-pick-20776-to-release-8.5 branch from eb4ffd5 to 2c377bc Compare April 17, 2025 05:54
@Oreoxmt
Copy link
Collaborator

Oreoxmt commented Apr 17, 2025

/unhold

@Oreoxmt
Copy link
Collaborator

Oreoxmt commented Apr 17, 2025

/approve

@ti-chi-bot ti-chi-bot bot removed the do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. label Apr 17, 2025
Copy link

ti-chi-bot bot commented Apr 17, 2025

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: Oreoxmt

The full list of commands accepted by this bot can be found here.

The pull request process is described here

Needs approval from an approver in each of these files:

Approvers can indicate their approval by writing /approve in a comment
Approvers can cancel approval by writing /approve cancel in a comment

@ti-chi-bot ti-chi-bot bot added the approved label Apr 17, 2025
@ti-chi-bot ti-chi-bot bot merged commit 8cebee1 into pingcap:release-8.5 Apr 17, 2025
9 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
approved area/diagnosis Indicates that the Issue or PR belongs to the area of diagnosis and monitoring. lgtm needs-1-more-lgtm Indicates a PR needs 1 more LGTM. ONCALL Relates to documentation oncall. size/M Denotes a PR that changes 30-99 lines, ignoring generated files. type/cherry-pick-for-release-8.5 This PR is cherry-picked to release-8.5 from a source PR. type/enhancement The issue or PR belongs to an enhancement.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants