Commit ec393820 authored by Amy Qualls's avatar Amy Qualls

Decrease use of Note boxes

Flow the contents of as many Note boxes as possible back into
paragraph, list, or table content to improve readability.
parent e8062f27
...@@ -599,7 +599,6 @@ installations from source. ...@@ -599,7 +599,6 @@ installations from source.
## Unicorn Logs ## Unicorn Logs
NOTE: **Note:**
Starting with GitLab 13.0, Puma is the default web server used in GitLab Starting with GitLab 13.0, Puma is the default web server used in GitLab
all-in-one package based installations as well as GitLab Helm chart deployments. all-in-one package based installations as well as GitLab Helm chart deployments.
...@@ -674,10 +673,8 @@ This log records: ...@@ -674,10 +673,8 @@ This log records:
- Information whenever [Rack Attack](../security/rack_attack.md) registers an abusive request. - Information whenever [Rack Attack](../security/rack_attack.md) registers an abusive request.
- Requests over the [Rate Limit](../user/admin_area/settings/rate_limits_on_raw_endpoints.md) on raw endpoints. - Requests over the [Rate Limit](../user/admin_area/settings/rate_limits_on_raw_endpoints.md) on raw endpoints.
- [Protected paths](../user/admin_area/settings/protected_paths.md) abusive requests. - [Protected paths](../user/admin_area/settings/protected_paths.md) abusive requests.
- In GitLab versions [12.3](https://gitlab.com/gitlab-org/gitlab/-/issues/29239) and greater,
NOTE: **Note:** user ID and username, if available.
In GitLab versions [12.3](https://gitlab.com/gitlab-org/gitlab/-/issues/29239) and greater, user ID and username are also
recorded on this log, if available.
## `graphql_json.log` ## `graphql_json.log`
......
...@@ -17,7 +17,6 @@ or Grafana supplies package repositories (Yum/Apt) for easy installation. ...@@ -17,7 +17,6 @@ or Grafana supplies package repositories (Yum/Apt) for easy installation.
See [Grafana installation documentation](https://grafana.com/docs/grafana/latest/installation/) See [Grafana installation documentation](https://grafana.com/docs/grafana/latest/installation/)
for detailed steps. for detailed steps.
NOTE: **Note:**
Before starting Grafana for the first time, set the admin user Before starting Grafana for the first time, set the admin user
and password in `/etc/grafana/grafana.ini`. If you don't, the default password and password in `/etc/grafana/grafana.ini`. If you don't, the default password
is `admin`. is `admin`.
......
...@@ -25,7 +25,6 @@ To profile a request: ...@@ -25,7 +25,6 @@ To profile a request:
curl --header 'X-Profile-Token: <token>' --header 'X-Profile-Mode: <mode>' "https://gitlab.example.com/group/project" curl --header 'X-Profile-Token: <token>' --header 'X-Profile-Mode: <mode>' "https://gitlab.example.com/group/project"
``` ```
NOTE: **Note:**
Profiled requests can take longer than usual. Profiled requests can take longer than usual.
After the request completes, you can view the profiling output from the After the request completes, you can view the profiling output from the
......
...@@ -32,7 +32,7 @@ dashboard tool like [Grafana](https://grafana.com). ...@@ -32,7 +32,7 @@ dashboard tool like [Grafana](https://grafana.com).
## Configuring Prometheus ## Configuring Prometheus
NOTE: **Note:** NOTE: **Note:**
For installations from source, you'll have to install and configure it yourself. For installations from source, you must install and configure it yourself.
Prometheus and its exporters are on by default, starting with GitLab 9.0. Prometheus and its exporters are on by default, starting with GitLab 9.0.
Prometheus will run as the `gitlab-prometheus` user and listen on Prometheus will run as the `gitlab-prometheus` user and listen on
...@@ -179,7 +179,7 @@ The next step is to tell all the other nodes where the monitoring node is: ...@@ -179,7 +179,7 @@ The next step is to tell all the other nodes where the monitoring node is:
take effect. take effect.
NOTE: **Note:** NOTE: **Note:**
Once monitoring using Service Discovery is enabled with `consul['monitoring_service_discovery'] = true`, After monitoring using Service Discovery is enabled with `consul['monitoring_service_discovery'] = true`,
ensure that `prometheus['scrape_configs']` is not set in `/etc/gitlab/gitlab.rb`. Setting both ensure that `prometheus['scrape_configs']` is not set in `/etc/gitlab/gitlab.rb`. Setting both
`consul['monitoring_service_discovery'] = true` and `prometheus['scrape_configs']` in `/etc/gitlab/gitlab.rb` `consul['monitoring_service_discovery'] = true` and `prometheus['scrape_configs']` in `/etc/gitlab/gitlab.rb`
will result in errors. will result in errors.
...@@ -312,7 +312,6 @@ To use an external Prometheus server: ...@@ -312,7 +312,6 @@ To use an external Prometheus server:
You can visit `http://localhost:9090` for the dashboard that Prometheus offers by default. You can visit `http://localhost:9090` for the dashboard that Prometheus offers by default.
NOTE: **Note:**
If SSL has been enabled on your GitLab instance, you may not be able to access If SSL has been enabled on your GitLab instance, you may not be able to access
Prometheus on the same browser as GitLab if using the same FQDN due to [HSTS](https://en.wikipedia.org/wiki/HTTP_Strict_Transport_Security). We plan to Prometheus on the same browser as GitLab if using the same FQDN due to [HSTS](https://en.wikipedia.org/wiki/HTTP_Strict_Transport_Security). We plan to
[provide access via GitLab](https://gitlab.com/gitlab-org/multi-user-prometheus), but in the interim there are [provide access via GitLab](https://gitlab.com/gitlab-org/multi-user-prometheus), but in the interim there are
......
...@@ -10,7 +10,7 @@ The [node exporter](https://github.com/prometheus/node_exporter) enables you to ...@@ -10,7 +10,7 @@ The [node exporter](https://github.com/prometheus/node_exporter) enables you to
various machine resources such as memory, disk and CPU utilization. various machine resources such as memory, disk and CPU utilization.
NOTE: **Note:** NOTE: **Note:**
For installations from source you'll have to install and configure it yourself. For installations from source you must install and configure it yourself.
To enable the node exporter: To enable the node exporter:
......
...@@ -12,7 +12,7 @@ The [PgBouncer exporter](https://github.com/prometheus-community/pgbouncer_expor ...@@ -12,7 +12,7 @@ The [PgBouncer exporter](https://github.com/prometheus-community/pgbouncer_expor
you to measure various [PgBouncer](https://www.pgbouncer.org/) metrics. you to measure various [PgBouncer](https://www.pgbouncer.org/) metrics.
NOTE: **Note:** NOTE: **Note:**
For installations from source you'll have to install and configure it yourself. For installations from source you must install and configure it yourself.
To enable the PgBouncer exporter: To enable the PgBouncer exporter:
......
...@@ -9,7 +9,7 @@ info: To determine the technical writer assigned to the Stage/Group associated w ...@@ -9,7 +9,7 @@ info: To determine the technical writer assigned to the Stage/Group associated w
The [PostgreSQL Server Exporter](https://github.com/wrouesnel/postgres_exporter) allows you to export various PostgreSQL metrics. The [PostgreSQL Server Exporter](https://github.com/wrouesnel/postgres_exporter) allows you to export various PostgreSQL metrics.
NOTE: **Note:** NOTE: **Note:**
For installations from source you will have to install and configure it yourself. For installations from source you must install and configure it yourself.
To enable the PostgreSQL Server Exporter: To enable the PostgreSQL Server Exporter:
...@@ -20,7 +20,6 @@ To enable the PostgreSQL Server Exporter: ...@@ -20,7 +20,6 @@ To enable the PostgreSQL Server Exporter:
postgres_exporter['enable'] = true postgres_exporter['enable'] = true
``` ```
NOTE: **Note:**
If PostgreSQL Server Exporter is configured on a separate node, make sure that the local If PostgreSQL Server Exporter is configured on a separate node, make sure that the local
address is [listed in `trust_auth_cidr_addresses`](../../postgresql/replication_and_failover.md#network-information) or the address is [listed in `trust_auth_cidr_addresses`](../../postgresql/replication_and_failover.md#network-information) or the
exporter will not be able to connect to the database. exporter will not be able to connect to the database.
......
...@@ -11,7 +11,7 @@ various [Redis](https://redis.io) metrics. For more information on what is expor ...@@ -11,7 +11,7 @@ various [Redis](https://redis.io) metrics. For more information on what is expor
[read the upstream documentation](https://github.com/oliver006/redis_exporter/blob/master/README.md#whats-exported). [read the upstream documentation](https://github.com/oliver006/redis_exporter/blob/master/README.md#whats-exported).
NOTE: **Note:** NOTE: **Note:**
For installations from source you'll have to install and configure it yourself. For installations from source you must install and configure it yourself.
To enable the Redis exporter: To enable the Redis exporter:
......
...@@ -18,14 +18,11 @@ POST /environments/:id/metrics_dashboard/annotations/ ...@@ -18,14 +18,11 @@ POST /environments/:id/metrics_dashboard/annotations/
POST /clusters/:id/metrics_dashboard/annotations/ POST /clusters/:id/metrics_dashboard/annotations/
``` ```
NOTE: **Note:**
The value of `dashboard_path` will be treated as a CGI-escaped path, and automatically un-escaped.
Parameters: Parameters:
| Attribute | Type | Required | Description | | Attribute | Type | Required | Description |
|:---------------|:---------------|:---------|:-----------------------------------------------------------------------------| |:---------------|:---------------|:---------|:-----------------------------------------------------------------------------|
| `dashboard_path` | string | yes | ID of the dashboard which needs to be annotated. | | `dashboard_path` | string | yes | ID of the dashboard which needs to be annotated. Treated as a CGI-escaped path, and automatically un-escaped. |
| `starting_at` | string | yes | Date time string, ISO 8601 formatted, such as `2016-03-11T03:45:40Z`. Timestamp marking start point of annotation. | | `starting_at` | string | yes | Date time string, ISO 8601 formatted, such as `2016-03-11T03:45:40Z`. Timestamp marking start point of annotation. |
| `ending_at` | string | no | Date time string, ISO 8601 formatted, such as `2016-03-11T03:45:40Z`. Timestamp marking end point of annotation. When not supplied annotation will be displayed as single event at start point. | | `ending_at` | string | no | Date time string, ISO 8601 formatted, such as `2016-03-11T03:45:40Z`. Timestamp marking end point of annotation. When not supplied annotation will be displayed as single event at start point. |
| `description` | string | yes | Description of the annotation. | | `description` | string | yes | Description of the annotation. |
......
...@@ -6,10 +6,7 @@ info: To determine the technical writer assigned to the Stage/Group associated w ...@@ -6,10 +6,7 @@ info: To determine the technical writer assigned to the Stage/Group associated w
# Distributed Tracing - development guidelines # Distributed Tracing - development guidelines
NOTE: **Note:** GitLab is instrumented for distributed tracing. Distributed Tracing in GitLab is currently considered **experimental**, as it has not yet been tested at scale on GitLab.com.
Distributed Tracing in GitLab is currently considered **experimental**, as it has not yet been tested at scale on GitLab.com.
GitLab is instrumented for distributed tracing.
According to [Open Tracing](https://opentracing.io/docs/overview/what-is-tracing/): According to [Open Tracing](https://opentracing.io/docs/overview/what-is-tracing/):
......
...@@ -20,10 +20,8 @@ You can sign up to the cloud hosted <https://sentry.io>, deploy your own [on-pre ...@@ -20,10 +20,8 @@ You can sign up to the cloud hosted <https://sentry.io>, deploy your own [on-pre
### Enabling Sentry ### Enabling Sentry
NOTE: **Note:** GitLab provides an easy way to connect Sentry to your project. You will need at
You will need at least Maintainer [permissions](../user/permissions.md) to enable the Sentry integration. least Maintainer [permissions](../user/permissions.md) to enable the Sentry integration.
GitLab provides an easy way to connect Sentry to your project:
1. Sign up to Sentry.io or [deploy your own](#deploying-sentry) Sentry instance. 1. Sign up to Sentry.io or [deploy your own](#deploying-sentry) Sentry instance.
1. [Create](https://docs.sentry.io/product/sentry-basics/guides/integrate-frontend/create-new-project/) a new Sentry project. For each GitLab project that you want to integrate, we recommend that you create a new Sentry project. 1. [Create](https://docs.sentry.io/product/sentry-basics/guides/integrate-frontend/create-new-project/) a new Sentry project. For each GitLab project that you want to integrate, we recommend that you create a new Sentry project.
...@@ -47,9 +45,8 @@ You may also want to enable Sentry's GitLab integration by following the steps i ...@@ -47,9 +45,8 @@ You may also want to enable Sentry's GitLab integration by following the steps i
## Error Tracking List ## Error Tracking List
NOTE: **Note:** NOTE: **Note:**
You will need at least Reporter [permissions](../user/permissions.md) to view the Error Tracking list. Users with at least Reporter [permissions](../user/permissions.md)
can find the Error Tracking list at **Operations > Error Tracking** in your project's sidebar.
You can find the Error Tracking list at **Operations > Error Tracking** in your project's sidebar.
Here, you can filter errors by title or by status (one of Ignored , Resolved, or Unresolved) and sort in descending order by Frequency, First Seen, or Last Seen. By default, the error list is ordered by Last Seen and filtered to Unresolved errors. Here, you can filter errors by title or by status (one of Ignored , Resolved, or Unresolved) and sort in descending order by Frequency, First Seen, or Last Seen. By default, the error list is ordered by Last Seen and filtered to Unresolved errors.
![Error Tracking list](img/error_tracking_list_v12_6.png) ![Error Tracking list](img/error_tracking_list_v12_6.png)
......
...@@ -40,13 +40,11 @@ in GitLab to examine alerts in action. ...@@ -40,13 +40,11 @@ in GitLab to examine alerts in action.
## Enable Alerts ## Enable Alerts
NOTE: **Note:**
You need at least Maintainer [permissions](../../user/permissions.md) to enable
the Alerts feature.
There are several ways to accept alerts into your GitLab project. Enabling any There are several ways to accept alerts into your GitLab project. Enabling any
of these methods enables the Alert list. After configuring alerts, visit of these methods enables the Alert list. You need at least Maintainer
**Operations > Alerts** in your project's sidebar to view the list of alerts. [permissions](../../user/permissions.md) to enable the Alerts feature. After
configuring alerts, visit **Operations > Alerts** in your project's sidebar to view
the list of alerts.
### Enable GitLab-managed Prometheus alerts ### Enable GitLab-managed Prometheus alerts
...@@ -83,7 +81,6 @@ for requests to the alerts endpoint. ...@@ -83,7 +81,6 @@ for requests to the alerts endpoint.
You can monitor alerts using a GitLab integration with [Opsgenie](https://www.atlassian.com/software/opsgenie). You can monitor alerts using a GitLab integration with [Opsgenie](https://www.atlassian.com/software/opsgenie).
NOTE: **Note:**
If you enable the Opsgenie integration, you can't have other GitLab alert If you enable the Opsgenie integration, you can't have other GitLab alert
services, such as [Generic Alerts](generic_alerts.md) or Prometheus alerts, services, such as [Generic Alerts](generic_alerts.md) or Prometheus alerts,
active at the same time. active at the same time.
...@@ -168,14 +165,12 @@ about alert statuses. ...@@ -168,14 +165,12 @@ about alert statuses.
> [Introduced](https://gitlab.com/groups/gitlab-org/-/epics/3066) in GitLab 13.1. > [Introduced](https://gitlab.com/groups/gitlab-org/-/epics/3066) in GitLab 13.1.
The Alert detail view allows users to update the Alert assignee. The Alert detail view allows users to update the Alert assignee.
GitLab supports only a single assignee per alert.
In large teams, where there is shared ownership of an alert, it can be In large teams, where there is shared ownership of an alert, it can be
difficult to track who is investigating and working on it. The Alert detail difficult to track who is investigating and working on it. The Alert detail
view enables you to update the Alert assignee: view enables you to update the Alert assignee:
NOTE: **Note:**
GitLab supports only a single assignee per alert.
1. To display the list of current alerts, navigate to **Operations > Alerts**: 1. To display the list of current alerts, navigate to **Operations > Alerts**:
![Alert List View Assignee(s)](./img/alert_list_assignees_v13_1.png) ![Alert List View Assignee(s)](./img/alert_list_assignees_v13_1.png)
......
...@@ -45,13 +45,12 @@ The Incident list displays incidents sorted by incident created date. ...@@ -45,13 +45,12 @@ The Incident list displays incidents sorted by incident created date.
To see if a column is sortable, point your mouse at the header. Sortable columns To see if a column is sortable, point your mouse at the header. Sortable columns
display an arrow next to the column name. display an arrow next to the column name.
Incidents share the [Issues API](../../user/project/issues/index.md).
TIP: **Tip:** TIP: **Tip:**
For a live example of the incident list in action, visit this For a live example of the incident list in action, visit this
[demo project](https://gitlab.com/gitlab-examples/ops/incident-setup/everyone/tanuki-inc/-/incidents). [demo project](https://gitlab.com/gitlab-examples/ops/incident-setup/everyone/tanuki-inc/-/incidents).
NOTE: **Note:**
Incidents share the [Issues API](../../user/project/issues/index.md).
## Configure incidents ## Configure incidents
> [Introduced](https://gitlab.com/gitlab-org/gitlab/-/issues/4925) in GitLab Ultimate 11.11. > [Introduced](https://gitlab.com/gitlab-org/gitlab/-/issues/4925) in GitLab Ultimate 11.11.
......
...@@ -37,11 +37,10 @@ To configure a GitLab Status Page you must: ...@@ -37,11 +37,10 @@ To configure a GitLab Status Page you must:
### Configure GitLab with cloud provider information ### Configure GitLab with cloud provider information
To provide GitLab with the AWS account information needed to push content to your Status Page:
NOTE: **Note:**
Only AWS S3 is supported as a deploy target. Only AWS S3 is supported as a deploy target.
To provide GitLab with the AWS account information needed to push content to your Status Page:
1. Sign into GitLab as a user with Maintainer or greater [permissions](../../user/permissions.md). 1. Sign into GitLab as a user with Maintainer or greater [permissions](../../user/permissions.md).
1. Navigate to **{settings}** **Settings > Operations**. Next to **Status Page**, 1. Navigate to **{settings}** **Settings > Operations**. Next to **Status Page**,
click **Expand**. click **Expand**.
...@@ -74,8 +73,6 @@ the necessary CI/CD variables to deploy the Status Page to AWS S3: ...@@ -74,8 +73,6 @@ the necessary CI/CD variables to deploy the Status Page to AWS S3:
1. Scroll to **Variables**, and click **Expand**. 1. Scroll to **Variables**, and click **Expand**.
1. Add the following variables from your Amazon Console: 1. Add the following variables from your Amazon Console:
- `S3_BUCKET_NAME` - The name of the Amazon S3 bucket. - `S3_BUCKET_NAME` - The name of the Amazon S3 bucket.
NOTE: **Note:**
If no bucket with the provided name exists, the first pipeline run creates If no bucket with the provided name exists, the first pipeline run creates
one and configures it for one and configures it for
[static website hosting](https://docs.aws.amazon.com/AmazonS3/latest/dev/HostingWebsiteOnS3Setup.html). [static website hosting](https://docs.aws.amazon.com/AmazonS3/latest/dev/HostingWebsiteOnS3Setup.html).
...@@ -128,10 +125,7 @@ To publish an incident: ...@@ -128,10 +125,7 @@ To publish an incident:
1. Create an issue in the project you enabled the GitLab Status Page settings in. 1. Create an issue in the project you enabled the GitLab Status Page settings in.
1. A [project or group owner](../../user/permissions.md) must use the 1. A [project or group owner](../../user/permissions.md) must use the
`/publish` [quick action](../../user/project/quick_actions.md) to publish the `/publish` [quick action](../../user/project/quick_actions.md) to publish the
issue to the GitLab Status Page. issue to the GitLab Status Page. Confidential issues can't be published.
NOTE: **Note:**
Confidential issues can't be published.
A background worker publishes the issue onto the Status Page using the credentials A background worker publishes the issue onto the Status Page using the credentials
you provided during setup. As part of publication, GitLab will: you provided during setup. As part of publication, GitLab will:
......
...@@ -78,7 +78,6 @@ For GitLab to associate your alerts with an [environment](../../ci/environments/ ...@@ -78,7 +78,6 @@ For GitLab to associate your alerts with an [environment](../../ci/environments/
you must configure a `gitlab_environment_name` label on the alerts you set up in you must configure a `gitlab_environment_name` label on the alerts you set up in
Prometheus. The value of this should match the name of your environment in GitLab. Prometheus. The value of this should match the name of your environment in GitLab.
NOTE: **Note:**
In GitLab versions 13.1 and greater, you can configure your manually configured In GitLab versions 13.1 and greater, you can configure your manually configured
Prometheus server to use the Prometheus server to use the
[Generic alerts integration](../incident_management/generic_alerts.md). [Generic alerts integration](../incident_management/generic_alerts.md).
......
...@@ -25,7 +25,6 @@ metrics about the [deployed application](../index.md#configure-prometheus-to-gat ...@@ -25,7 +25,6 @@ metrics about the [deployed application](../index.md#configure-prometheus-to-gat
## Kubernetes pod health dashboard ## Kubernetes pod health dashboard
NOTE: **Note:**
This dashboard requires Kubernetes v1.14 or higher, due to the This dashboard requires Kubernetes v1.14 or higher, due to the
[change in metric labels](https://github.com/kubernetes/kubernetes/pull/69099) [change in metric labels](https://github.com/kubernetes/kubernetes/pull/69099)
in Kubernetes 1.14. in Kubernetes 1.14.
......
...@@ -14,7 +14,6 @@ includes a few key metrics, but you can also define your own custom dashboards. ...@@ -14,7 +14,6 @@ includes a few key metrics, but you can also define your own custom dashboards.
You may create a [new dashboard from scratch](#add-a-new-dashboard-to-your-project) You may create a [new dashboard from scratch](#add-a-new-dashboard-to-your-project)
or [duplicate a GitLab-defined Prometheus dashboard](#duplicate-a-gitlab-defined-dashboard). or [duplicate a GitLab-defined Prometheus dashboard](#duplicate-a-gitlab-defined-dashboard).
NOTE: **Note:**
The metrics as defined below do not support alerts, unlike The metrics as defined below do not support alerts, unlike
[custom metrics](../index.md#adding-custom-metrics). [custom metrics](../index.md#adding-custom-metrics).
...@@ -86,7 +85,7 @@ with the **Add Panel** page: ...@@ -86,7 +85,7 @@ with the **Add Panel** page:
1. Click **Add panel** in the **{ellipsis_v}** **More actions** menu. 1. Click **Add panel** in the **{ellipsis_v}** **More actions** menu.
NOTE: **Note:** NOTE: **Note:**
You can add panel only to custom dashboards. You can only add panels to custom dashboards.
![Monitoring Dashboard actions menu with add panel item](img/actions_menu_create_add_panel_v13_3.png) ![Monitoring Dashboard actions menu with add panel item](img/actions_menu_create_add_panel_v13_3.png)
1. In the **Define and preview panel** section, paste in the YAML you want to 1. In the **Define and preview panel** section, paste in the YAML you want to
...@@ -100,16 +99,12 @@ with the **Add Panel** page: ...@@ -100,16 +99,12 @@ with the **Add Panel** page:
> - [Introduced](https://gitlab.com/gitlab-org/gitlab/-/issues/37238) in GitLab 12.7. > - [Introduced](https://gitlab.com/gitlab-org/gitlab/-/issues/37238) in GitLab 12.7.
> - From [GitLab 12.8 onwards](https://gitlab.com/gitlab-org/gitlab/-/issues/39505), custom metrics are also duplicated when you duplicate a dashboard. > - From [GitLab 12.8 onwards](https://gitlab.com/gitlab-org/gitlab/-/issues/39505), custom metrics are also duplicated when you duplicate a dashboard.
You can save a complete copy of a GitLab defined dashboard along with all custom metrics added to it. You can save a complete copy of a GitLab-defined dashboard along with all custom metrics added to it.
The resulting `.yml` file can be customized and adapted to your project. The resulting `.yml` file can be customized and adapted to your project.
You can decide to save the dashboard `.yml` file in the project's **default** branch or in a You can decide to save the dashboard `.yml` file in the project's **default** branch or in a
new branch. new branch. To duplicate a GitLab-defined dashboard:
1. Click **Duplicate current dashboard** in the **{ellipsis_v}** **More actions** menu. 1. Click **Duplicate current dashboard** in the **{ellipsis_v}** **More actions** menu.
NOTE: **Note:**
You can duplicate only GitLab-defined dashboards.
1. Enter the filename and other information, such as the new commit's message, and click **Duplicate**. 1. Enter the filename and other information, such as the new commit's message, and click **Duplicate**.
1. Select a branch to add your dashboard to: 1. Select a branch to add your dashboard to:
- *If you select your **default** branch,* the new dashboard becomes immediately available. - *If you select your **default** branch,* the new dashboard becomes immediately available.
......
...@@ -16,7 +16,10 @@ Queries that continue to use the old format will show no data. ...@@ -16,7 +16,10 @@ Queries that continue to use the old format will show no data.
## Predefined variables ## Predefined variables
GitLab supports a limited set of [CI variables](../../../ci/variables/README.md) in the Prometheus query. This is particularly useful for identifying a specific environment, for example with `ci_environment_slug`. The supported variables are: GitLab supports a limited set of [CI variables](../../../ci/variables/README.md)
in the Prometheus query. This is particularly useful for identifying a specific
environment, for example with `ci_environment_slug`. Variables for Prometheus queries
must be lowercase. The supported variables are:
- `environment_filter` - `environment_filter`
- `ci_environment_slug` - `ci_environment_slug`
...@@ -27,9 +30,6 @@ GitLab supports a limited set of [CI variables](../../../ci/variables/README.md) ...@@ -27,9 +30,6 @@ GitLab supports a limited set of [CI variables](../../../ci/variables/README.md)
- `ci_environment_name` - `ci_environment_name`
- `__range` - `__range`
NOTE: **Note:**
Variables for Prometheus queries must be lowercase.
### environment_filter ### environment_filter
`environment_filter` is automatically expanded to `container_name!="POD",environment="ENVIRONMENT_NAME"` `environment_filter` is automatically expanded to `container_name!="POD",environment="ENVIRONMENT_NAME"`
......
...@@ -17,8 +17,7 @@ metrics to others, and you want to have relevant information directly available. ...@@ -17,8 +17,7 @@ metrics to others, and you want to have relevant information directly available.
> [Introduced](https://gitlab.com/gitlab-org/gitlab-foss/-/merge_requests/29691) in GitLab 12.2. > [Introduced](https://gitlab.com/gitlab-org/gitlab-foss/-/merge_requests/29691) in GitLab 12.2.
NOTE: **Note:** This feature requires [Kubernetes](../../user/project/integrations/prometheus_library/kubernetes.md) metrics.
Requires [Kubernetes](../../user/project/integrations/prometheus_library/kubernetes.md) metrics.
Note: **Note:** Note: **Note:**
In GitLab versions 13.3 and earlier, metrics dashboard links were in the form In GitLab versions 13.3 and earlier, metrics dashboard links were in the form
......
...@@ -12,14 +12,13 @@ Grafana metrics can be embedded in [GitLab Flavored Markdown](../../user/markdow ...@@ -12,14 +12,13 @@ Grafana metrics can be embedded in [GitLab Flavored Markdown](../../user/markdow
You can embed live [Grafana](https://docs.gitlab.com/omnibus/settings/grafana.html) You can embed live [Grafana](https://docs.gitlab.com/omnibus/settings/grafana.html)
charts in issues as a charts in issues as a
[direct linked rendered image](https://grafana.com/docs/grafana/latest/reference/share_panel/#direct-link-rendered-image). [direct linked rendered image](https://grafana.com/docs/grafana/latest/reference/share_panel/#direct-link-rendered-image). Your Grafana instance must be available to the
The **Direct link rendered image** sharing dialog within Grafana provides the link: target user, either as a public dashboard or on the same network. The
**Direct link rendered image** sharing dialog within Grafana provides the link:
![Grafana Direct Linked Rendered Image](img/grafana_live_embed.png) ![Grafana Direct Linked Rendered Image](img/grafana_live_embed.png)
NOTE: **Note:** For this embed to display correctly, the
For this embed to display correctly, the Grafana instance must be available to the
target user, either as a public dashboard or on the same network.
Copy the link and add an image tag as [inline HTML](../../user/markdown.md#inline-html) Copy the link and add an image tag as [inline HTML](../../user/markdown.md#inline-html)
in your Markdown. You can tweak the query parameters to meet your needs, such as in your Markdown. You can tweak the query parameters to meet your needs, such as
......
...@@ -55,7 +55,6 @@ Currently, GitLab supports the following Kubernetes versions: ...@@ -55,7 +55,6 @@ Currently, GitLab supports the following Kubernetes versions:
- 1.14 - 1.14
- 1.13 (deprecated, support ends on November 22, 2020) - 1.13 (deprecated, support ends on November 22, 2020)
NOTE: **Note:**
Some GitLab features may support versions outside the range provided here. Some GitLab features may support versions outside the range provided here.
### Adding and removing clusters ### Adding and removing clusters
...@@ -195,7 +194,6 @@ To clear the cache: ...@@ -195,7 +194,6 @@ To clear the cache:
> [Introduced](https://gitlab.com/gitlab-org/gitlab-foss/-/merge_requests/24580) in GitLab 11.8. > [Introduced](https://gitlab.com/gitlab-org/gitlab-foss/-/merge_requests/24580) in GitLab 11.8.
NOTE: **Note:**
You do not need to specify a base domain on cluster settings when using GitLab Serverless. The domain in that case You do not need to specify a base domain on cluster settings when using GitLab Serverless. The domain in that case
will be specified as part of the Knative installation. See [Installing Applications](#installing-applications). will be specified as part of the Knative installation. See [Installing Applications](#installing-applications).
...@@ -223,13 +221,11 @@ Auto DevOps automatically detects, builds, tests, deploys, and monitors your ...@@ -223,13 +221,11 @@ Auto DevOps automatically detects, builds, tests, deploys, and monitors your
applications. applications.
To make full use of Auto DevOps (Auto Deploy, Auto Review Apps, and To make full use of Auto DevOps (Auto Deploy, Auto Review Apps, and
Auto Monitoring) you will need the Kubernetes project integration enabled. Auto Monitoring) you will need the Kubernetes project integration enabled, but
Kubernetes clusters can be used without Auto DevOps.
[Read more about Auto DevOps](../../../topics/autodevops/index.md) [Read more about Auto DevOps](../../../topics/autodevops/index.md)
NOTE: **Note:**
Kubernetes clusters can be used without Auto DevOps.
## Deploying to a Kubernetes cluster ## Deploying to a Kubernetes cluster
A Kubernetes cluster can be the destination for a deployment job. If A Kubernetes cluster can be the destination for a deployment job. If
...@@ -252,20 +248,13 @@ GitLab CI/CD build environment. ...@@ -252,20 +248,13 @@ GitLab CI/CD build environment.
| Variable | Description | | Variable | Description |
| -------- | ----------- | | -------- | ----------- |
| `KUBE_URL` | Equal to the API URL. | | `KUBE_URL` | Equal to the API URL. |
| `KUBE_TOKEN` | The Kubernetes token of the [environment service account](add_remove_clusters.md#access-controls). | | `KUBE_TOKEN` | The Kubernetes token of the [environment service account](add_remove_clusters.md#access-controls). Prior to GitLab 11.5, `KUBE_TOKEN` was the Kubernetes token of the main service account of the cluster integration. |
| `KUBE_NAMESPACE` | The namespace associated with the project's deployment service account. In the format `<project_name>-<project_id>-<environment>`. For GitLab-managed clusters, a matching namespace is automatically created by GitLab in the cluster. | | `KUBE_NAMESPACE` | The namespace associated with the project's deployment service account. In the format `<project_name>-<project_id>-<environment>`. For GitLab-managed clusters, a matching namespace is automatically created by GitLab in the cluster. If your cluster was created before GitLab 12.2, the default `KUBE_NAMESPACE` is set to `<project_name>-<project_id>`. |
| `KUBE_CA_PEM_FILE` | Path to a file containing PEM data. Only present if a custom CA bundle was specified. | | `KUBE_CA_PEM_FILE` | Path to a file containing PEM data. Only present if a custom CA bundle was specified. |
| `KUBE_CA_PEM` | (**deprecated**) Raw PEM data. Only if a custom CA bundle was specified. | | `KUBE_CA_PEM` | (**deprecated**) Raw PEM data. Only if a custom CA bundle was specified. |
| `KUBECONFIG` | Path to a file containing `kubeconfig` for this deployment. CA bundle would be embedded if specified. This config also embeds the same token defined in `KUBE_TOKEN` so you likely will only need this variable. This variable name is also automatically picked up by `kubectl` so you won't actually need to reference it explicitly if using `kubectl`. | | `KUBECONFIG` | Path to a file containing `kubeconfig` for this deployment. CA bundle would be embedded if specified. This config also embeds the same token defined in `KUBE_TOKEN` so you likely will only need this variable. This variable name is also automatically picked up by `kubectl` so you won't actually need to reference it explicitly if using `kubectl`. |
| `KUBE_INGRESS_BASE_DOMAIN` | From GitLab 11.8, this variable can be used to set a domain per cluster. See [cluster domains](#base-domain) for more information. | | `KUBE_INGRESS_BASE_DOMAIN` | From GitLab 11.8, this variable can be used to set a domain per cluster. See [cluster domains](#base-domain) for more information. |
NOTE: **Note:**
Prior to GitLab 11.5, `KUBE_TOKEN` was the Kubernetes token of the main
service account of the cluster integration.
NOTE: **Note:**
If your cluster was created before GitLab 12.2, default `KUBE_NAMESPACE` will be set to `<project_name>-<project_id>`.
### Custom namespace ### Custom namespace
> - [Introduced](https://gitlab.com/gitlab-org/gitlab/-/issues/27630) in GitLab 12.6. > - [Introduced](https://gitlab.com/gitlab-org/gitlab/-/issues/27630) in GitLab 12.6.
...@@ -290,7 +279,6 @@ You can customize the deployment namespace in a few ways: ...@@ -290,7 +279,6 @@ You can customize the deployment namespace in a few ways:
[`environment:kubernetes:namespace`](../../../ci/environments/index.md#configuring-kubernetes-deployments) [`environment:kubernetes:namespace`](../../../ci/environments/index.md#configuring-kubernetes-deployments)
in `.gitlab-ci.yml`. in `.gitlab-ci.yml`.
NOTE: **Note:**
When you customize the namespace, existing environments remain linked to their current When you customize the namespace, existing environments remain linked to their current
namespaces until you [clear the cluster cache](#clearing-the-cluster-cache). namespaces until you [clear the cluster cache](#clearing-the-cluster-cache).
......
...@@ -28,7 +28,6 @@ above the log file data, depending on your configuration: ...@@ -28,7 +28,6 @@ above the log file data, depending on your configuration:
<i class="fa fa-youtube-play youtube" aria-hidden="true"></i> <i class="fa fa-youtube-play youtube" aria-hidden="true"></i>
To learn more about the Log Explorer, see [APM - Log Explorer](https://www.youtube.com/watch?v=hWclZHA7Dgw). To learn more about the Log Explorer, see [APM - Log Explorer](https://www.youtube.com/watch?v=hWclZHA7Dgw).
NOTE: **Note:**
[Learn more about Kubernetes + GitLab](https://about.gitlab.com/solutions/kubernetes/). [Learn more about Kubernetes + GitLab](https://about.gitlab.com/solutions/kubernetes/).
Everything you need to build, test, deploy, and run your application at scale. Everything you need to build, test, deploy, and run your application at scale.
......
...@@ -8,11 +8,11 @@ info: To determine the technical writer assigned to the Stage/Group associated w ...@@ -8,11 +8,11 @@ info: To determine the technical writer assigned to the Stage/Group associated w
> [Introduced](https://gitlab.com/gitlab-org/gitlab-foss/-/merge_requests/22133) in GitLab 11.7. > [Introduced](https://gitlab.com/gitlab-org/gitlab-foss/-/merge_requests/22133) in GitLab 11.7.
GitLab has support for automatically detecting and monitoring the Kubernetes NGINX Ingress controller. This is provided by leveraging the built-in Prometheus metrics included with Kubernetes NGINX Ingress controller [version 0.16.0](https://github.com/kubernetes/ingress-nginx/blob/master/Changelog.md#0160) onward.
NOTE: **Note:** NOTE: **Note:**
NGINX Ingress versions prior to 0.16.0 offer an included [VTS Prometheus metrics exporter](nginx_ingress_vts.md), which exports metrics different than the built-in metrics. NGINX Ingress versions prior to 0.16.0 offer an included [VTS Prometheus metrics exporter](nginx_ingress_vts.md), which exports metrics different than the built-in metrics.
GitLab has support for automatically detecting and monitoring the Kubernetes NGINX Ingress controller. This is provided by leveraging the built-in Prometheus metrics included with Kubernetes NGINX Ingress controller [version 0.16.0](https://github.com/kubernetes/ingress-nginx/blob/master/Changelog.md#0160) onward.
## Requirements ## Requirements
[Prometheus integration](../prometheus.md) must be active. [Prometheus integration](../prometheus.md) must be active.
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment