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 grafana additional volumeMounts field. #3960

Merged
merged 17 commits into from
May 17, 2021
Merged

Support grafana additional volumeMounts field. #3960

merged 17 commits into from
May 17, 2021

Conversation

mikechengwei
Copy link
Contributor

What problem does this PR solve?

#3921

What is changed and how does it work?

User can load custom configuration by specify additional volumeMounts , for example loading custom grafana dashboard json.

Code changes

  • Has Go code change
  • Has CI related scripts change

Tests

  • Unit test
  • E2E test
  • Manual test
  • No code

Side effects

None

Release Notes

Support grafana additional volumeMounts field.

@ti-chi-bot ti-chi-bot requested review from handlerww and Yisaer May 5, 2021 17:40
@mikechengwei mikechengwei changed the title Support grafana add additional volumeMounts . Support grafana additional volumeMounts field. May 5, 2021
@codecov-commenter
Copy link

codecov-commenter commented May 5, 2021 •
edited
Loading

Codecov Report

Merging #3960 (7407aac) into master (e405d4d) will increase coverage by 4.21%.
The diff coverage is 0.00%.

@@            Coverage Diff             @@
##           master    #3960      +/-   ##
==========================================
+ Coverage   61.96%   66.18%   +4.21%     
==========================================
  Files         173      177       +4     
  Lines       18343    18847     +504     
==========================================
+ Hits        11367    12473    +1106     
+ Misses       5863     5190     -673     
- Partials     1113     1184      +71
Flag Coverage Δ
e2e 31.46% <0.00%> (?)
unittest 61.93% <0.00%> (-0.04%) ⬇️

csuzhangxc
csuzhangxc reviewed May 6, 2021
View reviewed changes
Copy link
Member

@csuzhangxc csuzhangxc left a comment

Choose a reason for hiding this comment

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

How about adding an example like https://github.com/pingcap/tidb-operator/blob/master/examples/monitor-with-externalConfigMap/README.md too?

@mikechengwei
Copy link
Contributor Author

How about adding an example like https://github.com/pingcap/tidb-operator/blob/master/examples/monitor-with-externalConfigMap/README.md too?

I have provide example yaml ,you can review it when you have time.

csuzhangxc
csuzhangxc approved these changes May 17, 2021
View reviewed changes
Copy link
Member

@csuzhangxc csuzhangxc left a comment

Choose a reason for hiding this comment

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

LGTM

@ti-chi-bot
Copy link
Member

[REVIEW NOTIFICATION]

This pull request has been approved by:

  • csuzhangxc
  • july2993

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 writing /lgtm in a comment.
Reviewer can cancel approval by writing /lgtm cancel in a comment.

@csuzhangxc
Copy link
Member

/test pull-e2e-kind

mikechengwei and others added 2 commits May 17, 2021 11:59
@mikechengwei
optimze code
ea851ce
@mikechengwei @DanielZhangQD
Update examples/monitor-with-externalConfigMap/grafana/README.md
86c605e 
Co-authored-by: DanielZhangQD <36026334+DanielZhangQD@users.noreply.github.com>
mikechengwei and others added 4 commits May 17, 2021 12:07
@mikechengwei @DanielZhangQD
Update examples/monitor-with-externalConfigMap/grafana/README.md
69cd8d2 
Co-authored-by: DanielZhangQD <36026334+DanielZhangQD@users.noreply.github.com>
@mikechengwei @DanielZhangQD
Update examples/monitor-with-externalConfigMap/grafana/README.md
0783280 
Co-authored-by: DanielZhangQD <36026334+DanielZhangQD@users.noreply.github.com>
@mikechengwei
optimze code
e1b411a
@mikechengwei
Merge branch 'customdashboard' of github.com:tongcheng-elong/tidb-ope…
8e2d9b7 
…rator into customdashboard
DanielZhangQD
DanielZhangQD approved these changes May 17, 2021
View reviewed changes
Copy link
Contributor

@DanielZhangQD DanielZhangQD left a comment

Choose a reason for hiding this comment

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

LGTM

@mikechengwei
Copy link
Contributor Author

/test pull-e2e-kind

@mikechengwei
Copy link
Contributor Author

/run-e2e-tests

1 similar comment
@mikechengwei
Copy link
Contributor Author

/run-e2e-tests

@mikechengwei
Copy link
Contributor Author

/merge

@ti-chi-bot
Copy link
Member

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

Commit hash: 7407aac

@ti-chi-bot ti-chi-bot merged commit a015396 into pingcap:master May 17, 2021
mianhk pushed a commit to mianhk/tidb-operator that referenced this pull request Jul 23, 2021
@mikechengwei @mianhk
Support grafana additional volumeMounts field. (pingcap#3960)
946ecd9
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@DanielZhangQD DanielZhangQD DanielZhangQD approved these changes

@csuzhangxc csuzhangxc csuzhangxc approved these changes

@july2993 july2993 july2993 approved these changes

@handlerww handlerww Awaiting requested review from handlerww

@Yisaer Yisaer Awaiting requested review from Yisaer

Assignees
No one assigned
Labels
status/can-merge status/LGT2
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
6 participants
@mikechengwei @codecov-commenter @ti-chi-bot @csuzhangxc @july2993 @DanielZhangQD