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

Bug 1848512: Wrong interpretation of labels for resource quota diagram #6416

Merged
merged 1 commit into from Aug 31, 2020
Merged

Bug 1848512: Wrong interpretation of labels for resource quota diagram #6416

merged 1 commit into from Aug 31, 2020

Conversation

dtaylor113
Copy link
Contributor

@dtaylor113 dtaylor113 commented Aug 24, 2020 •
edited

Needed to provide data.x for chart labels/tooltip

Before

image

After

image

@openshift-ci-robot openshift-ci-robot added the bugzilla/severity-low Referenced Bugzilla bug's severity is low for the branch this PR is targeting. label Aug 24, 2020
@openshift-ci-robot
Copy link
Contributor

@dtaylor113: This pull request references Bugzilla bug 1848512, which is valid. The bug has been moved to the POST state. The bug has been updated to refer to the pull request using the external bug tracker.

3 validation(s) were run on this bug
  • bug is open, matching expected state (open)
  • bug target release (4.6.0) matches configured target release for branch (4.6.0)
  • bug is in the state ASSIGNED, which is one of the valid states (NEW, ASSIGNED, ON_DEV, POST, POST)

In response to this:

fix for bug 1848512: Wrong interpretation of labels for resource quot…

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/test-infra repository.

@openshift-ci-robot openshift-ci-robot added bugzilla/valid-bug Indicates that a referenced Bugzilla bug is valid for the branch this PR is targeting. component/core Related to console core functionality labels Aug 24, 2020
@dtaylor113 dtaylor113 changed the title fix for bug 1848512: Wrong interpretation of labels for resource quot… Bug 1848512: Wrong interpretation of labels for resource quota diagram Aug 24, 2020
@openshift-ci-robot
Copy link
Contributor

@dtaylor113: This pull request references Bugzilla bug 1848512, which is valid.

3 validation(s) were run on this bug
  • bug is open, matching expected state (open)
  • bug target release (4.6.0) matches configured target release for branch (4.6.0)
  • bug is in the state POST, which is one of the valid states (NEW, ASSIGNED, ON_DEV, POST, POST)

In response to this:

Bug 1848512: Wrong interpretation of labels for resource quota diagram

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/test-infra repository.

@dtaylor113
Copy link
Contributor Author

/retest

1 similar comment
@dtaylor113
Copy link
Contributor Author

/retest

@dtaylor113
Copy link
Contributor Author

/retest

jcaianirh
jcaianirh reviewed Aug 27, 2020
View reviewed changes
frontend/public/components/resource-quota.jsx Outdated
@@ -191,16 +191,32 @@ const NoQuotaGuage = ({ title, className }) => (

export const QuotaGaugeCharts = ({ quota, resourceTypes, chartClassName = null }) => {
const resourceTypesSet = new Set(resourceTypes);
const cpuRequestUsagePercent =
Copy link
Member

Choose a reason for hiding this comment

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

Suggested change
const cpuRequestUsagePercent =
const cpuRequestUsagePercent =getResourceUsage(
quota,
resourceTypesSet.has('requests.cpu') ? 'requests.cpu' : 'cpu',
).percent;

Copy link
Contributor Author

Choose a reason for hiding this comment

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

fixed

jcaianirh
jcaianirh reviewed Aug 27, 2020
View reviewed changes
frontend/public/components/resource-quota.jsx Outdated
resourceTypesSet.has('requests.memory') ? 'requests.memory' : 'memory',
).percent
: 0;
const memoryLimitUsagePercent = resourceTypesSet.has('limits.memory')
Copy link
Member

Choose a reason for hiding this comment

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

Suggested change
const memoryLimitUsagePercent = resourceTypesSet.has('limits.memory')
const memoryLimitUsagePercent = getResourceUsage(quota, 'limits.memory').percent;

Copy link
Contributor Author

Choose a reason for hiding this comment

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

fixed

jcaianirh
jcaianirh requested changes Aug 27, 2020
View reviewed changes
Copy link
Member

@jcaianirh jcaianirh left a comment

Choose a reason for hiding this comment

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

@dtaylor113 possible simplification?

@dtaylor113 dtaylor113 force-pushed the resource-quota-donutchart-label branch from 733e7a3 to 161de9b Compare August 27, 2020 20:05
@dtaylor113
Copy link
Contributor Author

dtaylor113 commented Aug 27, 2020 •
edited

Hi @jcaianirh, applied that pattern to all 4 lines. Had to revert the check between showing a GaugeChart chart or NoQuotaGuage chart, in order to actually display a 0% value, which is the state when a resource quota is created but no pods applied yet.

@dtaylor113
Copy link
Contributor Author

/retest

@dtaylor113
Copy link
Contributor Author

/retest

@jcaianirh
Copy link
Member

/lgtm

@openshift-ci-robot openshift-ci-robot added the lgtm Indicates that a PR is ready to be merged. label Aug 27, 2020
@dtaylor113
Copy link
Contributor Author

Hi @spadgett, @kyoto, and @rhamilto, looking for an approval in order to merge this PR. -thanks :-)

spadgett
spadgett reviewed Aug 31, 2020
View reviewed changes
Copy link
Member

@spadgett spadgett left a comment

Choose a reason for hiding this comment

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

Do we need the tooltip at all if it simply repeats the label in the middle of the donut?

frontend/public/components/resource-quota.jsx Show resolved Hide resolved
spadgett
spadgett approved these changes Aug 31, 2020
View reviewed changes
Copy link
Member

@spadgett spadgett left a comment

Choose a reason for hiding this comment

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

/lgtm

@openshift-ci-robot
Copy link
Contributor

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: dtaylor113, jcaianirh, spadgett

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

@openshift-ci-robot openshift-ci-robot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Aug 31, 2020
@openshift-merge-robot openshift-merge-robot merged commit a78e5c0 into openshift:master Aug 31, 2020
@openshift-ci-robot
Copy link
Contributor

@dtaylor113: All pull requests linked via external trackers have merged:

Bugzilla bug 1848512 has been moved to the MODIFIED state.

In response to this:

Bug 1848512: Wrong interpretation of labels for resource quota diagram

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/test-infra repository.

@spadgett spadgett added this to the v4.6 milestone Sep 1, 2020
@dtaylor113 dtaylor113 deleted the resource-quota-donutchart-label branch November 25, 2020 14:22
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@spadgett spadgett spadgett approved these changes

@jcaianirh jcaianirh jcaianirh approved these changes

@jhadvig jhadvig Awaiting requested review from jhadvig

@kyoto kyoto Awaiting requested review from kyoto

@TheRealJon TheRealJon Awaiting requested review from TheRealJon

@rhamilto rhamilto Awaiting requested review from rhamilto

Assignees

@spadgett spadgett

@jcaianirh jcaianirh

Labels
approved Indicates a PR has been approved by an approver from all required OWNERS files. bugzilla/severity-low Referenced Bugzilla bug's severity is low for the branch this PR is targeting. bugzilla/valid-bug Indicates that a referenced Bugzilla bug is valid for the branch this PR is targeting. component/core Related to console core functionality lgtm Indicates that a PR is ready to be merged.
Projects
None yet
Milestone
v4.6
Development

Successfully merging this pull request may close these issues.

None yet
5 participants
@dtaylor113 @openshift-ci-robot @jcaianirh @spadgett @openshift-merge-robot