Revert "Merge branch '41416-making-instance-wide-data-tools-more-accessible' into 'master'"

This reverts merge request !20679

20 files changed, 19 insertions, 74 deletions

diff --git a/app/controllers/instance_statistics/cohorts_controller.rb b/app/controllers/admin/cohorts_controller.rb
index 7eba0a5ecdd..10d9d1b5345 100644
--- a/app/controllers/instance_statistics/cohorts_controller.rb
+++ b/app/controllers/admin/cohorts_controller.rb
@@ -1,6 +1,4 @@
-# frozen_string_literal: true
-
-class InstanceStatistics::CohortsController < InstanceStatistics::ApplicationController
+class Admin::CohortsController < Admin::ApplicationController
   def index
     if Gitlab::CurrentSettings.usage_ping_enabled
       cohorts_results = Rails.cache.fetch('cohorts', expires_in: 1.day) do
diff --git a/app/controllers/admin/conversational_development_index_controller.rb b/app/controllers/admin/conversational_development_index_controller.rb
new file mode 100644
index 00000000000..921169d3e2b
--- /dev/null
+++ b/app/controllers/admin/conversational_development_index_controller.rb
@@ -0,0 +1,5 @@
+class Admin::ConversationalDevelopmentIndexController < Admin::ApplicationController
+  def show
+    @metric = ConversationalDevelopmentIndex::Metric.order(:created_at).last&.present
+  end
+end
diff --git a/app/controllers/instance_statistics/application_controller.rb b/app/controllers/instance_statistics/application_controller.rb
deleted file mode 100644
index 162e311f175..00000000000
--- a/app/controllers/instance_statistics/application_controller.rb
+++ /dev/null
@@ -1,8 +0,0 @@
-class InstanceStatistics::ApplicationController < ApplicationController
-  before_action :authorize_read_instance_statistics!
-  layout 'instance_statistics'
-
-  def authorize_read_instance_statistics!
-    render_404 unless can?(current_user, :read_instance_statistics)
-  end
-end
diff --git a/app/controllers/instance_statistics/conversational_development_index_controller.rb b/app/controllers/instance_statistics/conversational_development_index_controller.rb
deleted file mode 100644
index 023ce917e13..00000000000
--- a/app/controllers/instance_statistics/conversational_development_index_controller.rb
+++ /dev/null
@@ -1,5 +0,0 @@
-class InstanceStatistics::ConversationalDevelopmentIndexController < InstanceStatistics::ApplicationController
-  def index
-    @metric = ConversationalDevelopmentIndex::Metric.order(:created_at).last&.present
-  end
-end
diff --git a/app/helpers/application_settings_helper.rb b/app/helpers/application_settings_helper.rb
index 9e2346177a4..358b896702b 100644
--- a/app/helpers/application_settings_helper.rb
+++ b/app/helpers/application_settings_helper.rb
@@ -247,7 +247,6 @@ module ApplicationSettingsHelper
       :unique_ips_limit_per_user,
       :unique_ips_limit_time_window,
       :usage_ping_enabled,
-      :instance_statistics_visibility_private,
       :user_default_external,
       :user_oauth_applications,
       :version_check_enabled,
diff --git a/app/models/application_setting.rb b/app/models/application_setting.rb
index 01a59039cff..f770b219422 100644
--- a/app/models/application_setting.rb
+++ b/app/models/application_setting.rb
@@ -290,7 +290,6 @@ class ApplicationSetting < ActiveRecord::Base
       user_default_external: false,
       polling_interval_multiplier: 1,
       usage_ping_enabled: Settings.gitlab['usage_ping_enabled'],
-      instance_statistics_visibility_private: false,
       gitaly_timeout_fast: 10,
       gitaly_timeout_medium: 30,
       gitaly_timeout_default: 55,
diff --git a/app/policies/global_policy.rb b/app/policies/global_policy.rb
index 16c58730878..6e3827736b2 100644
--- a/app/policies/global_policy.rb
+++ b/app/policies/global_policy.rb
@@ -19,11 +19,6 @@ class GlobalPolicy < BasePolicy
     @user&.required_terms_not_accepted?
   end
 
-  condition(:private_instance_statistics, score: 0) { Gitlab::CurrentSettings.instance_statistics_visibility_private? }
-
-  rule { admin | (~private_instance_statistics & ~anonymous) }
-    .enable :read_instance_statistics
-
   rule { anonymous }.policy do
     prevent :log_in
     prevent :receive_notifications
diff --git a/app/views/admin/application_settings/_usage.html.haml b/app/views/admin/application_settings/_usage.html.haml
index 860e7765168..49a3ee33a85 100644
--- a/app/views/admin/application_settings/_usage.html.haml
+++ b/app/views/admin/application_settings/_usage.html.haml
@@ -23,16 +23,13 @@
             periodically collect usage information.
             = link_to 'Learn more', help_page_path("user/admin_area/settings/usage_statistics", anchor: "usage-ping")
             about what information is shared with GitLab Inc. Visit
