diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-05-06 09:09:36 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-05-06 09:09:36 +0300 |
commit | 0c4b9cacd575b3e71e41a13f042062b3adcb4caf (patch) | |
tree | fd06e55f276c1fa42327a41860e328b46a8cb8ee /doc | |
parent | 6c005ae9783ad6752e3082d05e1053d20d8da92a (diff) |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'doc')
-rw-r--r-- | doc/user/application_security/dast/index.md | 5 | ||||
-rw-r--r-- | doc/user/incident_management/index.md | 4 |
2 files changed, 4 insertions, 5 deletions
diff --git a/doc/user/application_security/dast/index.md b/doc/user/application_security/dast/index.md index cd4c0b5241f..42480e60e48 100644 --- a/doc/user/application_security/dast/index.md +++ b/doc/user/application_security/dast/index.md @@ -557,13 +557,8 @@ For details on saving and transporting Docker images as a file, see Docker's doc dast: image: registry.example.com/namespace/dast:latest - script: - - export DAST_WEBSITE=${DAST_WEBSITE:-$(cat environment_url.txt)} - - /analyze -t $DAST_WEBSITE --auto-update-addons false ``` -The option `--auto-update-addons false` instructs ZAP not to update add-ons. - ## Reports The DAST job can emit various reports. diff --git a/doc/user/incident_management/index.md b/doc/user/incident_management/index.md index 8505afb375e..8b898a7b516 100644 --- a/doc/user/incident_management/index.md +++ b/doc/user/incident_management/index.md @@ -48,6 +48,10 @@ Prometheus alerts can be set up in both: - [GitLab-managed Prometheus](../project/integrations/prometheus.md#setting-up-alerts-for-prometheus-metrics) and - [Self-managed Prometheus](../project/integrations/prometheus.md#external-prometheus-instances) installations. +#### Alert Bot user + +Behind the scenes, Prometheus alerts are created by the special Alert Bot user creating issues. This user cannot be removed but does not count toward the license limit count. + ### Alert endpoint GitLab can accept alerts from any source via a generic webhook receiver. When |