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.

Sign up for GitHub

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

Jump to bottom

support dynamic distro config #1094

Merged
merged 18 commits into from
Dec 22, 2021
Merged

support dynamic distro config #1094

merged 18 commits into from
Dec 22, 2021

Conversation

baurine
Copy link
Collaborator

@baurine baurine commented Dec 13, 2021

No description provided.

@ti-chi-bot
Copy link
Member

ti-chi-bot commented Dec 13, 2021 •
edited
Loading

[REVIEW NOTIFICATION]

This pull request has been approved by:

  • breeswish

To complete the pull request process, please ask the reviewers in the list to review by filling /cc @reviewer in the comment.
After your PR has acquired the required number of LGTMs, you can assign this pull request to the committer in the list by filling /assign @committer in the comment to help you merge this pull request.

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

Reviewer can indicate their review by submitting an approval review.
Reviewer can cancel approval by submitting a request changes review.

@baurine baurine marked this pull request as draft December 13, 2021 02:53
@baurine baurine marked this pull request as ready for review December 13, 2021 10:47
baurine and others added 3 commits December 13, 2021 18:50
@baurine
Distribution dynamic config
1e51d1e 
* change svg usage

* copy distro res in dev mode

* rewrite assets (wip)

* refine code

* fix missed changes

* override distro strings res

* support distro strings res in prod mode

* keep distro-res folder in output dir

* support distro strings res in dev mode

* set title by js

* remove no need code

* fix gosec lint

* refine

* support diagnoseReportApp distro strings res

* update go.sum

* fix distro strings res for prod mode

* refine
@baurine
fix style and assets url
7c1cfb8
@baurine
handle distro strings res in dev mode
024bed8
@baurine baurine force-pushed the support-dynamic-distro branch from be284ab to 024bed8 Compare December 13, 2021 10:50
@baurine baurine mentioned this pull request Dec 13, 2021
Closed
breezewish
breezewish reviewed Dec 13, 2021
View reviewed changes
util/distro/distro.go Outdated Show resolved Hide resolved
breezewish
breezewish reviewed Dec 13, 2021
View reviewed changes
ui/lib/utils/distroStringsRes.ts Outdated Show resolved Hide resolved
ui/dashboardApp/layout/signin/index.tsx Show resolved Hide resolved
scripts/go.mod Outdated Show resolved Hide resolved
scripts/go.mod Outdated Show resolved Hide resolved
scripts/go.mod Outdated Show resolved Hide resolved
ui/public/index.html Show resolved Hide resolved
ui/config-overrides.js Show resolved Hide resolved
ui/config-overrides.js Show resolved Hide resolved
breezewish
breezewish reviewed Dec 13, 2021
View reviewed changes
pkg/uiserver/uiserver.go Outdated Show resolved Hide resolved
pkg/uiserver/uiserver.go Outdated Show resolved Hide resolved
pkg/uiserver/uiserver.go Outdated Show resolved Hide resolved
breezewish
breezewish reviewed Dec 14, 2021
View reviewed changes
Copy link
Member

@breezewish breezewish left a comment

Choose a reason for hiding this comment

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

the rest LGTM

@breezewish
Copy link
Member

@shhdgit @YiniXu9506 PTAL, thanks!

@breezewish breezewish mentioned this pull request Dec 15, 2021
Merged
@baurine baurine force-pushed the support-dynamic-distro branch from 0e686a3 to dbb6616 Compare December 15, 2021 15:53
@baurine baurine marked this pull request as ready for review December 20, 2021 10:31
baurine
baurine commented Dec 20, 2021
View reviewed changes
ui/lib/distro_strings.json
@@ -0,0 +1 @@
{ "tidb": "TiDB", "tikv": "TiKV", "pd": "PD", "tiflash": "TiFlash" }
Copy link
Collaborator Author

@baurine baurine Dec 20, 2021 •
edited
Loading

Choose a reason for hiding this comment

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

This file is auto-generated by shell.

baurine
baurine commented Dec 20, 2021
View reviewed changes
cmd/distro/write_strings.go Outdated Show resolved Hide resolved
baurine
baurine commented Dec 20, 2021
View reviewed changes
ui/config-overrides.js
Comment on lines +211 to +212
injectDistroToHTML,
addExtraEntries()
Copy link
Collaborator Author

Choose a reason for hiding this comment

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

make sure addExtraEntries() run before injectDistroToHtml (the running order is reverse), else injectDistroToHtml only works for index.html, but not diagnoseReport.html

Copy link
Member

Choose a reason for hiding this comment

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

How about adding this comment in the code.

breezewish
breezewish reviewed Dec 20, 2021
View reviewed changes
Copy link
Member

@breezewish breezewish left a comment

Choose a reason for hiding this comment

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

the rest LGTM

