Skip to content

ui: changed metric label CPUs to vCPUs#58495

Merged
craig[bot] merged 1 commit intocockroachdb:masterfrom
nanduu04:update_CPU_to_vCPU
Jan 20, 2021
Merged

ui: changed metric label CPUs to vCPUs#58495
craig[bot] merged 1 commit intocockroachdb:masterfrom
nanduu04:update_CPU_to_vCPU

Conversation

@nanduu04
Copy link
Copy Markdown

@nanduu04 nanduu04 commented Jan 6, 2021

Release note (ui change): CPUs metric column renamed to vCPUs in node
overview in cluster overview page.

@nanduu04 nanduu04 requested review from a team and nkodali January 6, 2021 14:05
@cockroach-teamcity
Copy link
Copy Markdown
Member

This change is Reviewable

Copy link
Copy Markdown
Collaborator

@nkodali nkodali left a comment

Choose a reason for hiding this comment

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

Commit messages should follow guidelines here: https://cockroachlabs.atlassian.net/wiki/spaces/CRDB/pages/73072807/Git+Commit+Messages.
One minor comment, but LG otherwise!

Reviewed 1 of 1 files at r1.
Reviewable status: :shipit: complete! 0 of 0 LGTMs obtained (waiting on @nanduu04)


pkg/ui/src/views/cluster/containers/nodesOverview/index.tsx, line 273 at r1 (raw file):

      title: (
        <CPUsTooltip>
           vCPU

let's leave this plural "vCPUs"

@nanduu04 nanduu04 force-pushed the update_CPU_to_vCPU branch from 350c847 to e16e32f Compare January 6, 2021 15:49
@nanduu04
Copy link
Copy Markdown
Author

nanduu04 commented Jan 6, 2021

Commit messages should follow guidelines here: https://cockroachlabs.atlassian.net/wiki/spaces/CRDB/pages/73072807/Git+Commit+Messages.
One minor comment, but LG otherwise!

Reviewed 1 of 1 files at r1.
Reviewable status: :shipit: complete! 0 of 0 LGTMs obtained (waiting on @nanduu04)

pkg/ui/src/views/cluster/containers/nodesOverview/index.tsx, line 273 at r1 (raw file):

      title: (
        <CPUsTooltip>
           vCPU

let's leave this plural "vCPUs"

updated!

@nanduu04 nanduu04 closed this Jan 6, 2021
@nanduu04 nanduu04 reopened this Jan 6, 2021
@nanduu04
Copy link
Copy Markdown
Author

nanduu04 commented Jan 6, 2021

updated to plural vCPUs

Copy link
Copy Markdown
Collaborator

@dhartunian dhartunian left a comment

Choose a reason for hiding this comment

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

Can you collapse the 3 commits into one? We merge into master instead of squashing and having a clean git history is important. Once you fix this, update the PR title/description to match the one commit. (You can do this using git rebase --interactive, happy to help w/ that feature)

The commit/PR message requires the ui: prefix to denote that this is a change to the UI package and a properly formatted release note in the body (you can see how the commit hook we have already inserted templates for you to fill in).

This is important even for small changes like this one because the Release note lines are aggregated and looked at by the docs team to identify PRs that require docs changes. This one will require some docs tweaks so it's important to note that the language in the UI has changed.

Reviewable status: :shipit: complete! 0 of 0 LGTMs obtained (waiting on @nkodali)

@nanduu04 nanduu04 force-pushed the update_CPU_to_vCPU branch from e16e32f to c644a60 Compare January 6, 2021 21:58
@nanduu04 nanduu04 changed the title changed label from cpu to vcpu ui: changed metric label CPUs to vCPUs Jan 6, 2021
@nanduu04 nanduu04 requested review from dhartunian and nkodali January 6, 2021 22:00
@dhartunian
Copy link
Copy Markdown
Collaborator

@nanduu04 looksl ike tests are failing, can you try running make ui-test in the CRDB directory and see if there are any test failures?

@nanduu04
Copy link
Copy Markdown
Author

nanduu04 commented Jan 7, 2021

@nanduu04 looksl ike tests are failing, can you try running make ui-test in the CRDB directory and see if there are any test failures?

Looks like two tests are failing.
Screen Shot 2021-01-07 at 12 44 44 PM

@dhartunian
Copy link
Copy Markdown
Collaborator

@nanduu04 great! the error messages are quite helpful, the tests are failing because of exactly the change you made. Make sure you can run the tests locally, make the fixes (the file that's failing is in the error message), and push an updated commit.

@dhartunian
Copy link
Copy Markdown
Collaborator

@nanduu04 thx for fixing the tests. can you combine the two commits into one again? In the future you can also use git commit --amend to add the test fixes to your commit. It's a requirement that every commit must be able to pass all the continuous integration tests on its own.

@nanduu04 nanduu04 force-pushed the update_CPU_to_vCPU branch from 4ca55a4 to 812fe36 Compare January 8, 2021 20:43
@dhartunian
Copy link
Copy Markdown
Collaborator

@nanduu04 I retriggered your failing build in TC and it passes now, but there's now a merge conflict so you will need to rebase on master. This is likely due to me merging the eslint formatting/linting PR so make sure after you rebase that make ui-lint runs successfully before pushing up a new commit.

@nanduu04 nanduu04 requested a review from a team January 20, 2021 16:40
@nanduu04 nanduu04 requested a review from a team as a code owner January 20, 2021 16:40
@nanduu04 nanduu04 requested review from pbardea and removed request for a team January 20, 2021 16:40
@dhartunian dhartunian removed request for a team and pbardea January 20, 2021 18:06
Release note (ui change): CPUs metric column renamed to vCPUs in node
overview in cluster overview page.
@nanduu04
Copy link
Copy Markdown
Author

bors r+

@craig
Copy link
Copy Markdown
Contributor

craig bot commented Jan 20, 2021

Build succeeded:

@craig craig bot merged commit 81b3bb9 into cockroachdb:master Jan 20, 2021
@nanduu04 nanduu04 deleted the update_CPU_to_vCPU branch January 31, 2021 23:44
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.

4 participants