-            = link_to 'Cohorts', instance_statistics_cohorts_path(anchor: 'usage-ping')
+            = link_to 'Cohorts', admin_cohorts_path(anchor: 'usage-ping')
             to see the JSON payload sent.
           - else
             The usage ping is disabled, and cannot be configured through this
             form. For more information, see the documentation on
             = succeed '.' do
               = link_to 'deactivating the usage ping', help_page_path('user/admin_area/settings/usage_statistics', anchor: 'deactivate-the-usage-ping')
-    .form-group
-      = f.label :instance_statistics_visibility_private, 'Instance Statistics visibility'
-      = f.select :instance_statistics_visibility_private, options_for_select({'All users' => false, 'Only admins' => true}, Gitlab::CurrentSettings.instance_statistics_visibility_private?), {}, class: 'form-control'
 
   = f.submit 'Save changes', class: "btn btn-success"
 
diff --git a/app/views/instance_statistics/cohorts/_cohorts_table.html.haml b/app/views/admin/cohorts/_cohorts_table.html.haml
index 701a4e62b39..701a4e62b39 100644
--- a/app/views/instance_statistics/cohorts/_cohorts_table.html.haml
+++ b/app/views/admin/cohorts/_cohorts_table.html.haml
diff --git a/app/views/instance_statistics/cohorts/_usage_ping.html.haml b/app/views/admin/cohorts/_usage_ping.html.haml
index 3dda386fcf7..3dda386fcf7 100644
--- a/app/views/instance_statistics/cohorts/_usage_ping.html.haml
+++ b/app/views/admin/cohorts/_usage_ping.html.haml
diff --git a/app/views/instance_statistics/cohorts/index.html.haml b/app/views/admin/cohorts/index.html.haml
index 5e9a8c083af..5e9a8c083af 100644
--- a/app/views/instance_statistics/cohorts/index.html.haml
+++ b/app/views/admin/cohorts/index.html.haml
diff --git a/app/views/instance_statistics/conversational_development_index/_callout.html.haml b/app/views/admin/conversational_development_index/_callout.html.haml
index 33a4dab1e00..33a4dab1e00 100644
--- a/app/views/instance_statistics/conversational_development_index/_callout.html.haml
+++ b/app/views/admin/conversational_development_index/_callout.html.haml
diff --git a/app/views/instance_statistics/conversational_development_index/_card.html.haml b/app/views/admin/conversational_development_index/_card.html.haml
index 57eda06630b..57eda06630b 100644
--- a/app/views/instance_statistics/conversational_development_index/_card.html.haml
+++ b/app/views/admin/conversational_development_index/_card.html.haml
diff --git a/app/views/instance_statistics/conversational_development_index/_disabled.html.haml b/app/views/admin/conversational_development_index/_disabled.html.haml
index 0a741b50960..0a741b50960 100644
--- a/app/views/instance_statistics/conversational_development_index/_disabled.html.haml
+++ b/app/views/admin/conversational_development_index/_disabled.html.haml
diff --git a/app/views/instance_statistics/conversational_development_index/_no_data.html.haml b/app/views/admin/conversational_development_index/_no_data.html.haml
index d69c46194b4..d69c46194b4 100644
--- a/app/views/instance_statistics/conversational_development_index/_no_data.html.haml
+++ b/app/views/admin/conversational_development_index/_no_data.html.haml
diff --git a/app/views/instance_statistics/conversational_development_index/index.html.haml b/app/views/admin/conversational_development_index/show.html.haml
index e3d1aa31dc2..e3d1aa31dc2 100644
--- a/app/views/instance_statistics/conversational_development_index/index.html.haml
+++ b/app/views/admin/conversational_development_index/show.html.haml
diff --git a/app/views/layouts/instance_statistics.html.haml b/app/views/layouts/instance_statistics.html.haml
deleted file mode 100644
index ec3e01600e5..00000000000
--- a/app/views/layouts/instance_statistics.html.haml
+++ /dev/null
@@ -1,6 +0,0 @@
-- page_title "Instance Statistics"
-- header_title "Instance Statistics", instance_statistics_root_path
-- nav "instance_statistics"
-- @left_sidebar = true
-
-= render template: "layouts/application"
diff --git a/app/views/layouts/nav/_dashboard.html.haml b/app/views/layouts/nav/_dashboard.html.haml
index 0bab2cf3d2a..a71a4b13a7e 100644
--- a/app/views/layouts/nav/_dashboard.html.haml
+++ b/app/views/layouts/nav/_dashboard.html.haml
@@ -64,15 +64,11 @@
         = link_to '#', class: 'dashboard-shortcuts-web-ide', title: _('Web IDE') do
           = _('Web IDE')
 
-  - if Gitlab::Sherlock.enabled? || can?(current_user, :read_instance_statistics)
+  - if current_user.admin? || Gitlab::Sherlock.enabled?
     %li.line-separator.d-none.d-sm-block
