Skip to content

G
gitlab-ce
Commit 0536b808 authored by Savas Vedova's avatar Savas Vedova
Browse files
Options

Merge branch '330228-okr-admin-area-network-rate-limits' into 'master' 

Settings UI text - Admin Area-Network/Import/Export Rate Limits

See merge request gitlab-org/gitlab!69939
parents 809fe53f dca9e841
Hide whitespace changes
Inline Side-by-side
Showing with 56 additions and 50 deletions
app/views/admin/application_settings/_import_export_limits.html.haml
View file @ 0536b808
= form_for @application_setting, url: network_admin_application_settings_path(anchor: 'js-import-export-limits-settings'), html: { class: 'fieldset-form' } do |f|
= form_errors(@application_setting)
%fieldset
= html_escape(_("Set any rate limit to %{code_open}0%{code_close} to disable the limit.")) % { code_open: '<code>'.html_safe, code_close: '</code>'.html_safe }
%fieldset
.form-group
= f.label :project_import_limit, _('Max Project Import requests per minute per user'), class: 'label-bold'
= f.label :project_import_limit, _('Maximum project import requests per minute'), class: 'label-bold'
= f.number_field :project_import_limit, class: 'form-control gl-form-input'
%fieldset
.form-group
= f.label :project_export_limit, _('Max Project Export requests per minute per user'), class: 'label-bold'
= f.label :project_export_limit, _('Maximum project export requests per minute'), class: 'label-bold'
= f.number_field :project_export_limit, class: 'form-control gl-form-input'
%fieldset
.form-group
= f.label :project_download_export_limit, _('Max Project Export Download requests per minute per user'), class: 'label-bold'
= f.label :project_download_export_limit, _('Maximum project export download requests per minute'), class: 'label-bold'
= f.number_field :project_download_export_limit, class: 'form-control gl-form-input'
%fieldset
.form-group
= f.label :group_import_limit, _('Max Group Import requests per minute per user'), class: 'label-bold'
= f.label :group_import_limit, _('Maximum group import requests per minute'), class: 'label-bold'
= f.number_field :group_import_limit, class: 'form-control gl-form-input'
%fieldset
.form-group
= f.label :group_export_limit, _('Max Group Export requests per minute per user'), class: 'label-bold'
= f.label :group_export_limit, _('Maximum group export requests per minute'), class: 'label-bold'
= f.number_field :group_export_limit, class: 'form-control gl-form-input'
%fieldset
.form-group
= f.label :group_download_export_limit, _('Max Group Export Download requests per minute per user'), class: 'label-bold'
= f.label :group_download_export_limit, _('Maximum group export download requests per minute'), class: 'label-bold'
= f.number_field :group_download_export_limit, class: 'form-control gl-form-input'
= f.submit _('Save changes'), class: "gl-button btn btn-confirm", data: { qa_selector: 'save_changes_button' }
app/views/admin/application_settings/network.html.haml
View file @ 0536b808
......@@ -110,11 +110,12 @@
%section.settings.as-import-export-limits.no-animate#js-import-export-limits-settings{ class: ('expanded' if expanded_by_default?) }
.settings-header
%h4
= _('Import/Export Rate Limits')
= _('Import and export rate limits')
%button.btn.gl-button.btn-default.js-settings-toggle{ type: 'button' }
= expanded_by_default? ? _('Collapse') : _('Expand')
%p
= _('Configure limits for Project/Group Import/Export.')
= _('Set per-user rate limits for imports and exports of projects and groups.')
= link_to _('Learn more.'), help_page_path('user/admin_area/settings/import_export_rate_limits.md'), target: '_blank', rel: 'noopener noreferrer'
.settings-content
= render 'import_export_limits'
......
doc/user/admin_area/settings/import_export_rate_limits.md
View file @ 0536b808
......@@ -5,28 +5,26 @@ group: Import
info: To determine the technical writer assigned to the Stage/Group associated with this page, see https://about.gitlab.com/handbook/engineering/ux/technical-writing/#assignments
---
# Project/group import/export rate limits **(FREE SELF)**
# Rate limits for imports and exports of project and groups **(FREE SELF)**
> [Introduced](https://gitlab.com/gitlab-org/gitlab/-/merge_requests/35728) in GitLab 13.2.
The following table includes configurable rate limits. The following table includes limits on a
per minute per user basis:
You can configure the rate limits for imports and exports of projects and groups:
| Limit | Default (per minute per user) |
|--------------------------|-------------------------------|
| Project Import | 6 |
| Project Export | 6 |
| Project Export Download | 1 |
| Group Import | 6 |
| Group Export | 6 |
| Group Export Download | 1 |
To change a rate limit:
All rate limits are:
1. On the top bar, select **Menu > Admin**.
1. On the left sidebar, select **Settings > Network**, then expand **Import and export rate limits**.
1. Change the value of any rate limit. The rate limits are per minute per user, not per IP address.
Set to `0` to disable a rate limit.
- Configurable through the top bar at **Menu > Admin > Settings > Network > Import/Export Rate Limits**
- Applied per minute per user
- Not applied per IP address
- Active by default. To disable, set the option to `0`
- Logged to `auth.log` file if exceed rate limit
| Limit | Default |
|-------------------------|---------|
| Project Import | 6 |
| Project Export | 6 |
| Project Export Download | 1 |
| Group Import | 6 |
| Group Export | 6 |
| Group Export Download | 1 |
![Import/Export rate limits](img/import_export_rate_limits_v13_2.png)
When a user exceeds a rate limit, it is logged in `auth.log`.
locale/gitlab.pot
View file @ 0536b808
......@@ -8517,9 +8517,6 @@ msgstr ""
msgid "Configure limit for notes created per minute by web and API requests."
msgstr ""
msgid "Configure limits for Project/Group Import/Export."
msgstr ""
msgid "Configure limits for web and API requests."
msgstr ""
......@@ -17004,6 +17001,9 @@ msgstr ""
msgid "Import an exported GitLab project"
msgstr ""
msgid "Import and export rate limits"
msgstr ""
msgid "Import failed due to a GitHub error: %{original}"
msgstr ""
......@@ -17082,9 +17082,6 @@ msgstr ""
msgid "Import timed out. Import took longer than %{import_jobs_expiration} seconds"
msgstr ""
msgid "Import/Export Rate Limits"
msgstr ""
msgid "ImportButtons|Connect repositories from"
msgstr ""
......@@ -20657,24 +20654,6 @@ msgstr ""
msgid "Max 20 characters"
msgstr ""
msgid "Max Group Export Download requests per minute per user"
msgstr ""
msgid "Max Group Export requests per minute per user"
msgstr ""
msgid "Max Group Import requests per minute per user"
msgstr ""
msgid "Max Project Export Download requests per minute per user"
msgstr ""
msgid "Max Project Export requests per minute per user"
msgstr ""
msgid "Max Project Import requests per minute per user"
msgstr ""
msgid "Max authenticated API requests per period per user"
msgstr ""
......@@ -20780,6 +20759,15 @@ msgstr ""
msgid "Maximum files in a diff"
msgstr ""
msgid "Maximum group export download requests per minute"
msgstr ""
msgid "Maximum group export requests per minute"
msgstr ""
msgid "Maximum group import requests per minute"
msgstr ""
msgid "Maximum import size"
msgstr ""
......@@ -20825,6 +20813,15 @@ msgstr ""
msgid "Maximum page size"
msgstr ""
msgid "Maximum project export download requests per minute"
msgstr ""
msgid "Maximum project export requests per minute"
msgstr ""
msgid "Maximum project import requests per minute"
msgstr ""
msgid "Maximum push size"
msgstr ""
......@@ -30631,6 +30628,9 @@ msgstr ""
msgid "Set an instance-wide domain that will be available to all clusters when installing Knative."
msgstr ""
msgid "Set any rate limit to %{code_open}0%{code_close} to disable the limit."
msgstr ""
msgid "Set default and restrict visibility levels. Configure import sources and git access protocol."
msgstr ""
......@@ -30658,6 +30658,9 @@ msgstr ""
msgid "Set parent epic to an epic"
msgstr ""
msgid "Set per-user rate limits for imports and exports of projects and groups."
msgstr ""
msgid "Set projects and maximum size limits, session duration, user options, and check feature availability for namespace plan."
msgstr ""
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7