diff options
Diffstat (limited to 'doc')
| -rw-r--r-- | doc/administration/packages/container_registry.md | 14 | ||||
| -rw-r--r-- | doc/install/aws/img/associate_subnet_gateway.png | bin | 16522 -> 0 bytes | |||
| -rw-r--r-- | doc/install/aws/img/associate_subnet_gateway_2.png | bin | 10616 -> 0 bytes | |||
| -rw-r--r-- | doc/install/aws/index.md | 49 | ||||
| -rw-r--r-- | doc/subscriptions/index.md | 32 | ||||
| -rw-r--r-- | doc/user/project/integrations/img/embed_metrics.png | bin | 102552 -> 0 bytes | |||
| -rw-r--r-- | doc/user/project/integrations/img/hide_embedded_metrics_v12_10.png | bin | 0 -> 21312 bytes | |||
| -rw-r--r-- | doc/user/project/integrations/img/view_embedded_metrics_v12_10.png | bin | 0 -> 36717 bytes | |||
| -rw-r--r-- | doc/user/project/integrations/prometheus.md | 6 |
9 files changed, 71 insertions, 30 deletions
diff --git a/doc/administration/packages/container_registry.md b/doc/administration/packages/container_registry.md index 51c03f2edd0..a798c9527b0 100644 --- a/doc/administration/packages/container_registry.md +++ b/doc/administration/packages/container_registry.md @@ -646,6 +646,13 @@ NOTE: **Note:** The garbage collection tools are only available when you've installed GitLab via an Omnibus package or the cloud native chart. +DANGER: **Danger:** +By running the built-in garbage collection command, it will cause downtime to +the Container Registry. Running this command on an instance in an HA environment +while one of your other instances is still writing to the Registry storage, +will remove referenced manifests. To avoid that, make sure Registry is set to +[read-only mode](#performing-garbage-collection-without-downtime) before proceeding. + Container Registry can use considerable amounts of disk space. To clear up some unused layers, the registry includes a garbage collect command. @@ -695,13 +702,6 @@ built-in command: specify its path. - After the garbage collection is done, the registry should start up automatically. -DANGER: **Danger:** -By running the built-in garbage collection command, it will cause downtime to -the Container Registry. Running this command on an instance in an HA environment -while one of your other instances is still writing to the Registry storage, -will remove referenced manifests. To avoid that, make sure Registry is set to -[read-only mode](#performing-garbage-collection-without-downtime) before proceeding. - If you did not change the default location of the configuration file, run: ```sh diff --git a/doc/install/aws/img/associate_subnet_gateway.png b/doc/install/aws/img/associate_subnet_gateway.png Binary files differdeleted file mode 100644 index 1edca974fca..00000000000 --- a/doc/install/aws/img/associate_subnet_gateway.png +++ /dev/null diff --git a/doc/install/aws/img/associate_subnet_gateway_2.png b/doc/install/aws/img/associate_subnet_gateway_2.png Binary files differdeleted file mode 100644 index 6e10d9647b1..00000000000 --- a/doc/install/aws/img/associate_subnet_gateway_2.png +++ /dev/null diff --git a/doc/install/aws/index.md b/doc/install/aws/index.md index ed46876619d..cafc19690d2 100644 --- a/doc/install/aws/index.md +++ b/doc/install/aws/index.md @@ -135,16 +135,6 @@ Instances deployed in our private subnets need to connect to the internet for up Create a second NAT gateway but this time place it in the second public subnet, `gitlab-public-10.0.2.0`. -### Route Table - -Up to now all our subnets are private. We need to create a Route Table -to associate an Internet Gateway. On the same VPC dashboard: - -1. Select **Route Tables** from the left menu. -1. Click **Create Route Table**. -1. At the "Name tag" enter `gitlab-public` and choose `gitlab-vpc` under "VPC". -1. Hit **Yes, Create**. - ### Internet Gateway Now, still on the same dashboard, go to Internet Gateways and @@ -160,25 +150,44 @@ create a new one: 1. Choose `gitlab-vpc` from the list and hit **Attach**. -### Configuring subnets +### Route Tables + +#### Public Route Table + +We need to create a route table for our public subnets to reach the internet via the internet gateway we created in the previous step. -We now need to add a new target which will be our Internet Gateway and have +On the VPC dashboard: + +1. Select **Route Tables** from the left menu. +1. Click **Create Route Table**. +1. At the "Name tag" enter `gitlab-public` and choose `gitlab-vpc` under "VPC". +1. Click **Create**. + +We now need to add our internet gateway as a new target and have it receive traffic from any destination. 1. Select **Route Tables** from the left menu and select the `gitlab-public` route to show the options at the bottom. -1. Select the **Routes** tab, hit **Edit > Add another route** and set `0.0.0.0/0` - as destination. In the target, select the `gitlab-gateway` we created previously. - Hit **Save** once done. - -  +1. Select the **Routes** tab, click **Edit routes > Add route** and set `0.0.0.0/0` + as the destination. In the target column, select the `gitlab-gateway` we created previously. + Hit **Save routes** once done. Next, we must associate the **public** subnets to the route table: -1. Select the **Subnet Associations** tab and hit **Edit**. -1. Check only the public subnet and hit **Save**. +1. Select the **Subnet Associations** tab and click **Edit subnet associations**. +1. Check only the public subnets and click **Save**. + +#### Private Route Tables + +We also need to create two private route tables so that instances in each private subnet can reach the internet via the NAT gateway in the corresponding public subnet in the same availability zone. -  +1. Follow the same steps as above to create two private route tables. Name them `gitlab-public-a` and `gitlab-public-b` respectively. +1. Next, add a new route to each of the private route tables where the destination is `0.0.0.0/0` and the target is one of the NAT gateways we created earlier. + 1. Add the NAT gateway we created in `gitlab-public-10.0.0.0` as the target for the new route in the `gitlab-public-a` route table. + 1. Similarly, add the NAT gateway in `gitlab-public-10.0.2.0` as the target for the new route in the `gitlab-public-b`. +1. Lastly, associate each private subnet with a private route table. + 1. Associate `gitlab-private-10.0.1.0` with `gitlab-public-a`. + 1. Associate `gitlab-private-10.0.3.0` with `gitlab-public-b`. --- diff --git a/doc/subscriptions/index.md b/doc/subscriptions/index.md index 562422c8000..e3dd46af6bf 100644 --- a/doc/subscriptions/index.md +++ b/doc/subscriptions/index.md @@ -245,11 +245,12 @@ Seat Link allows us to provide our self-managed customers with prorated charges Seat Link sends to GitLab daily a count of all users in connected self-managed instances. That information is used to automate prorated reconciliations. The data is sent securely through an encrypted HTTPS connection. -Seat Link is mandatory because we need the user count data to enable prorated billing. Seat Link provides **only** the following information to GitLab: +Seat Link provides **only** the following information to GitLab: - Date - License key - Historical maximum user count +- Active users count For air-gapped or closed network customers, the existing [true-up model](#users-over-license) will be used. Prorated charges are not possible without user count data. @@ -293,12 +294,39 @@ TjJ4eVlVUkdkWEJtDQpkSHByYWpreVJrcG9UVlo0Y0hKSU9URndiV2RzVFdO VlhHNXRhVmszTkV0SVEzcEpNMWRyZEVoRU4ydHINCmRIRnFRVTlCVUVVM1pV SlRORE4xUjFaYVJGb3JlWGM5UFZ4dUlpd2lhWFlpt2lKV00yRnNVbk5RTjJk Sg0KU1hNMGExaE9SVGR2V2pKQlBUMWNiaUo5DQo=', - max_historical_user_count: 10 + max_historical_user_count: 10, + active_users: 6 } </code></pre> </details> +#### Disable Seat Link + +Seat Link is enabled by default. To disable this feature, go to +**{admin}** **Admin Area > Settings > Metrics and profiling** and +clear the Seat Link checkbox. + +To disable Seat Link in an Omnibus GitLab installation, and prevent it from +being configured in the future through the administration panel, set the following in +[`gitlab.rb`](https://docs.gitlab.com/omnibus/settings/configuration.html#configuration-options): + +```ruby +gitlab_rails['seat_link_enabled'] = false +``` + +To disable Seat Link in a GitLab source installation, and prevent it from +being configured in the future through the administration panel, +set the following in `gitlab.yml`: + +```yaml +production: &base + # ... + gitlab: + # ... + seat_link_enabled: false +``` + ### Renew or change a GitLab.com subscription To renew for more users than are currently active in your GitLab.com system, contact our sales team via `renewals@gitlab.com` for assistance as this can't be done in the Customers Portal. diff --git a/doc/user/project/integrations/img/embed_metrics.png b/doc/user/project/integrations/img/embed_metrics.png Binary files differdeleted file mode 100644 index 6f9660c9aec..00000000000 --- a/doc/user/project/integrations/img/embed_metrics.png +++ /dev/null diff --git a/doc/user/project/integrations/img/hide_embedded_metrics_v12_10.png b/doc/user/project/integrations/img/hide_embedded_metrics_v12_10.png Binary files differnew file mode 100644 index 00000000000..1213029d1d1 --- /dev/null +++ b/doc/user/project/integrations/img/hide_embedded_metrics_v12_10.png diff --git a/doc/user/project/integrations/img/view_embedded_metrics_v12_10.png b/doc/user/project/integrations/img/view_embedded_metrics_v12_10.png Binary files differnew file mode 100644 index 00000000000..95bb148ba71 --- /dev/null +++ b/doc/user/project/integrations/img/view_embedded_metrics_v12_10.png diff --git a/doc/user/project/integrations/prometheus.md b/doc/user/project/integrations/prometheus.md index 04be63de5ea..86f00cdcc1c 100644 --- a/doc/user/project/integrations/prometheus.md +++ b/doc/user/project/integrations/prometheus.md @@ -777,7 +777,11 @@ The following requirements must be met for the metric to unfurl: If all of the above are true, then the metric will unfurl as seen below: - + + +Metric charts may also be hidden: + + ### Embedding metrics in issue templates |
