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

Show help about compute units #1027

Merged
merged 1 commit into from
Dec 14, 2016
Merged

Conversation

spadgett
Copy link
Member

Add a link to resource limit forms and metrics pages that explain compute units like millicores and MiB. The link opens this dialog:

screen shot 2016-12-12 at 3 10 34 pm

cc @derekwaynecarr

Fixes openshift/origin#7768

@spadgett spadgett force-pushed the units-help branch 2 times, most recently from 8c27db8 to 35044a2 Compare December 12, 2016 21:24
@spadgett
Copy link
Member Author

openshift_web_console

@@ -365,6 +365,9 @@
expand="true"
can-toggle="false"
>
<div class="learn-more-block">
<a href="" ng-click="showComputeUnitsHelp()">What are millicores and MiB?</a>
</div>
Copy link
Member Author

Choose a reason for hiding this comment

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

@jwforres Different text here because there is already an "About Resource Limits" link for the form section. Let me know if you have a better idea for where to put it.

openshift_web_console

@jwforres
Copy link
Member

jwforres commented Dec 13, 2016

@spadgett in your first screenshot, what if "CPU and memory" was a link instead? or maybe the order of the two links just needs to be reversed, i think it would make more sense to have the simple About Compute Resources and then the Learn More ->

@spadgett
Copy link
Member Author

@jwforres I think I like changing the order. Or I could even remove the learn more link since it's in the dialog.

@spadgett
Copy link
Member Author

Pushed a change to switch the order for now

@jwforres
Copy link
Member

for the resource limits editor, I think I would rather have a ? link next to the units dropdown than have the full "What are millicores and MiB?" Its tough since ? is usually reserved for the popups...

@spadgett
Copy link
Member Author

Maybe in the help text?

The minimum amount of CPU the container is guaranteed. Can be specified in
<a href="">millicores or cores</a>.

@jwforres
Copy link
Member

@spadgett yep i like that idea

@spadgett
Copy link
Member Author

@jwforres Not sure about it now that I've tried it. It's odd since it's repeated twice for CPU and twice for memory, and they all bring up the same dialog.

screen shot 2016-12-13 at 1 28 25 pm

@openshift-bot openshift-bot added the needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. label Dec 13, 2016
@jwforres
Copy link
Member

What if you took off the sentence you added and instead made "CPU" the link, i think that still works with the content of the dialog.

@spadgett
Copy link
Member Author

screen shot 2016-12-13 at 3 58 24 pm

@jwforres
Copy link
Member

jwforres commented Dec 13, 2016 via email

@openshift-bot openshift-bot removed the needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. label Dec 13, 2016
@spadgett
Copy link
Member Author

With input from @rhamilto 👍

screen shot 2016-12-14 at 9 16 05 am

@jwforres
Copy link
Member

screenshot LGTM, let me know when the changes are pushed

@spadgett
Copy link
Member Author

@jwforres changes pushed

@jwforres
Copy link
Member

[merge]

Add a link to resource limit forms and metrics pages that explain
compute units like millicores and MiB. The link opens a dialog with a
brief description of compute resources and tables for binary and decimal
units.
@spadgett
Copy link
Member Author

Resolved dist conflict

[merge]

@openshift-bot
Copy link

Evaluated for origin web console merge up to b16b2bd

@openshift-bot
Copy link

openshift-bot commented Dec 14, 2016

Origin Web Console Merge Results: SUCCESS (https://ci.openshift.redhat.com/jenkins/job/test_pull_requests_origin_web_console/854/) (Base Commit: 076ed5a)

@openshift-bot openshift-bot merged commit 2446d7f into openshift:master Dec 14, 2016
@spadgett spadgett deleted the units-help branch December 16, 2016 17:24
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.

None yet

3 participants