diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2023-06-19 18:09:36 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2023-06-19 18:09:36 +0300 |
commit | 8bb837c4d180720d4d923ef2e7bd2c9a46ca97a0 (patch) | |
tree | 7dcb166661ba29fb6cd5935f0db34eee6c935388 /doc | |
parent | eef2437c0a359ec3437d31d1b1ea959e54c71458 (diff) |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'doc')
-rw-r--r-- | doc/ci/environments/index.md | 26 | ||||
-rw-r--r-- | doc/ci/img/environments_monitoring.png | bin | 45153 -> 0 bytes | |||
-rw-r--r-- | doc/development/gems.md | 2 | ||||
-rw-r--r-- | doc/topics/autodevops/img/auto_monitoring.png | bin | 26675 -> 0 bytes | |||
-rw-r--r-- | doc/topics/autodevops/index.md | 1 | ||||
-rw-r--r-- | doc/topics/autodevops/prepare_deployment.md | 3 | ||||
-rw-r--r-- | doc/topics/autodevops/requirements.md | 15 | ||||
-rw-r--r-- | doc/topics/autodevops/stages.md | 28 |
8 files changed, 20 insertions, 55 deletions
diff --git a/doc/ci/environments/index.md b/doc/ci/environments/index.md index 50eae65ad76..f2fb8eaa27e 100644 --- a/doc/ci/environments/index.md +++ b/doc/ci/environments/index.md @@ -733,7 +733,7 @@ to get alerts when there are critical issues that need immediate attention. > [Introduced](https://gitlab.com/gitlab-org/gitlab/-/issues/214634) in GitLab 13.4. -If you [set up alerts for Prometheus metrics](../../operations/metrics/alerts.md), +If you [set up alerts for Prometheus metrics](../../operations/incident_management/integrations.md#configuration), alerts for environments are shown on the environments page. The alert with the highest severity is shown, so you can identify which environments need immediate attention. @@ -773,28 +773,14 @@ GitLab Auto Rollback is turned off by default. To turn it on: 1. Select the checkbox for **Enable automatic rollbacks**. 1. Select **Save changes**. -### Monitor environments +<!--- start_remove The following content will be removed on remove_date: '2023-09-22' --> -To monitor the behavior of your app as it runs in each environment, -enable [Prometheus for monitoring system and response metrics](../../user/project/integrations/prometheus.md). -For the monitoring dashboard to appear, configure Prometheus to collect at least one -[supported metric](../../user/project/integrations/prometheus_library/index.md). +### Monitor environments (removed) -All deployments to an environment are shown on the monitoring dashboard. -You can view changes in performance for each version of your application. +This feature was [deprecated](https://gitlab.com/groups/gitlab-org/-/epics/10107) in GitLab 14.7 +and [removed](https://gitlab.com/gitlab-org/gitlab/-/issues/399231) in 16.0. -GitLab attempts to retrieve [supported performance metrics](../../user/project/integrations/prometheus_library/index.md) -for any environment that has had a successful deployment. If monitoring data was -successfully retrieved, a **Monitoring** button appears for each environment. - -To view the last eight hours of performance data, select the **Monitoring** button. -It may take a minute or two for data to appear after initial deployment. - -![Monitoring dashboard](../img/environments_monitoring.png) - -#### Embed metrics in GitLab Flavored Markdown - -Metric charts can be embedded in GitLab Flavored Markdown. See [Embedding Metrics in GitLab Flavored Markdown](../../operations/metrics/embed.md) for more details. +<!--- end_remove --> ### Web terminals (deprecated) diff --git a/doc/ci/img/environments_monitoring.png b/doc/ci/img/environments_monitoring.png Binary files differdeleted file mode 100644 index 63d272ae42a..00000000000 --- a/doc/ci/img/environments_monitoring.png +++ /dev/null diff --git a/doc/development/gems.md b/doc/development/gems.md index 709dfa105bf..4a332a28f62 100644 --- a/doc/development/gems.md +++ b/doc/development/gems.md @@ -156,7 +156,7 @@ You can see example adding new Gem: [!121676](https://gitlab.com/gitlab-org/gitl paths: - gitlab-<name-of-gem>/vendor/ruby before_script: - - cd vendor/gems/bundler-checksum + - cd gems/gitlab-<name-of-gem> - ruby -v # Print out ruby version for debugging - gem install bundler --no-document # Bundler is not installed with the image - bundle config set --local path 'vendor' # Install dependencies into ./vendor/ruby diff --git a/doc/topics/autodevops/img/auto_monitoring.png b/doc/topics/autodevops/img/auto_monitoring.png Binary files differdeleted file mode 100644 index 2900e5d1877..00000000000 --- a/doc/topics/autodevops/img/auto_monitoring.png +++ /dev/null diff --git a/doc/topics/autodevops/index.md b/doc/topics/autodevops/index.md index d51899ee7ca..10979f0bb21 100644 --- a/doc/topics/autodevops/index.md +++ b/doc/topics/autodevops/index.md @@ -40,7 +40,6 @@ Auto DevOps supports development during each of the [DevOps stages](stages.md). | Test | [Auto License Compliance](stages.md#auto-license-compliance) | | Deploy | [Auto Review Apps](stages.md#auto-review-apps) | | Deploy | [Auto Deploy](stages.md#auto-deploy) | -| Monitor | [Auto Monitoring](stages.md#auto-monitoring) | | Secure | [Auto Dynamic Application Security Testing (DAST)](stages.md#auto-dast) | | Secure | [Auto Static Application Security Testing (SAST)](stages.md#auto-sast) | | Secure | [Auto Secret Detection](stages.md#auto-secret-detection) | diff --git a/doc/topics/autodevops/prepare_deployment.md b/doc/topics/autodevops/prepare_deployment.md index 6f434e8fb84..b71beee708e 100644 --- a/doc/topics/autodevops/prepare_deployment.md +++ b/doc/topics/autodevops/prepare_deployment.md @@ -37,8 +37,7 @@ to minimize downtime and risk. ## Auto DevOps base domain The Auto DevOps base domain is required to use -[Auto Review Apps](stages.md#auto-review-apps), [Auto Deploy](stages.md#auto-deploy), and -[Auto Monitoring](stages.md#auto-monitoring). +[Auto Review Apps](stages.md#auto-review-apps) and [Auto Deploy](stages.md#auto-deploy). To define the base domain, either: diff --git a/doc/topics/autodevops/requirements.md b/doc/topics/autodevops/requirements.md index ce53fe26868..dd73a2056e5 100644 --- a/doc/topics/autodevops/requirements.md +++ b/doc/topics/autodevops/requirements.md @@ -54,8 +54,7 @@ to minimize downtime and risk. ## Auto DevOps base domain The Auto DevOps base domain is required to use -[Auto Review Apps](stages.md#auto-review-apps), [Auto Deploy](stages.md#auto-deploy), and -[Auto Monitoring](stages.md#auto-monitoring). +[Auto Review Apps](stages.md#auto-review-apps) and [Auto Deploy](stages.md#auto-deploy). To define the base domain, either: @@ -91,8 +90,8 @@ to the Kubernetes pods running your application. To make full use of Auto DevOps with Kubernetes, you need: -- **Kubernetes** (for [Auto Review Apps](stages.md#auto-review-apps), - [Auto Deploy](stages.md#auto-deploy), and [Auto Monitoring](stages.md#auto-monitoring)) +- **Kubernetes** (for [Auto Review Apps](stages.md#auto-review-apps) and + [Auto Deploy](stages.md#auto-deploy)) To enable deployments, you need: @@ -117,8 +116,8 @@ To make full use of Auto DevOps with Kubernetes, you need: If your cluster is installed on bare metal, see [Auto DevOps Requirements for bare metal](#auto-devops-requirements-for-bare-metal). -- **Base domain** (for [Auto Review Apps](stages.md#auto-review-apps), - [Auto Deploy](stages.md#auto-deploy), and [Auto Monitoring](stages.md#auto-monitoring)) +- **Base domain** (for [Auto Review Apps](stages.md#auto-review-apps) and + [Auto Deploy](stages.md#auto-deploy)) You must [specify the Auto DevOps base domain](#auto-devops-base-domain), which all of your Auto DevOps applications use. This domain must be configured @@ -148,8 +147,8 @@ To make full use of Auto DevOps with Kubernetes, you need: certificates are valid and up-to-date. If you don't have Kubernetes or Prometheus configured, then -[Auto Review Apps](stages.md#auto-review-apps), -[Auto Deploy](stages.md#auto-deploy), and [Auto Monitoring](stages.md#auto-monitoring) +[Auto Review Apps](stages.md#auto-review-apps) and +[Auto Deploy](stages.md#auto-deploy) are skipped. After all requirements are met, you can [enable Auto DevOps](index.md#enable-or-disable-auto-devops). diff --git a/doc/topics/autodevops/stages.md b/doc/topics/autodevops/stages.md index c95426b03e6..6be8a71cdbc 100644 --- a/doc/topics/autodevops/stages.md +++ b/doc/topics/autodevops/stages.md @@ -591,32 +591,14 @@ When using Cloud Native Buildpacks, instead of `/bin/herokuish procfile exec`, u /cnb/lifecycle/launcher $COMMAND ``` -## Auto Monitoring +<!--- start_remove The following content will be removed on remove_date: '2023-09-22' --> -After your application deploys, Auto Monitoring helps you monitor -your application's server and response metrics right out of the box. Auto -Monitoring uses [Prometheus](../../user/project/integrations/prometheus.md) to -retrieve system metrics, such as CPU and memory usage, directly from -[Kubernetes](../../user/project/integrations/prometheus_library/kubernetes.md), -and response metrics, such as HTTP error rates, latency, and throughput, from the -[NGINX server](../../user/project/integrations/prometheus_library/nginx_ingress.md). +### Auto Monitoring (removed) -The metrics include: +This feature was [deprecated](https://gitlab.com/groups/gitlab-org/-/epics/10107) in GitLab 14.7 +and [removed](https://gitlab.com/gitlab-org/gitlab/-/issues/399231) in 16.0. -- **Response Metrics:** latency, throughput, error rate -- **System Metrics:** CPU utilization, memory utilization - -To use Auto Monitoring: - -1. [Install and configure the Auto DevOps requirements](requirements.md). -1. [Enable Auto DevOps](index.md#enable-or-disable-auto-devops), if you haven't done already. -1. On the left sidebar, select **CI/CD > Pipelines**. -1. Select **Run pipeline**. -1. After the pipeline finishes successfully, open the - [monitoring dashboard for a deployed environment](../../ci/environments/index.md#monitor-environments) - to view the metrics of your deployed application. - -![Auto Metrics](img/auto_monitoring.png) +<!--- end_remove --> ## Auto Code Intelligence |