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

feat: support k8s labels for dashboards #13209

Merged
merged 1 commit into from
Nov 2, 2023

Conversation

arkbriar
Copy link
Contributor

@arkbriar arkbriar commented Nov 2, 2023

I hereby agree to the terms of the RisingWave Labs, Inc. Contributor License Agreement.

What's changed and what's your intention?

The PR supports labels pod and risingwave_component available in k8s deployments to replace the original labels instance and job used locally, as described in #13174.

In general, it introduced a set of variables to represent the labels and variables used in queries. The PR should not change the local dashboard. I have run the generate.sh to update the dashboards accordingly. There's no change to the user's dashboard and the changes to the dev dashboard are all trivial formats (like removing blanks or adding blanks). You can find a diff here.

grafana-dev-dashboard.diff.txt

Fixes #13174

Checklist

  • I have written necessary rustdoc comments
  • I have added necessary unit tests and integration tests
  • I have added fuzzing tests or opened an issue to track them. (Optional, recommended for new SQL features Sqlsmith: Sql feature generation #7934).
  • My PR contains breaking changes. (If it deprecates some features, please create a tracking issue to remove them in the future).
  • All checks passed in ./risedev check (or alias, ./risedev c)
  • My PR changes performance-critical code. (Please run macro/micro-benchmarks and show the results.)
  • My PR contains critical fixes that are necessary to be merged into the latest release. (Please check out the details)

Documentation

  • My PR needs documentation updates. (Please use the Release note section below to summarize the impact on users)

Release note

If this PR includes changes that directly affect users or other significant modifications relevant to the community, kindly draft a release note to provide a concise summary of these changes. Please prioritize highlighting the impact these changes will have on users.

Copy link
Collaborator

@hzxa21 hzxa21 left a comment

Choose a reason for hiding this comment

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

LGTM!

Thanks for the efforts.

Copy link

codecov bot commented Nov 2, 2023

Codecov Report

Merging #13209 (651396d) into main (0007064) will decrease coverage by 0.06%.
The diff coverage is n/a.

❗ Current head 651396d differs from pull request most recent head 9969a69. Consider uploading reports for the commit 9969a69 to get more accurate results

@@            Coverage Diff             @@
##             main   #13209      +/-   ##
==========================================
- Coverage   68.13%   68.08%   -0.06%     
==========================================
  Files        1515     1512       -3     
  Lines      257111   256245     -866     
==========================================
- Hits       175192   174454     -738     
+ Misses      81919    81791     -128     
Flag Coverage Δ
rust 68.08% <ø> (-0.06%) ⬇️

Flags with carried forward coverage won't be shown. Click here to find out more.

see 32 files with indirect coverage changes

📣 We’re building smart automated test selection to slash your CI/CD build times. Learn more

@arkbriar arkbriar added this pull request to the merge queue Nov 2, 2023
@huangjw806 huangjw806 removed this pull request from the merge queue due to a manual request Nov 2, 2023
@huangjw806 huangjw806 added this pull request to the merge queue Nov 2, 2023
@github-merge-queue github-merge-queue bot removed this pull request from the merge queue due to a conflict with the base branch Nov 2, 2023
@arkbriar arkbriar force-pushed the shunjie/grafana-dashboards-k8s-labels branch from 651396d to 9969a69 Compare November 2, 2023 14:24
@arkbriar
Copy link
Contributor Author

arkbriar commented Nov 2, 2023

Updates: resolve conflicts and force push.

@arkbriar arkbriar added this pull request to the merge queue Nov 2, 2023
Merged via the queue into main with commit 8b58861 Nov 2, 2023
7 of 8 checks passed
@arkbriar arkbriar deleted the shunjie/grafana-dashboards-k8s-labels branch November 2, 2023 14:29
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Use different labels other than job and instance when building the dev dashboards
2 participants