diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2019-09-23 06:06:19 +0000 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2019-09-23 06:06:19 +0000 |
| commit | 89861e72b7375353654513aa2bc0a3b60a5e4377 (patch) | |
| tree | 60e5424a064977a346eaf5f06720dc74af54d720 /doc/user | |
| parent | 98dbb0a488d7b0093f352938210d9578b0f7a8a6 (diff) | |
| download | gitlab-ce-89861e72b7375353654513aa2bc0a3b60a5e4377.tar.gz | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'doc/user')
| -rw-r--r-- | doc/user/admin_area/geo_nodes.md | 4 | ||||
| -rw-r--r-- | doc/user/application_security/sast/analyzers.md | 4 | ||||
| -rw-r--r-- | doc/user/gitlab_com/index.md | 6 |
3 files changed, 7 insertions, 7 deletions
diff --git a/doc/user/admin_area/geo_nodes.md b/doc/user/admin_area/geo_nodes.md index 817b44bfdc8..bbdb9cb07a6 100644 --- a/doc/user/admin_area/geo_nodes.md +++ b/doc/user/admin_area/geo_nodes.md @@ -16,7 +16,7 @@ All Geo nodes have the following settings: | Setting | Description | | --------| ----------- | | Primary | This marks a Geo Node as **primary** node. There can be only one **primary** node; make sure that you first add the **primary** node and then all the others. | -| Name | The unique identifier for the Geo node. Must match the setting `gitlab_rails[geo_node_name]` in `/etc/gitlab/gitlab.rb`. The setting defaults to `external_url` with a trailing slash. | +| Name | The unique identifier for the Geo node. Must match the setting `gitlab_rails['geo_node_name']` in `/etc/gitlab/gitlab.rb`. The setting defaults to `external_url` with a trailing slash. | | URL | The instance's user-facing URL. | The node you're reading from is indicated with a green `Current node` label, and @@ -71,7 +71,7 @@ terminated at the load balancer. In GitLab 11.11, **secondary** nodes can use identical external URLs as long as a unique `name` is set for each Geo node. The `gitlab.rb` setting -`gitlab_rails[geo_node_name]` must: +`gitlab_rails['geo_node_name']` must: - Be set for each GitLab instance that runs `unicorn`, `sidekiq`, or `geo_logcursor`. - Match a Geo node name. diff --git a/doc/user/application_security/sast/analyzers.md b/doc/user/application_security/sast/analyzers.md index a1bd00f34e3..ca812ff2993 100644 --- a/doc/user/application_security/sast/analyzers.md +++ b/doc/user/application_security/sast/analyzers.md @@ -1,7 +1,3 @@ ---- -table_display_block: true ---- - # SAST Analyzers **(ULTIMATE)** SAST relies on underlying third party tools that are wrapped into what we call diff --git a/doc/user/gitlab_com/index.md b/doc/user/gitlab_com/index.md index 7340ba713ff..222c0f79fc6 100644 --- a/doc/user/gitlab_com/index.md +++ b/doc/user/gitlab_com/index.md @@ -180,13 +180,17 @@ and the following environment variables: | Setting | GitLab.com | Default | |-------- |----------- |-------- | | `SIDEKIQ_DAEMON_MEMORY_KILLER` | - | - | -| `SIDEKIQ_MEMORY_KILLER_MAX_RSS` | `16000000` | `2000000` | +| `SIDEKIQ_MEMORY_KILLER_MAX_RSS` | `2000000` | `2000000` | | `SIDEKIQ_MEMORY_KILLER_HARD_LIMIT_RSS` | - | - | | `SIDEKIQ_MEMORY_KILLER_CHECK_INTERVAL` | - | `3` | | `SIDEKIQ_MEMORY_KILLER_GRACE_TIME` | - | `900` | | `SIDEKIQ_MEMORY_KILLER_SHUTDOWN_WAIT` | - | `30` | | `SIDEKIQ_LOG_ARGUMENTS` | `1` | - | +NOTE: **Note:** +The `SIDEKIQ_MEMORY_KILLER_MAX_RSS` setting is `16000000` on Sidekiq import +nodes and Sidekiq export nodes. + ## Cron jobs Periodically executed jobs by Sidekiq, to self-heal GitLab, do external |