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

Show org and space quotas #2299

Merged
merged 4 commits into from
Jul 26, 2022
Merged

Show org and space quotas #2299

merged 4 commits into from
Jul 26, 2022

Conversation

mkocher
Copy link
Member

@mkocher mkocher commented Jul 20, 2022

This is blocked on #2298, don't merge before then.

Adds log volume limits to quota displays.

/cc @ctlong

@ctlong ctlong mentioned this pull request Jul 21, 2022
Merged
@ctlong ctlong force-pushed the show-org-and-space-quotas branch from ab8feab to a0873c7 Compare July 21, 2022 22:53
@ctlong ctlong mentioned this pull request Jul 22, 2022
Merged
@ctlong ctlong force-pushed the show-org-and-space-quotas branch from 85bc867 to 4d8d83d Compare July 25, 2022 22:33
mkocher and others added 3 commits July 25, 2022 23:25
@mkocher
org-quota and space-quota now show log volume
4c3d698 
* code currently assumes responses with log limits. Consider
  backward compatibility before shipping.

Signed-off-by: Carson Long <lcarson@vmware.com>
@ctlong @mkocher
fix todo's now that we have output to match on
b493efb 
Signed-off-by: Matthew Kocher <mkocher@vmware.com>
@mkocher
add log volume to space-quotas and org-quotas commands
07a6d2e 
* will show "unlimited" for old CC API's which is technically correct

Signed-off-by: Carson Long <lcarson@vmware.com>
@ctlong ctlong force-pushed the show-org-and-space-quotas branch from 4d8d83d to 07a6d2e Compare July 25, 2022 23:26
@ctlong
Copy link
Member

ctlong commented Jul 25, 2022

This updates four commands:

  • org-quotas
  • org-quota
  • space-quotas
  • space-quota

@jdgonzaleza jdgonzaleza marked this pull request as ready for review July 26, 2022 00:49
@pivotalgeorge pivotalgeorge self-requested a review July 26, 2022 02:10
@pivotalgeorge
Copy link
Contributor

Cool, this looks good in that it builds and displays org quotas with unlimited by default.
However, just noticed that when I run <cf> create-org-quota the help output includes [-l LOG_VOLUME], but the <cf> create-space-quota command does not include this flag. This might be more of a #2298 issue, though, so not blocking merge of #2299 on this.

@ctlong
Copy link
Member

ctlong commented Jul 26, 2022 •
edited
Loading

@pivotalgeorge the work to add the -l flag for create-space-quota and update-space-quota can be found in #2300. This PR is only focused on the "read" commands, and #2298 was only focused on the org-level "write" commands.

Our goal in splitting up the work like this is to make each PR more easily reviewable by y'all. Happy to take feedback (ideally in slack) to improve our current process, if you find it confusing / not ideal :).

@ctlong @rroberts2222
Fix unit tests in ccv3
364bf82 
Signed-off-by: Rebecca Roberts <robertsre@vmware.com>
@pivotalgeorge
Copy link
Contributor

pivotalgeorge commented Jul 26, 2022 •
edited
Loading

@ctlong no that makes sense, I just thought I remembered seeing changes to both space and org quota commands in #2298
edit: I did, and they were the Megabytes rename lines.

jdgonzaleza
jdgonzaleza approved these changes Jul 26, 2022
View reviewed changes
Copy link
Contributor

@jdgonzaleza jdgonzaleza left a comment

Choose a reason for hiding this comment

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

LGTM