-  - if can?(current_user, :read_instance_statistics)
-    = nav_link(controller: [:conversational_development_index, :cohorts]) do
-      = link_to instance_statistics_root_path, title: 'Instance Statistics', aria: { label: 'Instance statistics' }, data: {toggle: 'tooltip', placement: 'bottom', container: 'body'} do
-        = sprite_icon('chart', size: 18)
   - if current_user.admin?
     = nav_link(controller: 'admin/dashboard') do
-      = link_to admin_root_path, class: 'admin-icon qa-admin-area-link', title: _('Admin area'), aria: { label: "Admin area" }, data: {toggle: 'tooltip', placement: 'bottom', container: 'body'} do
+      = link_to admin_root_path, class: 'admin-icon qa-admin-area-link', title: _('Admin area'), aria: { label: _("Admin area") }, data: {toggle: 'tooltip', placement: 'bottom', container: 'body'} do
         = sprite_icon('admin', size: 18)
   - if Gitlab::Sherlock.enabled?
     %li
diff --git a/app/views/layouts/nav/sidebar/_admin.html.haml b/app/views/layouts/nav/sidebar/_admin.html.haml
index ff25b040913..0047efa363d 100644
--- a/app/views/layouts/nav/sidebar/_admin.html.haml
+++ b/app/views/layouts/nav/sidebar/_admin.html.haml
@@ -7,14 +7,14 @@
         .sidebar-context-title
           = _('Admin Area')
     %ul.sidebar-top-level-items
-      = nav_link(controller: %w(dashboard admin projects users groups jobs runners gitaly_servers), html_options: {class: 'home'}) do
+      = nav_link(controller: %w(dashboard admin projects users groups jobs runners gitaly_servers cohorts conversational_development_index), html_options: {class: 'home'}) do
         = link_to admin_root_path, class: 'shortcuts-tree' do
           .nav-icon-container
             = sprite_icon('overview')
           %span.nav-item-name
             = _('Overview')
         %ul.sidebar-sub-level-items
-          = nav_link(controller: %w(dashboard admin projects users groups jobs runners gitaly_servers), html_options: { class: "fly-out-top-item" } ) do
+          = nav_link(controller: %w(dashboard admin projects users groups jobs runners gitaly_servers cohorts conversational_development_index), html_options: { class: "fly-out-top-item" } ) do
             = link_to admin_root_path do
               %strong.fly-out-top-item-name
                 = _('Overview')
@@ -47,6 +47,14 @@
             = link_to admin_gitaly_servers_path, title: 'Gitaly Servers' do
               %span
                 = _('Gitaly Servers')
+          = nav_link path: 'cohorts#index' do
+            = link_to admin_cohorts_path, title: _('Cohorts') do
+              %span
+                = _('Cohorts')
+          = nav_link(controller: :conversational_development_index) do
+            = link_to admin_conversational_development_index_path, title: _('ConvDev Index') do
+              %span
+                = _('ConvDev Index')
 
       = nav_link(controller: %w(system_info background_jobs logs health_check requests_profiles)) do
         = link_to admin_system_info_path do
diff --git a/app/views/layouts/nav/sidebar/_instance_statistics.html.haml b/app/views/layouts/nav/sidebar/_instance_statistics.html.haml
deleted file mode 100644
index cb64c97f7b4..00000000000
--- a/app/views/layouts/nav/sidebar/_instance_statistics.html.haml
+++ /dev/null
@@ -1,33 +0,0 @@
-.nav-sidebar{ class: ("sidebar-collapsed-desktop" if collapsed_sidebar?) }
-  .nav-sidebar-inner-scroll
-    .context-header
-      = link_to instance_statistics_root_path, title: 'Instance Statistics' do
-        .avatar-container.s40.settings-avatar
-          = sprite_icon('chart', size: 24)
-        .sidebar-context-title Instance Statistics
-    %ul.sidebar-top-level-items
-      = nav_link(controller: :conversational_development_index) do
-        = link_to instance_statistics_conversational_development_index_index_path do
-          .nav-icon-container
-            = sprite_icon('comment')
-          %span.nav-item-name
-            = _('ConvDev Index')
-        %ul.sidebar-sub-level-items.is-fly-out-only
-          = nav_link(controller: :conversational_development_index, html_options: { class: "fly-out-top-item" } ) do
-            = link_to instance_statistics_conversational_development_index_index_path do
-              %strong.fly-out-top-item-name
-                = _('ConvDev Index')
-
-      = nav_link(controller: :cohorts) do
-        = link_to instance_statistics_cohorts_path do
-          .nav-icon-container
-            = sprite_icon('users')
-          %span.nav-item-name
-            = _('Cohorts')
-        %ul.sidebar-sub-level-items.is-fly-out-only
-          = nav_link(controller: :cohorts, html_options: { class: "fly-out-top-item" } ) do
-            = link_to instance_statistics_cohorts_path do
-              %strong.fly-out-top-item-name
-                = _('Cohorts')
-
-    = render 'shared/sidebar_toggle_button'