diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-02-29 06:07:51 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-02-29 06:07:51 +0300 |
commit | d94ed2a46aad78435de66af05c84060ae78c8fc0 (patch) | |
tree | 19b057ae567e8bdd10289d290608362f466ca589 /doc/user/project | |
parent | e56fd471503e00167ca96e7792f75a0d1f3b7891 (diff) |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'doc/user/project')
-rw-r--r-- | doc/user/project/description_templates.md | 2 | ||||
-rw-r--r-- | doc/user/project/integrations/gitlab_slack_application.md | 2 | ||||
-rw-r--r-- | doc/user/project/integrations/hipchat.md | 2 | ||||
-rw-r--r-- | doc/user/project/integrations/irker.md | 2 | ||||
-rw-r--r-- | doc/user/project/integrations/jira.md | 2 | ||||
-rw-r--r-- | doc/user/project/integrations/prometheus_library/kubernetes.md | 8 | ||||
-rw-r--r-- | doc/user/project/new_ci_build_permissions_model.md | 8 |
7 files changed, 13 insertions, 13 deletions
diff --git a/doc/user/project/description_templates.md b/doc/user/project/description_templates.md index d59d4eec174..84b74692725 100644 --- a/doc/user/project/description_templates.md +++ b/doc/user/project/description_templates.md @@ -91,7 +91,7 @@ It is possible to use [quick actions](quick_actions.md) within description templ Here is an example for a Bug report template: -``` +```plaintext Summary (Summarize the bug encountered concisely) diff --git a/doc/user/project/integrations/gitlab_slack_application.md b/doc/user/project/integrations/gitlab_slack_application.md index 72b1318a16a..4bc44d1d7d8 100644 --- a/doc/user/project/integrations/gitlab_slack_application.md +++ b/doc/user/project/integrations/gitlab_slack_application.md @@ -56,7 +56,7 @@ We are working on making this configurable in the future. For example, to show the issue number `1001` under the `gitlab-org/gitlab` project, you would do: -``` +```plaintext /gitlab gitlab-org/gitlab issue show 1001 ``` diff --git a/doc/user/project/integrations/hipchat.md b/doc/user/project/integrations/hipchat.md index 85c3eda1208..347f7973c84 100644 --- a/doc/user/project/integrations/hipchat.md +++ b/doc/user/project/integrations/hipchat.md @@ -25,7 +25,7 @@ allow GitLab to send messages only to *one* room. 1. In the "Send messages to this room by posting this URL" column, you should see a URL in the format: -``` +```plaintext https://api.hipchat.com/v2/room/<room>/notification?auth_token=<token> ``` diff --git a/doc/user/project/integrations/irker.md b/doc/user/project/integrations/irker.md index 47017843233..cadf01c382a 100644 --- a/doc/user/project/integrations/irker.md +++ b/doc/user/project/integrations/irker.md @@ -11,7 +11,7 @@ See the project homepage for further info: <https://gitlab.com/esr/irker> You will first need an Irker daemon. You can download the Irker code from its repository on <https://gitlab.com/esr/irker>: -``` +```shell git clone https://gitlab.com/esr/irker.git ``` diff --git a/doc/user/project/integrations/jira.md b/doc/user/project/integrations/jira.md index 1af56b79e82..681b628682b 100644 --- a/doc/user/project/integrations/jira.md +++ b/doc/user/project/integrations/jira.md @@ -119,7 +119,7 @@ link back to GitLab. This means that in comments in merge requests and commits referencing an issue, e.g., `PROJECT-7`, will add a comment in Jira issue in the format: -``` +```plaintext USER mentioned this issue in RESOURCE_NAME of [PROJECT_NAME|LINK_TO_COMMENT]: ENTITY_TITLE ``` diff --git a/doc/user/project/integrations/prometheus_library/kubernetes.md b/doc/user/project/integrations/prometheus_library/kubernetes.md index 7433210b553..ca1555c793b 100644 --- a/doc/user/project/integrations/prometheus_library/kubernetes.md +++ b/doc/user/project/integrations/prometheus_library/kubernetes.md @@ -13,13 +13,13 @@ integration services must be enabled. - Average Memory Usage (MB): - ``` + ```prometheus avg(sum(container_memory_usage_bytes{container_name!="POD",pod_name=~"^%{ci_environment_slug}-([^c].*|c([^a]|a([^n]|n([^a]|a([^r]|r[^y])))).*|)-(.*)",namespace="%{kube_namespace}"}) by (job)) without (job) / count(avg(container_memory_usage_bytes{container_name!="POD",pod_name=~"^%{ci_environment_slug}-([^c].*|c([^a]|a([^n]|n([^a]|a([^r]|r[^y])))).*|)-(.*)",namespace="%{kube_namespace}"}) without (job)) /1024/1024 ``` - Average CPU Utilization (%): - ``` + ```prometheus avg(sum(rate(container_cpu_usage_seconds_total{container_name!="POD",pod_name=~"^%{ci_environment_slug}-([^c].*|c([^a]|a([^n]|n([^a]|a([^r]|r[^y])))).*|)-(.*)",namespace="%{kube_namespace}"}[15m])) by (job)) without (job) / count(sum(rate(container_cpu_usage_seconds_total{container_name!="POD",pod_name=~"^%{ci_environment_slug}-([^c].*|c([^a]|a([^n]|n([^a]|a([^r]|r[^y])))).*|)-(.*)",namespace="%{kube_namespace}"}[15m])) by (pod_name)) ``` @@ -48,12 +48,12 @@ These metrics expect the [Deployment](https://kubernetes.io/docs/concepts/worklo - Average Memory Usage (MB) - ``` + ```prometheus avg(sum(container_memory_usage_bytes{container_name!="POD",pod_name=~"^%{ci_environment_slug}-canary-(.*)",namespace="%{kube_namespace}"}) by (job)) without (job) / count(avg(container_memory_usage_bytes{container_name!="POD",pod_name=~"^%{ci_environment_slug}-canary-(.*)",namespace="%{kube_namespace}"}) without (job)) /1024/1024 ``` - Average CPU Utilization (%) - ``` + ```prometheus avg(sum(rate(container_cpu_usage_seconds_total{container_name!="POD",pod_name=~"^%{ci_environment_slug}-canary-(.*)",namespace="%{kube_namespace}"}[15m])) by (job)) without (job) / count(sum(rate(container_cpu_usage_seconds_total{container_name!="POD",pod_name=~"^%{ci_environment_slug}-canary-(.*)",namespace="%{kube_namespace}"}[15m])) by (pod_name)) ``` diff --git a/doc/user/project/new_ci_build_permissions_model.md b/doc/user/project/new_ci_build_permissions_model.md index d1bb23396e4..4217fc792d7 100644 --- a/doc/user/project/new_ci_build_permissions_model.md +++ b/doc/user/project/new_ci_build_permissions_model.md @@ -101,14 +101,14 @@ allowing pulling and pushing Docker images from within the CI job. GitLab would create a special checkout URL like: -``` +```plaintext https://gitlab-ci-token:<project-runners-token>/gitlab.com/gitlab-org/gitlab-foss.git ``` And then the users could also use it in their CI jobs all Docker related commands to interact with GitLab Container Registry. For example: -``` +```shell docker login -u gitlab-ci-token -p $CI_JOB_TOKEN registry.gitlab.com ``` @@ -173,14 +173,14 @@ As a user: The [Job environment variable][jobenv] `CI_JOB_TOKEN` can be used to authenticate any clones of dependent repositories. For example: -``` +```shell git clone https://gitlab-ci-token:${CI_JOB_TOKEN}@gitlab.com/<user>/<mydependentrepo>.git ``` It can also be used for system-wide authentication (only do this in a docker container, it will overwrite ~/.netrc): -``` +```shell echo -e "machine gitlab.com\nlogin gitlab-ci-token\npassword ${CI_JOB_TOKEN}" > ~/.netrc ``` |