Skip to content
Snippets Groups Projects
Commit 941a7c15 authored by Achilleas Pipinellis's avatar Achilleas Pipinellis
Browse files

Merge branch 'docs-remove-grafana-from-ra' into 'master'

Remove Grafana from Reference Architecture

See merge request !132275



Merged-by: default avatarAchilleas Pipinellis <axil@gitlab.com>
Approved-by: default avatarGrant Young <gyoung@gitlab.com>
Co-authored-by: default avatarNailia Iskhakova <niskhakova@gitlab.com>
parents a908e79e 7501fc82
No related branches found
No related tags found
1 merge request!132275Remove Grafana from Reference Architecture
Pipeline #1011414503 passed
......@@ -67,7 +67,7 @@ together {
}
together {
card "**Prometheus + Grafana**" as monitor #7FFFD4
card "**Prometheus**" as monitor #7FFFD4
collections "**Consul** x3" as consul #e76a9b
}
......@@ -1380,7 +1380,6 @@ Updates to example must be made at:
gitlab_workhorse['enable'] = false
prometheus['enable'] = false
alertmanager['enable'] = false
grafana['enable'] = false
gitlab_exporter['enable'] = false
gitlab_kas['enable'] = false
......@@ -1551,7 +1550,6 @@ Updates to example must be made at:
gitlab_workhorse['enable'] = false
prometheus['enable'] = false
alertmanager['enable'] = false
grafana['enable'] = false
gitlab_exporter['enable'] = false
gitlab_kas['enable'] = false
......@@ -2088,8 +2086,7 @@ the [HTTPS documentation](https://docs.gitlab.com/omnibus/settings/ssl/index.htm
## Configure Prometheus
The Linux package can be used to configure a standalone Monitoring node
running [Prometheus](../monitoring/prometheus/index.md) and
[Grafana](../monitoring/performance/grafana_configuration.md).
running [Prometheus](../monitoring/prometheus/index.md).
The following IP will be used as an example:
......@@ -2113,10 +2110,6 @@ To configure the Monitoring node:
prometheus['listen_address'] = '0.0.0.0:9090'
prometheus['monitor_kubernetes'] = false
# Grafana
grafana['admin_password'] = '<grafana_password>'
grafana['disable_login_form'] = false
# Enable service discovery for Prometheus
consul['monitoring_service_discovery'] = true
consul['configuration'] = {
......@@ -2147,15 +2140,11 @@ To configure the Monitoring node:
},
]
# Nginx - For Grafana access
nginx['enable'] = true
nginx['enable'] = false
```
1. [Reconfigure GitLab](../restart_gitlab.md#reconfigure-a-linux-package-installation) for the changes to take effect.
1. In the GitLab UI, set `admin/application_settings/metrics_and_profiling` > Metrics - Grafana to `/-/grafana` to
`http[s]://<MONITOR NODE>/-/grafana`
<div align="right">
<a type="button" class="btn btn-default" href="#setup-components">
Back to setup components <i class="fa fa-angle-double-up" aria-hidden="true"></i>
......
......@@ -33,7 +33,7 @@ many organizations.
```plantuml
@startuml 1k
card "**Prometheus + Grafana**" as monitor #7FFFD4
card "**Prometheus**" as monitor #7FFFD4
package "GitLab Single Server" as gitlab-single-server {
together {
card "**GitLab Rails**" as gitlab #32CD32
......
......@@ -67,7 +67,7 @@ together {
}
together {
card "**Prometheus + Grafana**" as monitor #7FFFD4
card "**Prometheus**" as monitor #7FFFD4
collections "**Consul** x3" as consul #e76a9b
}
......@@ -1397,7 +1397,6 @@ Updates to example must be made at:
gitlab_workhorse['enable'] = false
prometheus['enable'] = false
alertmanager['enable'] = false
grafana['enable'] = false
gitlab_exporter['enable'] = false
gitlab_kas['enable'] = false
......@@ -1568,7 +1567,6 @@ Updates to example must be made at:
gitlab_workhorse['enable'] = false
prometheus['enable'] = false
alertmanager['enable'] = false
grafana['enable'] = false
gitlab_exporter['enable'] = false
gitlab_kas['enable'] = false
......@@ -2107,8 +2105,7 @@ the [HTTPS documentation](https://docs.gitlab.com/omnibus/settings/ssl/index.htm
## Configure Prometheus
The Linux package can be used to configure a standalone Monitoring node
running [Prometheus](../monitoring/prometheus/index.md) and
[Grafana](../monitoring/performance/grafana_configuration.md).
running [Prometheus](../monitoring/prometheus/index.md).
The following IP will be used as an example:
......@@ -2132,10 +2129,6 @@ To configure the Monitoring node:
prometheus['listen_address'] = '0.0.0.0:9090'
prometheus['monitor_kubernetes'] = false
# Grafana
grafana['admin_password'] = '<grafana_password>'
grafana['disable_login_form'] = false
# Enable service discovery for Prometheus
consul['monitoring_service_discovery'] = true
consul['configuration'] = {
......@@ -2166,13 +2159,10 @@ To configure the Monitoring node:
},
]
# Nginx - For Grafana access
nginx['enable'] = true
nginx['enable'] = false
```
1. Save the file and [reconfigure GitLab](../restart_gitlab.md#reconfigure-a-linux-package-installation).
1. In the GitLab UI, set `admin/application_settings/metrics_and_profiling` > Metrics - Grafana to `/-/grafana` to
`http[s]://<MONITOR NODE>/-/grafana`
<div align="right">
<a type="button" class="btn btn-default" href="#setup-components">
......
......@@ -53,7 +53,7 @@ skinparam linetype ortho
card "**External Load Balancer**" as elb #6a9be7
collections "**GitLab Rails** x3" as gitlab #32CD32
card "**Prometheus + Grafana**" as monitor #7FFFD4
card "**Prometheus**" as monitor #7FFFD4
card "**Gitaly**" as gitaly #FF8C00
card "**PostgreSQL**" as postgres #4EA7FF
card "**Redis**" as redis #FF6347
......@@ -458,7 +458,6 @@ Updates to example must be made at:
gitlab_workhorse['enable'] = false
prometheus['enable'] = false
alertmanager['enable'] = false
grafana['enable'] = false
gitlab_exporter['enable'] = false
gitlab_kas['enable'] = false
......@@ -769,8 +768,7 @@ the [HTTPS documentation](https://docs.gitlab.com/omnibus/settings/ssl/index.htm
## Configure Prometheus
The Linux package can be used to configure a standalone Monitoring node
running [Prometheus](../monitoring/prometheus/index.md) and
[Grafana](../monitoring/performance/grafana_configuration.md):
running [Prometheus](../monitoring/prometheus/index.md):
1. SSH in to the Monitoring node.
1. [Download and install](https://about.gitlab.com/install/) the Linux
......@@ -780,20 +778,13 @@ running [Prometheus](../monitoring/prometheus/index.md) and
```ruby
roles(['monitoring_role'])
nginx['enable'] = false
external_url 'http://gitlab.example.com'
# Prometheus
prometheus['listen_address'] = '0.0.0.0:9090'
prometheus['monitor_kubernetes'] = false
# Grafana
grafana['enable'] = true
grafana['admin_password'] = '<grafana_password>'
grafana['disable_login_form'] = false
# Nginx - For Grafana access
nginx['enable'] = true
```
1. Prometheus also needs some scrape configurations to pull all the data from the various
......@@ -864,8 +855,6 @@ running [Prometheus](../monitoring/prometheus/index.md) and
```
1. Save the file and [reconfigure GitLab](../restart_gitlab.md#reconfigure-a-linux-package-installation).
1. In the GitLab UI, set `admin/application_settings/metrics_and_profiling` > Metrics - Grafana to `/-/grafana` to
`http[s]://<MONITOR NODE>/-/grafana`
<div align="right">
<a type="button" class="btn btn-default" href="#setup-components">
......@@ -935,7 +924,7 @@ in Kubernetes via our official [Helm Charts](https://docs.gitlab.com/charts/).
In this setup, we support running the equivalent of GitLab Rails and Sidekiq nodes
in a Kubernetes cluster, named Webservice and Sidekiq respectively. In addition,
the following other supporting services are supported: NGINX, Task Runner, Migrations,
Prometheus, and Grafana.
Prometheus.
Hybrid installations leverage the benefits of both cloud native and traditional
compute deployments. With this, _stateless_ components can benefit from cloud native
......
......@@ -75,7 +75,7 @@ together {
}
together {
card "**Prometheus + Grafana**" as monitor #7FFFD4
card "**Prometheus**" as monitor #7FFFD4
collections "**Consul** x3" as consul #e76a9b
}
......@@ -1324,7 +1324,6 @@ Updates to example must be made at:
gitlab_workhorse['enable'] = false
prometheus['enable'] = false
alertmanager['enable'] = false
grafana['enable'] = false
gitlab_exporter['enable'] = false
gitlab_kas['enable'] = false
......@@ -1495,7 +1494,6 @@ Updates to example must be made at:
gitlab_workhorse['enable'] = false
prometheus['enable'] = false
alertmanager['enable'] = false
grafana['enable'] = false
gitlab_exporter['enable'] = false
gitlab_kas['enable'] = false
......@@ -2064,8 +2062,7 @@ the [HTTPS documentation](https://docs.gitlab.com/omnibus/settings/ssl/index.htm
## Configure Prometheus
The Linux package can be used to configure a standalone Monitoring node
running [Prometheus](../monitoring/prometheus/index.md) and
[Grafana](../monitoring/performance/grafana_configuration.md):
running [Prometheus](../monitoring/prometheus/index.md):
1. SSH in to the Monitoring node.
1. [Download and install](https://about.gitlab.com/install/) the Linux
......@@ -2082,10 +2079,6 @@ running [Prometheus](../monitoring/prometheus/index.md) and
prometheus['listen_address'] = '0.0.0.0:9090'
prometheus['monitor_kubernetes'] = false
# Grafana
grafana['admin_password'] = '<grafana_password>'
grafana['disable_login_form'] = false
# Enable service discovery for Prometheus
consul['monitoring_service_discovery'] = true
consul['configuration'] = {
......@@ -2116,13 +2109,10 @@ running [Prometheus](../monitoring/prometheus/index.md) and
},
]
# Nginx - For Grafana access
nginx['enable'] = true
nginx['enable'] = false
```
1. Save the file and [reconfigure GitLab](../restart_gitlab.md#reconfigure-a-linux-package-installation).
1. In the GitLab UI, set `admin/application_settings/metrics_and_profiling` > Metrics - Grafana to `/-/grafana` to
`http[s]://<MONITOR NODE>/-/grafana`.
1. Verify the GitLab services are running:
```shell
......@@ -2133,7 +2123,6 @@ running [Prometheus](../monitoring/prometheus/index.md) and
```plaintext
run: consul: (pid 31637) 17337s; run: log: (pid 29748) 78432s
run: grafana: (pid 31644) 17337s; run: log: (pid 29719) 78438s
run: logrotate: (pid 31809) 2936s; run: log: (pid 29581) 78462s
run: nginx: (pid 31665) 17335s; run: log: (pid 29556) 78468s
run: prometheus: (pid 31672) 17335s; run: log: (pid 29633) 78456s
......@@ -2231,7 +2220,7 @@ in Kubernetes via our official [Helm Charts](https://docs.gitlab.com/charts/).
In this setup, we support running the equivalent of GitLab Rails and Sidekiq nodes
in a Kubernetes cluster, named Webservice and Sidekiq respectively. In addition,
the following other supporting services are supported: NGINX, Task Runner, Migrations,
Prometheus, and Grafana.
Prometheus.
Hybrid installations leverage the benefits of both cloud native and traditional
compute deployments. With this, _stateless_ components can benefit from cloud native
......
......@@ -67,7 +67,7 @@ together {
}
together {
card "**Prometheus + Grafana**" as monitor #7FFFD4
card "**Prometheus**" as monitor #7FFFD4
collections "**Consul** x3" as consul #e76a9b
}
......@@ -1393,7 +1393,6 @@ Updates to example must be made at:
gitlab_workhorse['enable'] = false
prometheus['enable'] = false
alertmanager['enable'] = false
grafana['enable'] = false
gitlab_exporter['enable'] = false
gitlab_kas['enable'] = false
......@@ -1564,7 +1563,6 @@ Updates to example must be made at:
gitlab_workhorse['enable'] = false
prometheus['enable'] = false
alertmanager['enable'] = false
grafana['enable'] = false
gitlab_exporter['enable'] = false
gitlab_kas['enable'] = false
......@@ -2106,8 +2104,7 @@ the [HTTPS documentation](https://docs.gitlab.com/omnibus/settings/ssl/index.htm
## Configure Prometheus
The Linux package can be used to configure a standalone Monitoring node
running [Prometheus](../monitoring/prometheus/index.md) and
[Grafana](../monitoring/performance/grafana_configuration.md).
running [Prometheus](../monitoring/prometheus/index.md).
The following IP will be used as an example:
......@@ -2131,10 +2128,6 @@ To configure the Monitoring node:
prometheus['listen_address'] = '0.0.0.0:9090'
prometheus['monitor_kubernetes'] = false
# Grafana
grafana['admin_password'] = '<grafana_password>'
grafana['disable_login_form'] = false
# Enable service discovery for Prometheus
consul['monitoring_service_discovery'] = true
consul['configuration'] = {
......@@ -2165,13 +2158,10 @@ To configure the Monitoring node:
},
]
# Nginx - For Grafana access
nginx['enable'] = true
nginx['enable'] = false
```
1. Save the file and [reconfigure GitLab](../restart_gitlab.md#reconfigure-a-linux-package-installation).
1. In the GitLab UI, set `admin/application_settings/metrics_and_profiling` > Metrics - Grafana to `/-/grafana` to
`http[s]://<MONITOR NODE>/-/grafana`
<div align="right">
<a type="button" class="btn btn-default" href="#setup-components">
......@@ -2241,7 +2231,7 @@ in Kubernetes via our official [Helm Charts](https://docs.gitlab.com/charts/).
In this setup, we support running the equivalent of GitLab Rails and Sidekiq nodes
in a Kubernetes cluster, named Webservice and Sidekiq respectively. In addition,
the following other supporting services are supported: NGINX, Task Runner, Migrations,
Prometheus, and Grafana.
Prometheus.
Hybrid installations leverage the benefits of both cloud native and traditional
compute deployments. With this, _stateless_ components can benefit from cloud native
......
......@@ -72,7 +72,7 @@ together {
}
together {
card "**Prometheus + Grafana**" as monitor #7FFFD4
card "**Prometheus**" as monitor #7FFFD4
collections "**Consul** x3" as consul #e76a9b
}
......@@ -1318,7 +1318,6 @@ Updates to example must be made at:
gitlab_workhorse['enable'] = false
prometheus['enable'] = false
alertmanager['enable'] = false
grafana['enable'] = false
gitlab_exporter['enable'] = false
gitlab_kas['enable'] = false
......@@ -1489,7 +1488,6 @@ Updates to example must be made at:
gitlab_workhorse['enable'] = false
prometheus['enable'] = false
alertmanager['enable'] = false
grafana['enable'] = false
gitlab_exporter['enable'] = false
gitlab_kas['enable'] = false
......@@ -2056,8 +2054,7 @@ the [HTTPS documentation](https://docs.gitlab.com/omnibus/settings/ssl/index.htm
## Configure Prometheus
The Linux package can be used to configure a standalone Monitoring node
running [Prometheus](../monitoring/prometheus/index.md) and
[Grafana](../monitoring/performance/grafana_configuration.md):
running [Prometheus](../monitoring/prometheus/index.md):
1. SSH in to the Monitoring node.
1. [Download and install](https://about.gitlab.com/install/) the Linux
......@@ -2074,10 +2071,6 @@ running [Prometheus](../monitoring/prometheus/index.md) and
prometheus['listen_address'] = '0.0.0.0:9090'
prometheus['monitor_kubernetes'] = false
# Grafana
grafana['admin_password'] = '<grafana_password>'
grafana['disable_login_form'] = false
# Enable service discovery for Prometheus
consul['monitoring_service_discovery'] = true
consul['configuration'] = {
......@@ -2108,13 +2101,10 @@ running [Prometheus](../monitoring/prometheus/index.md) and
},
]
# Nginx - For Grafana access
nginx['enable'] = true
nginx['enable'] = false
```
1. Save the file and [reconfigure GitLab](../restart_gitlab.md#reconfigure-a-linux-package-installation).
1. In the GitLab UI, set `admin/application_settings/metrics_and_profiling` > Metrics - Grafana to `/-/grafana` to
`http[s]://<MONITOR NODE>/-/grafana`.
1. Verify the GitLab services are running:
```shell
......@@ -2125,7 +2115,6 @@ running [Prometheus](../monitoring/prometheus/index.md) and
```plaintext
run: consul: (pid 31637) 17337s; run: log: (pid 29748) 78432s
run: grafana: (pid 31644) 17337s; run: log: (pid 29719) 78438s
run: logrotate: (pid 31809) 2936s; run: log: (pid 29581) 78462s
run: nginx: (pid 31665) 17335s; run: log: (pid 29556) 78468s
run: prometheus: (pid 31672) 17335s; run: log: (pid 29633) 78456s
......@@ -2199,7 +2188,7 @@ in Kubernetes via our official [Helm Charts](https://docs.gitlab.com/charts/).
In this setup, we support running the equivalent of GitLab Rails and Sidekiq nodes
in a Kubernetes cluster, named Webservice and Sidekiq respectively. In addition,
the following other supporting services are supported: NGINX, Task Runner, Migrations,
Prometheus, and Grafana.
Prometheus.
Hybrid installations leverage the benefits of both cloud native and traditional
compute deployments. With this, _stateless_ components can benefit from cloud native
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment