diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-04-30 12:09:39 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-04-30 12:09:39 +0300 |
| commit | ada214dc52b53bd9eb3a79c279506f91c547f721 (patch) | |
| tree | f4266ef83f9be3a62a0f8942911058758655929a /doc | |
| parent | 27b43bd4d613cc7b8773ca0863b8d8f9b90f6d87 (diff) | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'doc')
| -rw-r--r-- | doc/administration/gitaly/praefect.md | 33 | ||||
| -rw-r--r-- | doc/ci/review_apps/index.md | 2 | ||||
| -rw-r--r-- | doc/user/group/roadmap/img/roadmap_view_v12_10.png | bin | 46736 -> 0 bytes | |||
| -rw-r--r-- | doc/user/group/roadmap/img/roadmap_view_v13_0.png | bin | 0 -> 55012 bytes | |||
| -rw-r--r-- | doc/user/group/roadmap/index.md | 2 | ||||
| -rw-r--r-- | doc/user/project/settings/index.md | 5 |
6 files changed, 32 insertions, 10 deletions
diff --git a/doc/administration/gitaly/praefect.md b/doc/administration/gitaly/praefect.md index 4e1ed276c0e..3074ebddc3b 100644 --- a/doc/administration/gitaly/praefect.md +++ b/doc/administration/gitaly/praefect.md @@ -5,10 +5,30 @@ NOTE: **Note:** Praefect is a allows Gitaly to be run in a highly available configuration. While unexpected data loss is not likely, Praefect is not yet ready for production environments. -Praefect is an optional reverse-proxy for [Gitaly](../index.md) to manage a -cluster of Gitaly nodes for high availability. High availability is currently -implemented through asynchronous replication. If a Gitaly node becomes -unavailable, Praefect will automatically route traffic to a warm Gitaly replica. +[Gitaly](index.md) is the service that provides storage for Git repositories in +the GitLab application. Praefect is an optional reverse proxy for Gitaly to +manage multiple Gitaly nodes for high availability. + +High availability is currently implemented through **asynchronous replication**. +If a Gitaly node becomes unavailable, Praefect will automatically route traffic +to a warm Gitaly replica. + +- **Recovery Point Objective (RPO):** Less than 1 minute. + + Writes are replicated asynchronously. Any writes that have not been replicated + to the newly promoted primary are lost. + + [Strong Consistency](https://gitlab.com/groups/gitlab-org/-/epics/1189) is + planned to improve this to "no loss". + +- **Recovery Time Objective (RTO):** Less than 10 seconds. + + Outages are detected by a health checks run by each Praefect node every + second. Failover requires ten consecutive failed health checks on each + Praefect node. + + [Faster outage detection](https://gitlab.com/gitlab-org/gitaly/-/issues/2608) + is planned to improve this to less than 1 second. The current version supports: @@ -18,7 +38,6 @@ The current version supports: Follow the [HA Gitaly epic](https://gitlab.com/groups/gitlab-org/-/epics/1489) for improvements including -[strong consistency](https://gitlab.com/groups/gitlab-org/-/epics/1189) and [horizontally distributing reads](https://gitlab.com/groups/gitlab-org/-/epics/2013). ## Requirements for configuring Gitaly for High Availability @@ -348,7 +367,7 @@ To complete this section you will need: These should be dedicated nodes, do not run other services on these nodes. Every Gitaly server assigned to the Praefect cluster needs to be configured. The -configuration is the same as a normal [standalone Gitaly server](../index.md), +configuration is the same as a normal [standalone Gitaly server](index.md), except: - the storage names are exposed to Praefect, not GitLab @@ -428,7 +447,7 @@ documentation](index.md#3-gitaly-server-configuration). 1. Configure the GitLab Shell `secret_token`, and `internal_api_url` which are needed for `git push` operations. - If you have already configured [Gitaly on its own server](../index.md) + If you have already configured [Gitaly on its own server](index.md) ```ruby gitlab_shell['secret_token'] = 'GITLAB_SHELL_SECRET_TOKEN' diff --git a/doc/ci/review_apps/index.md b/doc/ci/review_apps/index.md index 92df3d5cd91..eb333bb66ed 100644 --- a/doc/ci/review_apps/index.md +++ b/doc/ci/review_apps/index.md @@ -205,7 +205,7 @@ if [route maps](#route-maps) are configured in the project.  -The provided script should be added to the `<head>` of you application and +The provided script should be added to the `<head>` of your application and consists of some project and merge request specific values. Here's what it looks like: diff --git a/doc/user/group/roadmap/img/roadmap_view_v12_10.png b/doc/user/group/roadmap/img/roadmap_view_v12_10.png Binary files differdeleted file mode 100644 index 69579fd1c1e..00000000000 --- a/doc/user/group/roadmap/img/roadmap_view_v12_10.png +++ /dev/null diff --git a/doc/user/group/roadmap/img/roadmap_view_v13_0.png b/doc/user/group/roadmap/img/roadmap_view_v13_0.png Binary files differnew file mode 100644 index 00000000000..a5b76b84418 --- /dev/null +++ b/doc/user/group/roadmap/img/roadmap_view_v13_0.png diff --git a/doc/user/group/roadmap/index.md b/doc/user/group/roadmap/index.md index 9f068adcd47..18b94328f9d 100644 --- a/doc/user/group/roadmap/index.md +++ b/doc/user/group/roadmap/index.md @@ -23,7 +23,7 @@ You can click the chevron **{chevron-down}** next to the epic title to expand an On top of the milestone bars, you can see their title. When you hover a milestone bar or title, a popover appears with its title, start date and due date. - + A dropdown menu allows you to show only open or closed epics. By default, all epics are shown. diff --git a/doc/user/project/settings/index.md b/doc/user/project/settings/index.md index b7b3f2a2711..0c98772237b 100644 --- a/doc/user/project/settings/index.md +++ b/doc/user/project/settings/index.md @@ -61,6 +61,7 @@ Use the switches to enable or disable the following features: | **Wiki** | ✓ | Enables a separate system for [documentation](../wiki/) | | **Snippets** | ✓ | Enables [sharing of code and text](../../snippets.md) | | **Pages** | ✓ | Allows you to [publish static websites](../pages/) | +| **Metrics Dashboard** | ✓ | Control access to [metrics dashboard](../integrations/prometheus.md) Some features depend on others: @@ -80,13 +81,15 @@ Some features depend on others: - If you disable **Repository** functionality, GitLab also disables the following features for your project: - - **Merge Requests** - **Pipelines** - **Container Registry** - **Git Large File Storage** - **Packages** +- Metrics dashboard access requires reading both project environments and deployments. + Users with access to the metrics dashboard can also access environments and deployments. + #### Disabling email notifications Project owners can disable all [email notifications](../../profile/notifications.md#gitlab-notification-emails) |
