diff --git a/app/views/admin/cohorts/_cohorts_table.html.haml b/app/views/admin/cohorts/_cohorts_table.html.haml
index d4defd3f849f13ac2d634b162f0f4598e4bbbf3a..8ed21c917a7ab3d42e449cb76d5e816cbc2e0d35 100644
--- a/app/views/admin/cohorts/_cohorts_table.html.haml
+++ b/app/views/admin/cohorts/_cohorts_table.html.haml
@@ -2,7 +2,7 @@
.bs-callout.clearfix
%p
= s_("Cohorts|User cohorts are shown for the last %{months_included} months. Only users with activity are counted in the 'New users' column; inactive users are counted separately.") % { months_included: @cohorts[:months_included] }
- = link_to icon('question-circle'), help_page_path('user/instance_statistics/user_cohorts', anchor: 'cohorts'), title: 'About this feature', target: '_blank'
+ = link_to icon('question-circle'), help_page_path('user/admin_area/analytics/user_cohorts', anchor: 'cohorts'), title: 'About this feature', target: '_blank'
.table-holder.d-xl-table
%table.table
diff --git a/app/views/admin/dev_ops_score/_no_data.html.haml b/app/views/admin/dev_ops_score/_no_data.html.haml
index 545982440392a30613230adaf3f467f35b7e9483..36368ceca2b38e89a7d42c4be0356c8e17ba769c 100644
--- a/app/views/admin/dev_ops_score/_no_data.html.haml
+++ b/app/views/admin/dev_ops_score/_no_data.html.haml
@@ -4,4 +4,4 @@
%h4= _('Data is still calculating...')
%p
= _('In order to gather accurate feature usage data, it can take 1 to 2 weeks to see your index.')
- = link_to _('Learn more'), help_page_path('user/instance_statistics/dev_ops_score'), target: '_blank'
+ = link_to _('Learn more'), help_page_path('user/admin_area/analytics/dev_ops_score'), target: '_blank'
diff --git a/app/views/admin/dev_ops_score/show.html.haml b/app/views/admin/dev_ops_score/show.html.haml
index 215624d27ce8ab21e0fdb9986b24361425e9341e..9c0563841645a7afd41e5799effb397eccc197a3 100644
--- a/app/views/admin/dev_ops_score/show.html.haml
+++ b/app/views/admin/dev_ops_score/show.html.haml
@@ -19,7 +19,7 @@
= _('index')
%br
= _('score')
- = link_to icon('question-circle', 'aria-hidden' => 'true'), help_page_path('user/instance_statistics/dev_ops_score')
+ = link_to icon('question-circle', 'aria-hidden' => 'true'), help_page_path('user/admin_area/analytics/dev_ops_score')
.devops-cards.board-card-container
- @metric.cards.each do |card|
diff --git a/doc/README.md b/doc/README.md
index b73300accabc9e1bc0b6cad1f11fa6e79d8fcfb4..a1edfb274739fab2742ac5f800aea9553ac18cfb 100644
--- a/doc/README.md
+++ b/doc/README.md
@@ -93,7 +93,7 @@ The following documentation relates to the DevOps **Manage** stage:
|:--------------------------------------------------------------------------------------|:-----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|
| [Authentication and<br/>Authorization](administration/auth/README.md) **(CORE ONLY)** | Supported authentication and authorization providers. |
| [GitLab Value Stream Analytics](user/project/cycle_analytics.md) | Measure the time it takes to go from an [idea to production](https://about.gitlab.com/blog/2016/08/05/continuous-integration-delivery-and-deployment-with-gitlab/#from-idea-to-production-with-gitlab) for each project you have. |
-| [Instance Statistics](user/instance_statistics/index.md) | Discover statistics on how many GitLab features you use and user activity. |
+| [Instance-level Anlytics](user/admin_area/analytics/index.md) | Discover statistics on how many GitLab features you use and user activity. |
<div align="right">
<a type="button" class="btn btn-default" href="#overview">
diff --git a/doc/api/settings.md b/doc/api/settings.md
index 64c529b022276f1e939b036bf4079b545bad5c80..9c4ebf084ade67d79abbcf3fb3f2c26a7f65c939 100644
--- a/doc/api/settings.md
+++ b/doc/api/settings.md
@@ -61,7 +61,6 @@ Example response:
"enforce_terms": true,
"terms": "Hello world!",
"performance_bar_allowed_group_id": 42,
- "instance_statistics_visibility_private": false,
"user_show_add_ssh_key_message": true,
"local_markdown_version": 0,
"allow_local_requests_from_hooks_and_services": true,
@@ -151,7 +150,6 @@ Example response:
"enforce_terms": true,
"terms": "Hello world!",
"performance_bar_allowed_group_id": 42,
- "instance_statistics_visibility_private": false,
"user_show_add_ssh_key_message": true,
"file_template_project_id": 1,
"local_markdown_version": 0,
@@ -285,7 +283,6 @@ are listed in the descriptions of the relevant settings.
| `housekeeping_incremental_repack_period` | integer | required by: `housekeeping_enabled` | Number of Git pushes after which an incremental `git repack` is run. |
| `html_emails_enabled` | boolean | no | Enable HTML emails. |
| `import_sources` | array of strings | no | Sources to allow project import from, possible values: `github`, `bitbucket`, `bitbucket_server`, `gitlab`, `google_code`, `fogbugz`, `git`, `gitlab_project`, `gitea`, `manifest`, and `phabricator`. |
-| `instance_statistics_visibility_private` | boolean | no | When set to `true` Instance statistics will only be available to admins. |
| `issues_create_limit` | integer | no | Max number of issue creation requests per minute per user. Disabled by default.|
| `local_markdown_version` | integer | no | Increase this value when any cached Markdown should be invalidated. |
| `maintenance_mode_message` | string | no | **(PREMIUM)** Message displayed when instance is in maintenance mode |
diff --git a/doc/user/admin_area/analytics/convdev.md b/doc/user/admin_area/analytics/convdev.md
new file mode 100644
index 0000000000000000000000000000000000000000..9df8cbe021de7c15cd32f8e876a884a547f88f32
--- /dev/null
+++ b/doc/user/admin_area/analytics/convdev.md
@@ -0,0 +1,5 @@
+---
+redirect_to: 'dev_ops_score.md'
+---
+
+This document was moved to [another location](dev_ops_score.md).
diff --git a/doc/user/instance_statistics/dev_ops_score.md b/doc/user/admin_area/analytics/dev_ops_score.md
similarity index 82%
rename from doc/user/instance_statistics/dev_ops_score.md
rename to doc/user/admin_area/analytics/dev_ops_score.md
index 35dcbd01916dee1c1e8999ce2b94546a70e07b68..5f4ae21b5f0c67aea443904b4c04891fded4c4fb 100644
--- a/doc/user/instance_statistics/dev_ops_score.md
+++ b/doc/user/admin_area/analytics/dev_ops_score.md
@@ -4,7 +4,7 @@
> - [Renamed from Conversational Development Index](https://gitlab.com/gitlab-org/gitlab/-/issues/20976) in GitLab 12.6.
NOTE: **Note:**
-Your GitLab instance's [usage ping](../admin_area/settings/usage_statistics.md#usage-ping-core-only) must be activated in order to use this feature.
+Your GitLab instance's [usage ping](../settings/usage_statistics.md#usage-ping-core-only) must be activated in order to use this feature.
The DevOps Score gives you an overview of your entire instance's adoption of
[Concurrent DevOps](https://about.gitlab.com/topics/concurrent-devops/)
@@ -13,7 +13,7 @@ from planning to monitoring.
This displays the usage of these GitLab features over
the last 30 days, averaged over the number of active users in that time period. It also
provides a Lead score per feature, which is calculated based on GitLab's analysis
-of top-performing instances based on [usage ping data](../admin_area/settings/usage_statistics.md#usage-ping-core-only) that GitLab has
+of top-performing instances based on [usage ping data](../settings/usage_statistics.md#usage-ping-core-only) that GitLab has
collected. Your score is compared to the lead score of each feature and then expressed as a percentage at the bottom of said feature.
Your overall **index score** is an average of your feature scores. You can use this score to compare your DevOps status to other organizations.
diff --git a/doc/user/admin_area/analytics/img/cohorts.png b/doc/user/admin_area/analytics/img/cohorts.png
new file mode 100644
index 0000000000000000000000000000000000000000..2b3c2070f99e96e7548e2ce3adc917293698432b
Binary files /dev/null and b/doc/user/admin_area/analytics/img/cohorts.png differ
diff --git a/doc/user/admin_area/analytics/img/dev_ops_score_v12_6.png b/doc/user/admin_area/analytics/img/dev_ops_score_v12_6.png
new file mode 100644
index 0000000000000000000000000000000000000000..3d697a30f665df36eac2d87b4ae7394062f8ce84
Binary files /dev/null and b/doc/user/admin_area/analytics/img/dev_ops_score_v12_6.png differ
diff --git a/doc/user/admin_area/analytics/index.md b/doc/user/admin_area/analytics/index.md
new file mode 100644
index 0000000000000000000000000000000000000000..b7fc8a656d01a319460ae6859c328459bc274dbb
--- /dev/null
+++ b/doc/user/admin_area/analytics/index.md
@@ -0,0 +1,10 @@
+# Instance-level analytics
+
+> [Introduced](https://gitlab.com/gitlab-org/gitlab-foss/-/issues/41416) in GitLab 11.2.
+
+Administrators have access to instance-wide analytics, as shown in **Admin Area > Analytics**.
+
+There are two kinds of statistics:
+
+- [Dev Ops Score](dev_ops_score.md): Provides an overview of your entire instance's feature usage.
+- [User Cohorts](user_cohorts.md): Display the monthly cohorts of new users and their activities over time.
diff --git a/doc/user/instance_statistics/user_cohorts.md b/doc/user/admin_area/analytics/user_cohorts.md
similarity index 68%
rename from doc/user/instance_statistics/user_cohorts.md
rename to doc/user/admin_area/analytics/user_cohorts.md
index 8da2d57d47427f05ff83c723457166e2d5c2d333..a440f9ba8fd691af25a7511cfd141b616482eb75 100644
--- a/doc/user/instance_statistics/user_cohorts.md
+++ b/doc/user/admin_area/analytics/user_cohorts.md
@@ -2,7 +2,7 @@
> [Introduced](https://gitlab.com/gitlab-org/gitlab-foss/-/issues/23361) in GitLab 9.1.
-As a benefit of having the [usage ping active](../admin_area/settings/usage_statistics.md),
+As a benefit of having the [usage ping active](../settings/usage_statistics.md),
GitLab lets you analyze the users' activities over time of your GitLab installation.
## Overview
@@ -12,10 +12,10 @@ user cohorts.
-For the cohort of Jan 2018, 15 users have been added on this server and have
-been active since this month. One month later, in Feb 2018, all 15 users are
-still active. 6 months later (Month 6, July), we can see 10 users from this cohort
-are active, or 66% of the original cohort of 15 that joined in January.
+For the cohort of March 2020, three users have been added on this server and have
+been active since this month. One month later, in April 2020, two users are
+still active. Five months later (August), we can see that one user from this cohort
+is active, or 33% of the original cohort of three that joined in March.
The Inactive users column shows the number of users who have been added during
the month, but who have never actually had any activity in the instance.
diff --git a/doc/user/admin_area/monitoring/convdev.md b/doc/user/admin_area/monitoring/convdev.md
index 2ba28d4bc1c4070ed0b346b356a37bcbdb468acc..afdf3dc58495c9a259e4c86358ff1caff61beb86 100644
--- a/doc/user/admin_area/monitoring/convdev.md
+++ b/doc/user/admin_area/monitoring/convdev.md
@@ -1,5 +1,5 @@
---
-redirect_to: '../../instance_statistics/dev_ops_score.md'
+redirect_to: '../analytics/dev_ops_score.md'
---
-Conversational Development Index was renamed to [DevOps Score](../../instance_statistics/dev_ops_score.md) in GitLab 12.6.
+Conversational Development Index was renamed to [DevOps Score](../analytics/dev_ops_score.md) in GitLab 12.6.
diff --git a/doc/user/admin_area/monitoring/dev_ops_score.md b/doc/user/admin_area/monitoring/dev_ops_score.md
index f8b66531f2fc85bc6f20b85d8ee9e231e2f9fb8c..70c668870fde8d9c23f0e22b0e9a8d2a16d52890 100644
--- a/doc/user/admin_area/monitoring/dev_ops_score.md
+++ b/doc/user/admin_area/monitoring/dev_ops_score.md
@@ -1,5 +1,5 @@
---
-redirect_to: '../../instance_statistics/dev_ops_score.md'
+redirect_to: '../analytics/dev_ops_score.md'
---
-This document was moved to [another location](../../instance_statistics/dev_ops_score.md).
+This document was moved to [another location](../analytics/dev_ops_score.md).
diff --git a/doc/user/admin_area/settings/usage_statistics.md b/doc/user/admin_area/settings/usage_statistics.md
index f3eb094887e5fecbd443f63565c9ef52ba1969d1..55bbcfbe1d830b83b88b9100f254e164a7fe2958 100644
--- a/doc/user/admin_area/settings/usage_statistics.md
+++ b/doc/user/admin_area/settings/usage_statistics.md
@@ -60,14 +60,11 @@ sequenceDiagram
See [Usage Ping guide](../../../development/telemetry/usage_ping.md).
-## Instance statistics visibility **(CORE ONLY)**
+## Instance-level statistics **(CORE ONLY)**
Once usage ping is enabled, GitLab will gather data from other instances and
-will be able to show [usage statistics](../../instance_statistics/index.md)
-of your instance to your users.
-
-To make this visible only to admins, go to **Admin Area > Settings > Metrics and profiling**, expand
-**Usage statistics**, and set the **Instance Statistics visibility** option to **Only admins**.
+will be able to show [usage statistics](../analytics/index.md)
+of your instance to your admins in **Admin Area > Analytics**.
<!-- ## Troubleshooting
diff --git a/doc/user/admin_area/user_cohorts.md b/doc/user/admin_area/user_cohorts.md
index 21e61e2ec4416be920bf1a33844da786c8126e58..ec0153ac3b694cf82d3894f3efab2711c01aa4e9 100644
--- a/doc/user/admin_area/user_cohorts.md
+++ b/doc/user/admin_area/user_cohorts.md
@@ -1,5 +1,5 @@
---
-redirect_to: '../instance_statistics/user_cohorts.md'
+redirect_to: 'analytics/user_cohorts.md'
---
-This document was moved to [another location](../instance_statistics/user_cohorts.md).
+This document was moved to [another location](analytics/user_cohorts.md).
diff --git a/doc/user/index.md b/doc/user/index.md
index a9f12d199d3850c2f2e8bb7c12120bea377488d0..938000ab85fe141eda4b3da24db79cde09505400 100644
--- a/doc/user/index.md
+++ b/doc/user/index.md
@@ -179,9 +179,9 @@ Automate GitLab via [API](../api/README.md).
Learn what is [Git](../topics/git/index.md) and its best practices.
-## Instance statistics
+## Instance-level analytics
-See [various statistics](instance_statistics/index.md) of your GitLab instance.
+See [various statistics](admin_area/analytics/index.md) of your GitLab instance.
## Operations Dashboard **(PREMIUM)**
diff --git a/doc/user/instance_statistics/convdev.md b/doc/user/instance_statistics/convdev.md
deleted file mode 100644
index a1a4eca191ce70b7b90ca809c06f58d159df3f0d..0000000000000000000000000000000000000000
--- a/doc/user/instance_statistics/convdev.md
+++ /dev/null
@@ -1,5 +0,0 @@
----
-redirect_to: '../instance_statistics/dev_ops_score.md'
----
-
-This document was moved to [another location](../instance_statistics/dev_ops_score.md).
diff --git a/doc/user/instance_statistics/img/cohorts.png b/doc/user/instance_statistics/img/cohorts.png
deleted file mode 100644
index 19250e385aa819e439f57e349a611ceab40bc9ab..0000000000000000000000000000000000000000
Binary files a/doc/user/instance_statistics/img/cohorts.png and /dev/null differ
diff --git a/doc/user/instance_statistics/img/dev_ops_score_v12_6.png b/doc/user/instance_statistics/img/dev_ops_score_v12_6.png
deleted file mode 100644
index af07e9323d63356c401692c975ba69876ecdd1f2..0000000000000000000000000000000000000000
Binary files a/doc/user/instance_statistics/img/dev_ops_score_v12_6.png and /dev/null differ
diff --git a/doc/user/instance_statistics/img/instance_statistics_button_v12_6.png b/doc/user/instance_statistics/img/instance_statistics_button_v12_6.png
deleted file mode 100644
index e5f033141caad1f80fbb7f3af0e421377405effa..0000000000000000000000000000000000000000
Binary files a/doc/user/instance_statistics/img/instance_statistics_button_v12_6.png and /dev/null differ
diff --git a/doc/user/instance_statistics/index.md b/doc/user/instance_statistics/index.md
deleted file mode 100644
index b09651e04ee5d68d1453084d45fcb3498e67695a..0000000000000000000000000000000000000000
--- a/doc/user/instance_statistics/index.md
+++ /dev/null
@@ -1,15 +0,0 @@
-# Instance statistics
-
-> [Introduced](https://gitlab.com/gitlab-org/gitlab-foss/-/issues/41416) in GitLab 11.2.
-
-Instance statistics gives users or admins access to instance-wide analytics.
-They are accessible to all users by default (GitLab admins can restrict its
-visibility in the [Admin Area](../admin_area/settings/usage_statistics.md)),
-and can be accessed via the top bar.
-
-
-
-There are two kinds of statistics:
-
-- [Dev Ops Score](dev_ops_score.md): Provides an overview of your entire instance's feature usage.
-- [User Cohorts](user_cohorts.md): Display the monthly cohorts of new users and their activities over time.