cmd/distro/write_strings.go Outdated Show resolved Hide resolved
util/distro/distro.go Outdated Show resolved Hide resolved
util/distro/distro.go Outdated Show resolved Hide resolved
@breezewish
Copy link
Member

@shhdgit PTAL

@breezewish
Copy link
Member

Remember to also provide a PD PR after this is released.

@breezewish
Copy link
Member

breezewish commented Dec 21, 2021 •
edited
Loading

We don't need to take care of the diagnostics report and the metrics. They are out of our scope. It would be too much effort to make them fully distribution compatible and we will need some evaluation before decide to do this.

@breezewish breezewish self-assigned this Dec 21, 2021
@shhdgit
Copy link
Member

shhdgit commented Dec 21, 2021

The rest LGTM.

@baurine
Copy link
Collaborator Author

baurine commented Dec 22, 2021

/merge

@ti-chi-bot
Copy link
Member

This pull request has been accepted and is ready to merge.

Commit hash: c272dc3

@breezewish breezewish merged commit 0807daf into pingcap:master Dec 22, 2021
@baurine baurine deleted the support-dynamic-distro branch December 22, 2021 06:54
@baurine
Copy link
Collaborator Author

baurine commented Dec 27, 2021

PD side PR: tikv/pd#4502

baurine added a commit to baurine/tidb-dashboard that referenced this pull request Dec 30, 2021
@baurine
distro: support dynamic config (pingcap#1094)
e9caf73
baurine added a commit that referenced this pull request Dec 30, 2021
@baurine @dependabot
@breezewish @shhdgit @YiniXu9506 @crazycs520
Release v2021.12.30.1 [skip pd_pr] (#1113)
b2c4a04 
* Revert "Release v2021.12.06.1 (#1084)"

This reverts commit bcc43a0.

* Compitable with different TiDB versions for conprof and non-root-login features (#1047)

* make conprof independent

* check feature enable

* add check feature enable middleware

* hide menu if feature is not enabled

* refactor non root login switch by new design

* i18n

* yarn fmt

* renaming

* adjust fe code

* refine

* remove unused log

* build(deps): bump ws from 5.2.2 to 5.2.3 in /ui (#1055)

* CICD: Update the release pipeline for recent PD format policies (#1054)

* fix i18n wording (#1056)

* Refactor: Change util module to util package (#1052)

* Refactor: Fix godot incorrectly add dot suffix to annotations (#1059)

* lint: Add goheader for copyright lints (#1062)

* Refactor: Migrate to use the `rest` package in util/ (#1060)

* fix(*): globally delete/update data by GORM (#1065)

* ui: bump dependencies (#1066)

* refactor: Switch to use ziputil, netutil, reflectutil and fileswap (#1067)

* Fix request header being pinned after pd profiling (#1069)

* Integrate speedscope (#1064)

* fix potential panic when GetPDInstances (#1075)

Signed-off-by: crazycs <[email protected]>

* Refactor: a new httpclient (#1073)

* Refactor: Switch to use util/distro in all places (#1078)

* chore: support import relative file URL (#1082)

* Refactor: Move tools into a standalone module (#1079)

* Fix script to embed the ui (#1088)

* Fix script to embed the ui

* Hack write_strings

* Refactor feature flag to support more modules (#1057)

* Drop sysutil dependency (#1093)

* chore: add graph generation (#1085)

* Refactor: Add TopologyProvider (#1098)

* esbuild: i18n + dep (#1101)

* script: Add a script to generate version matrix (#1104)

* distro: support dynamic config (#1094)

* chore: support multiple profiling types (#1095)

* fix(distro): check distro_strings.json fmt by prettier (#1106)

* script: fix generate assets (#1107)

* Add integration test (#1083)

* debug_api: Switch to use the new util (#1103)

* refactor(ui): auto refresh button (#1105)

* refactor(ui): auto refresh button

* chore: update translation

* fix: remain seconds

* refine: refresh button

* fix: onRefresh

* fix: auto refresh

* fix: continue tick

* chore: add some comments

* tweak: remaining refresh seconds

* chore: clean code

Co-authored-by: Wenxuan <[email protected]>

* ui: refine conprof (#1102)

* update wording

* not check prom any more

* replace time range component

* i18n

* support view profile by diffrent ways

* extract ActionsButton

* change download data format

* refine

* comments

* Revert "comments"

This reverts commit 3b03fdb.

* fix view cpu profile fail

* update state

* hide action button if disable

* address feedback

* update release-version

* sync with master

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: Wenxuan <[email protected]>
Co-authored-by: Suhaha <[email protected]>
Co-authored-by: Yini Xu <[email protected]>
Co-authored-by: crazycs <[email protected]>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@shhdgit shhdgit shhdgit approved these changes

@breezewish breezewish breezewish approved these changes

Assignees

@breezewish breezewish

Labels
status/can-merge status/LGT1
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
4 participants
@baurine @ti-chi-bot @breezewish @shhdgit