diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2019-09-25 21:06:17 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2019-09-25 21:06:17 +0300 |
commit | 3fdbfaf3e587a0e25b6351e72d19e3bc1b47b33e (patch) | |
tree | 02fe9c114e452965525422920a3addaa8eafe2bc /doc | |
parent | b1d7b01241da7f7f5d42c5ef46c7788fac0ab6d3 (diff) |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'doc')
-rw-r--r-- | doc/administration/monitoring/prometheus/gitlab_metrics.md | 3 | ||||
-rw-r--r-- | doc/administration/troubleshooting/gitlab_rails_cheat_sheet.md | 8 | ||||
-rw-r--r-- | doc/development/README.md | 4 | ||||
-rw-r--r-- | doc/development/projections.md | 34 | ||||
-rw-r--r-- | doc/user/project/integrations/img/prometheus_add_metric.png | bin | 53571 -> 47690 bytes | |||
-rw-r--r-- | doc/user/project/integrations/img/prometheus_alert.png | bin | 24452 -> 8192 bytes | |||
-rw-r--r-- | doc/user/project/integrations/img/prometheus_dashboard.png | bin | 12650 -> 12882 bytes | |||
-rw-r--r-- | doc/user/project/integrations/prometheus.md | 10 |
8 files changed, 54 insertions, 5 deletions
diff --git a/doc/administration/monitoring/prometheus/gitlab_metrics.md b/doc/administration/monitoring/prometheus/gitlab_metrics.md index 302d74dd96a..f78a3da2107 100644 --- a/doc/administration/monitoring/prometheus/gitlab_metrics.md +++ b/doc/administration/monitoring/prometheus/gitlab_metrics.md @@ -140,8 +140,7 @@ The following metrics are available: | Metric | Type | Since | Description | |:--------------------------------- |:--------- |:------------------------------------------------------------- |:-------------------------------------- | -| `db_load_balancing_hosts` | Gauge | [12.3](https://gitlab.com/gitlab-org/gitlab/issues/13630) | Current number of load balancing hosts | -| `db_load_balancing_index` | Gauge | [12.3](https://gitlab.com/gitlab-org/gitlab/issues/13630) | Current load balancing host index | +| `db_load_balancing_hosts` | Gauge | [12.3](https://gitlab.com/gitlab-org/gitlab/issues/13630) | Current number of load balancing hosts | ## Ruby metrics diff --git a/doc/administration/troubleshooting/gitlab_rails_cheat_sheet.md b/doc/administration/troubleshooting/gitlab_rails_cheat_sheet.md index 5a414cc7e32..4539407d1c1 100644 --- a/doc/administration/troubleshooting/gitlab_rails_cheat_sheet.md +++ b/doc/administration/troubleshooting/gitlab_rails_cheat_sheet.md @@ -556,6 +556,14 @@ parent.members_with_descendants.count GroupDestroyWorker.perform_async(group_id, user_id) ``` +### Modify group project creation + +```ruby +# Project creation levels: 0 - No one, 1 - Maintainers, 2 - Developers + Maintainers +group = Group.find_by_path_or_name('group-name') +group.project_creation_level=0 +``` + ## LDAP ### LDAP commands in the rails console diff --git a/doc/development/README.md b/doc/development/README.md index 4c9e111bc99..bdc92236716 100644 --- a/doc/development/README.md +++ b/doc/development/README.md @@ -165,6 +165,10 @@ description: 'Learn how to contribute to GitLab.' - [Shell scripting standards and style guidelines](shell_scripting_guide/index.md) +## Other Development guides + +- [Defining relations between files using projections](projections.md) + ## Other GitLab Development Kit (GDK) guides - [Run full Auto DevOps cycle in a GDK instance](https://gitlab.com/gitlab-org/gitlab-development-kit/blob/master/doc/howto/auto_devops.md) diff --git a/doc/development/projections.md b/doc/development/projections.md new file mode 100644 index 00000000000..9d5702da530 --- /dev/null +++ b/doc/development/projections.md @@ -0,0 +1,34 @@ +# Projections + +Projections are a way to define relations between files. Every file can have a +"related" or "alternate" file. It's common to consider spec files to be +"alternate" files to source files. + +## How to use it + +- Install an editor plugin that consumes projections +- Copy `.projections.json.example` to `.projections.json` + +## How to customize it + +You can find a basic list of projection options in +[projectionist.txt](https://github.com/tpope/vim-projectionist/blob/master/doc/projectionist.txt) + +## Which plugins can I use + +- vim + - [vim-projectionist](https://github.com/tpope/vim-projectionist) +- VSCode + - [Alternate File](https://marketplace.visualstudio.com/items?itemName=will-wow.vscode-alternate-file) + - [projectionist](https://github.com/jarsen/projectionist) + - [jumpto](https://github.com/gmdayley/jumpto) +- Atom + - [projectionist-atom](https://atom.io/packages/projectionist-atom) +- Command-line + - [projectionist](https://github.com/glittershark/projectionist) + +## History + +This started as a +[plugin for vim by tpope](https://github.com/tpope/vim-projectionist) +It has since become editor-agnostic and ported to most modern editors. diff --git a/doc/user/project/integrations/img/prometheus_add_metric.png b/doc/user/project/integrations/img/prometheus_add_metric.png Binary files differindex e85670e1a13..9afeb535123 100644 --- a/doc/user/project/integrations/img/prometheus_add_metric.png +++ b/doc/user/project/integrations/img/prometheus_add_metric.png diff --git a/doc/user/project/integrations/img/prometheus_alert.png b/doc/user/project/integrations/img/prometheus_alert.png Binary files differindex a37f0477fd9..ffa1008ff51 100644 --- a/doc/user/project/integrations/img/prometheus_alert.png +++ b/doc/user/project/integrations/img/prometheus_alert.png diff --git a/doc/user/project/integrations/img/prometheus_dashboard.png b/doc/user/project/integrations/img/prometheus_dashboard.png Binary files differindex 1fa36ca2675..24d855eb50c 100644 --- a/doc/user/project/integrations/img/prometheus_dashboard.png +++ b/doc/user/project/integrations/img/prometheus_dashboard.png diff --git a/doc/user/project/integrations/prometheus.md b/doc/user/project/integrations/prometheus.md index 1ecefa210a0..e00923c3b9b 100644 --- a/doc/user/project/integrations/prometheus.md +++ b/doc/user/project/integrations/prometheus.md @@ -115,7 +115,7 @@ You can view the performance dashboard for an environment by [clicking on the mo > [Introduced](https://gitlab.com/gitlab-org/gitlab/merge_requests/3799) in [GitLab Premium](https://about.gitlab.com/pricing/) 10.6. -Custom metrics can be monitored by adding them on the Prometheus integration page. Once saved, they will be displayed on the environment performance dashboard provided that either: +Custom metrics can be monitored by adding them on the monitoring dashboard page. Once saved, they will be displayed on the environment performance dashboard provided that either: - A [connected Kubernetes cluster](../clusters/index.md#adding-and-removing-clusters) with the environment scope of `*` is used and [Prometheus installed on the cluster](#enabling-prometheus-integration), or - Prometheus is [manually configured](#manual-configuration-of-prometheus). @@ -300,8 +300,12 @@ Data from Prometheus charts on the metrics dashboard can be downloaded as CSV. For managed Prometheus instances using auto configuration, alerts for metrics [can be configured](#adding-additional-metrics-premium) directly in the performance dashboard. -To set an alert, click on the alarm icon in the top right corner of the metric you want to create the alert for. A dropdown -will appear, with options to set the threshold and operator. Click **Add** to save and activate the alert. +To set an alert: + +1. Click on the ellipsis icon in the top right corner of the metric you want to create the alert for. +1. Choose **Alerts** +1. Set threshold and operator. +1. Click **Add** to save and activate the alert. ![Adding an alert](img/prometheus_alert.png) |