summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEvan Read <eread@gitlab.com>2019-08-18 23:56:51 +0000
committerEvan Read <eread@gitlab.com>2019-08-18 23:56:51 +0000
commit9e26e85994ada4a4ba389f448dd041496e123546 (patch)
treed20bac0fbf8089590036efee053f71cf51123b5b
parentaa73c9e9f68986262b881fa38d8de3216a0f94d2 (diff)
parentb57e99295a2758174eca2c204faa52d4f8da99f7 (diff)
downloadgitlab-ce-9e26e85994ada4a4ba389f448dd041496e123546.tar.gz
Merge branch 'updates-rate-limit-docs' into 'master'
Mentions `auth.log` on Rate limit docs See merge request gitlab-org/gitlab-ce!31906
-rw-r--r--doc/administration/logs.md8
-rw-r--r--doc/user/admin_area/settings/rate_limits_on_raw_endpoints.md4
2 files changed, 9 insertions, 3 deletions
diff --git a/doc/administration/logs.md b/doc/administration/logs.md
index 306d611f6bf..a57ef8ddc7d 100644
--- a/doc/administration/logs.md
+++ b/doc/administration/logs.md
@@ -284,13 +284,16 @@ Introduced in GitLab 11.3. This file lives in `/var/log/gitlab/gitlab-rails/impo
Omnibus GitLab packages or in `/home/git/gitlab/log/importer.log` for
installations from source.
-## `auth.log`
+## `auth.log`
Introduced in GitLab 12.0. This file lives in `/var/log/gitlab/gitlab-rails/auth.log` for
Omnibus GitLab packages or in `/home/git/gitlab/log/auth.log` for
installations from source.
-It logs information whenever [Rack Attack] registers an abusive request.
+This log records:
+
+- Information whenever [Rack Attack] registers an abusive request.
+- Requests over the [Rate Limit] on raw endpoints.
NOTE: **Note:**
From [%12.1](https://gitlab.com/gitlab-org/gitlab-ce/issues/62756), user id and username are available on this log.
@@ -334,3 +337,4 @@ installations from source.
[repocheck]: repository_checks.md
[Rack Attack]: ../security/rack_attack.md
+[Rate Limit]: ../user/admin_area/settings/rate_limits_on_raw_endpoints.md
diff --git a/doc/user/admin_area/settings/rate_limits_on_raw_endpoints.md b/doc/user/admin_area/settings/rate_limits_on_raw_endpoints.md
index b2d56be154b..8e53a6995fb 100644
--- a/doc/user/admin_area/settings/rate_limits_on_raw_endpoints.md
+++ b/doc/user/admin_area/settings/rate_limits_on_raw_endpoints.md
@@ -9,7 +9,7 @@ type: reference
This setting allows you to rate limit the requests to raw endpoints, defaults to `300` requests per minute.
It can be modified in **Admin Area > Network > Performance Optimization**.
-For example, requests over `300` per minute to `https://gitlab.com/gitlab-org/gitlab-ce/raw/master/app/controllers/application_controller.rb` will be blocked.
+For example, requests over `300` per minute to `https://gitlab.com/gitlab-org/gitlab-ce/raw/master/app/controllers/application_controller.rb` will be blocked. Access to the raw file will be released after 1 minute.
![Rate limits on raw endpoints](img/rate_limits_on_raw_endpoints.png)
@@ -18,3 +18,5 @@ This limit is:
- Applied independently per project, per commit and per file path.
- Not applied per IP address.
- Active by default. To disable, set the option to `0`.
+
+Requests over the rate limit are logged into `auth.log`.