diff options
| author | Shinya Maeda <shinya@gitlab.com> | 2018-07-04 07:17:54 +0300 |
|---|---|---|
| committer | Shinya Maeda <shinya@gitlab.com> | 2018-07-04 07:17:54 +0300 |
| commit | f11aa51eeaa7a8175a9075ba95038c675ef9a8a6 (patch) | |
| tree | 922e35c954457ca50d4ed19e8cebe85656cec44a /doc/administration | |
| parent | 93a964d449ad29e94e785209d7ecde217a8e9b25 (diff) | |
| parent | 4c1a2a9b9977f68a05512ed1ff378ee0a2368aca (diff) | |
Merge branch 'master' into build-chunks-on-object-storage
Diffstat (limited to 'doc/administration')
| -rw-r--r-- | doc/administration/index.md | 2 | ||||
| -rw-r--r-- | doc/administration/job_artifacts.md | 4 | ||||
| -rw-r--r-- | doc/administration/monitoring/prometheus/gitlab_metrics.md | 2 |
3 files changed, 5 insertions, 3 deletions
diff --git a/doc/administration/index.md b/doc/administration/index.md index 0e65f9a9963..922cc45d8c4 100644 --- a/doc/administration/index.md +++ b/doc/administration/index.md @@ -11,7 +11,7 @@ Regular users don't have access to GitLab administration tools and settings. GitLab has two product distributions: the open source [GitLab Community Edition (CE)](https://gitlab.com/gitlab-org/gitlab-ce), and the open core [GitLab Enterprise Edition (EE)](https://gitlab.com/gitlab-org/gitlab-ee), -available through [different subscriptions](https://about.gitlab.com/products/). +available through [different subscriptions](https://about.gitlab.com/pricing/). You can [install GitLab CE or GitLab EE](https://about.gitlab.com/installation/ce-or-ee/), but the features you'll have access to depend on the subscription you choose diff --git a/doc/administration/job_artifacts.md b/doc/administration/job_artifacts.md index 1bb018e368b..10228d027e8 100644 --- a/doc/administration/job_artifacts.md +++ b/doc/administration/job_artifacts.md @@ -91,9 +91,9 @@ _The artifacts are stored by default in - [Introduced][ee-1762] in [GitLab Premium][eep] 9.4. - Since version 9.5, artifacts are [browsable], when object storage is enabled. 9.4 lacks this feature. -> Available in [GitLab Premium](https://about.gitlab.com/products/) and +> Available in [GitLab Premium](https://about.gitlab.com/pricing/) and [GitLab.com Silver](https://about.gitlab.com/gitlab-com/). -> Since version 10.6, available in [GitLab CE](https://about.gitlab.com/products/) +> Since version 10.6, available in [GitLab CE](https://about.gitlab.com/pricing/) > Since version 11.0, we support direct_upload to S3. If you don't want to use the local disk where GitLab is installed to store the diff --git a/doc/administration/monitoring/prometheus/gitlab_metrics.md b/doc/administration/monitoring/prometheus/gitlab_metrics.md index cea6764df41..c0e98099e42 100644 --- a/doc/administration/monitoring/prometheus/gitlab_metrics.md +++ b/doc/administration/monitoring/prometheus/gitlab_metrics.md @@ -48,6 +48,8 @@ The following metrics are available: | filesystem_circuitbreaker_latency_seconds | Gauge | 9.5 | Time spent validating if a storage is accessible | | filesystem_circuitbreaker | Gauge | 9.5 | Whether or not the circuit for a certain shard is broken or not | | circuitbreaker_storage_check_duration_seconds | Histogram | 10.3 | Time a single storage probe took | +| failed_login_captcha_total | Gauge | 11.0 | Counter of failed CAPTCHA attempts during login | +| successful_login_captcha_total | Gauge | 11.0 | Counter of successful CAPTCHA attempts during login | ### Ruby metrics |