Skip to content
Snippets Groups Projects
Commit fbbd9d30 authored by Fiona Neill's avatar Fiona Neill
Browse files

Merge branch 'axil-new-nav-docs' into 'master'

parents b3c6c9d4 09833e34
No related branches found
No related tags found
1 merge request!100Upstream Merge of 16.1 CE branching point
......@@ -247,8 +247,9 @@
You may get this error when trying to log in to Grafana if the Callback URL is not correct.
To fix that:
1. On the top bar, select **Main menu > Admin**.
1. On the left sidebar, select **Applications**.
1. On the left sidebar, expand the top-most chevron (**{chevron-down}**).
1. Select **Admin Area**.
1. Select **Applications**.
1. Select **Edit** of the **GitLab Grafana** application.
1. Change the value of **Callback URL** to look like `https://gitlab.example.com/-/grafana/login/gitlab` where `https://gitlab.example.com` corresponds to your `external_url`.
......@@ -263,8 +264,9 @@
To fix it:
1. On the top bar, select **Main menu > Admin**.
1. On the left sidebar, select **Applications**.
1. On the left sidebar, expand the top-most chevron (**{chevron-down}**).
1. Select **Admin Area**.
1. Select **Applications**.
1. Remove the application **GitLab Grafana** if it exists by selecting **Destroy**.
1. Create a backup of `/etc/gitlab/gitlab-secrets.json` on your GitLab server.
1. Edit `/etc/gitlab/gitlab-secrets.json` and remove the section starting with `grafana`.
......
......@@ -227,9 +227,9 @@
To disable these features you need to go to Admin Area of GitLab
and disable the Prometheus Metrics feature:
1. Go to GitLab web interface.
1. On the top bar, select **Main menu > Admin**.
1. On the left sidebar, select **Settings > Metrics and profiling**.
1. On the left sidebar, expand the top-most chevron (**{chevron-down}**).
1. Select **Admin Area**.
1. Select **Settings > Metrics and profiling**.
1. Expand **Metrics - Prometheus**.
1. Disable **Enable Prometheus Metrics**.
1. Select **Save changes**.
......
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