@jdgonzaleza jdgonzaleza merged commit 744f248 into cloudfoundry:feature/logging-rate-limits Jul 26, 2022
rroberts2222 added a commit to loggregator/cli that referenced this pull request Aug 19, 2022
@mkocher @rroberts2222 @ctlong
Show org and space quotas (cloudfoundry#2299)
2b3d97f 
* org-quota and space-quota now show log volume

* code currently assumes responses with log limits. Consider
  backward compatibility before shipping.

* add log volume to space-quotas and org-quotas commands

* will show "unlimited" for old CC API's which is technically correct

* Fix unit tests in ccv3

Co-authored-by: Rebecca Roberts <robertsre@vmware.com>
Co-authored-by: Matthew Kocher <mkocher@vmware.com>
Co-authored-by: Carson Long <lcarson@vmware.com>
rroberts2222 added a commit to loggregator/cli that referenced this pull request Aug 19, 2022
@mkocher @rroberts2222 @ctlong
Show org and space quotas (cloudfoundry#2299)
a07f90f 
* org-quota and space-quota now show log volume

* code currently assumes responses with log limits. Consider
  backward compatibility before shipping.

* add log volume to space-quotas and org-quotas commands

* will show "unlimited" for old CC API's which is technically correct

* Fix unit tests in ccv3

Co-authored-by: Rebecca Roberts <robertsre@vmware.com>
Co-authored-by: Matthew Kocher <mkocher@vmware.com>
Co-authored-by: Carson Long <lcarson@vmware.com>
rroberts2222 added a commit to loggregator/cli that referenced this pull request Aug 19, 2022
@mkocher @rroberts2222 @ctlong
Show org and space quotas (cloudfoundry#2299)
42c41d0 
* org-quota and space-quota now show log volume

* code currently assumes responses with log limits. Consider
  backward compatibility before shipping.

* add log volume to space-quotas and org-quotas commands

* will show "unlimited" for old CC API's which is technically correct

* Fix unit tests in ccv3

Co-authored-by: Rebecca Roberts <robertsre@vmware.com>
Co-authored-by: Matthew Kocher <mkocher@vmware.com>
Co-authored-by: Carson Long <lcarson@vmware.com>
jdgonzaleza pushed a commit that referenced this pull request Sep 7, 2022
@mkocher @rroberts2222 @ctlong
Show org and space quotas (#2299)
d709b99 
* org-quota and space-quota now show log volume

* code currently assumes responses with log limits. Consider
  backward compatibility before shipping.

* add log volume to space-quotas and org-quotas commands

* will show "unlimited" for old CC API's which is technically correct

* Fix unit tests in ccv3

Co-authored-by: Rebecca Roberts <robertsre@vmware.com>
Co-authored-by: Matthew Kocher <mkocher@vmware.com>
Co-authored-by: Carson Long <lcarson@vmware.com>
jdgonzaleza added a commit that referenced this pull request Sep 8, 2022
@jdgonzaleza @ctlong
@mkocher @rroberts2222 @Benjamintf1
logging rate limits flag introduction (#2313)
cfcea0f 
* Feat: create and update org quotas with log volume (#2298)

* Show org and space quotas (#2299)

* org-quota and space-quota now show log volume

* code currently assumes responses with log limits. Consider
  backward compatibility before shipping.

* add log volume to space-quotas and org-quotas commands

* will show "unlimited" for old CC API's which is technically correct

* Fix unit tests in ccv3

* Create and update space quotas (#2300)

* create-space-quota accepts log volume flag

* update-space-quota accepts log volume flag

* Update create-space-quota flag description

* Make it clear that the log volume measured is in bytes rather than log
  lines.

* Push and scale app and run-task 

* Bump rack from 2.2.3 to 2.2.3.1 in /fixtures/applications/example-app

* `cf push` command accepts log rate limit flag

* since `cf push` uses manifests this commit also adds support for log
  rate limit in manifests

* `cf scale` command accepts log rate limit flag

* app summary displayer can now handle rendering log rate and log rate
  limit metrics for running instances

* app summaries will show `0 of 0` if the cloud controller does not
  support log rate limit container metrics

* `cf run-task` command accepts log rate limit flag

* update help text to suggest using ='s with -1 to avoid flag parsing problem

* Flag parser accepts 0B, -1B, 0T, etc for flags

* this affects non-manifest based commands

* Extract constants for instance stats columns

* Extract constant for column count

Co-authored-by: Carson Long <lcarson@vmware.com>
Co-authored-by: Matthew Kocher <mkocher@vmware.com>
Co-authored-by: Rebecca Roberts <robertsre@vmware.com>
Co-authored-by: Benjamin Fuller <Benjamintf1@gmail.com>
jdgonzaleza added a commit that referenced this pull request Sep 8, 2022
@jdgonzaleza @ctlong
@mkocher @rroberts2222 @Benjamintf1
logging rate limits flag introduction (#2313)
94619ee 
* Feat: create and update org quotas with log volume (#2298)

* Show org and space quotas (#2299)

* org-quota and space-quota now show log volume

* code currently assumes responses with log limits. Consider
  backward compatibility before shipping.

* add log volume to space-quotas and org-quotas commands

* will show "unlimited" for old CC API's which is technically correct

* Fix unit tests in ccv3

* Create and update space quotas (#2300)

* create-space-quota accepts log volume flag

* update-space-quota accepts log volume flag

* Update create-space-quota flag description

* Make it clear that the log volume measured is in bytes rather than log
  lines.

* Push and scale app and run-task 

* Bump rack from 2.2.3 to 2.2.3.1 in /fixtures/applications/example-app

* `cf push` command accepts log rate limit flag

* since `cf push` uses manifests this commit also adds support for log
  rate limit in manifests

* `cf scale` command accepts log rate limit flag

* app summary displayer can now handle rendering log rate and log rate
  limit metrics for running instances

* app summaries will show `0 of 0` if the cloud controller does not
  support log rate limit container metrics

* `cf run-task` command accepts log rate limit flag

* update help text to suggest using ='s with -1 to avoid flag parsing problem

* Flag parser accepts 0B, -1B, 0T, etc for flags

* this affects non-manifest based commands

* Extract constants for instance stats columns

* Extract constant for column count

Co-authored-by: Carson Long <lcarson@vmware.com>
Co-authored-by: Matthew Kocher <mkocher@vmware.com>
Co-authored-by: Rebecca Roberts <robertsre@vmware.com>
Co-authored-by: Benjamin Fuller <Benjamintf1@gmail.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@jdgonzaleza jdgonzaleza jdgonzaleza approved these changes

@pivotalgeorge pivotalgeorge Awaiting requested review from pivotalgeorge

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
5 participants
@mkocher @ctlong @pivotalgeorge @jdgonzaleza @cf-gitbot