Merge branch '293722-Rename-DevOps-Report' into 'master'

Re-name "DevOps Report" as "DevOps Reports"

See merge request gitlab-org/gitlab!81530

app/views/layouts/nav/sidebar/_admin.html.haml

@@ -53,7 +53,7 @@
                 = _('Gitaly Servers')
 
       = nav_link(controller: admin_analytics_nav_links) do
-        = link_to admin_dev_ops_report_path, data: { qa_selector: 'admin_analytics_link' }, class: 'has-sub-items' do
+        = link_to admin_dev_ops_reports_path, data: { qa_selector: 'admin_analytics_link' }, class: 'has-sub-items' do
           .nav-icon-container
             = sprite_icon('chart')
           %span.nav-item-name
@@ -61,12 +61,12 @@
 
         %ul.sidebar-sub-level-items{ data: { qa_selector: 'admin_sidebar_analytics_submenu_content' } }
           = nav_link(controller: admin_analytics_nav_links, html_options: { class: "fly-out-top-item" }) do
-            = link_to admin_dev_ops_report_path do
+            = link_to admin_dev_ops_reports_path do
               %strong.fly-out-top-item-name
                 = _('Analytics')
           %li.divider.fly-out-top-item
           = nav_link(controller: :dev_ops_report) do
-            = link_to admin_dev_ops_report_path, title: _('DevOps Reports') do
+            = link_to admin_dev_ops_reports_path, title: _('DevOps Reports') do
               %span
                 = _('DevOps Reports')
           = nav_link(controller: :usage_trends) do

config/metrics/counts_28d/20210216175000_i_analytics_dev_ops_score_monthly.yml

 ---
 data_category: optional
 key_path: redis_hll_counters.analytics.i_analytics_dev_ops_score_monthly
-description: Unique visitors to /admin/dev_ops_report by month
+description: Unique visitors to /admin/dev_ops_reports by month
 product_section: dev
 product_stage: manage
 product_group: group::optimize

config/routes/admin.rb

@@ -105,7 +105,8 @@ namespace :admin do
   resources :projects, only: [:index]
 
   resources :usage_trends, only: :index
-  resource :dev_ops_report, controller: 'dev_ops_report', only: :show
+  resource :dev_ops_reports, controller: 'dev_ops_report', only: :show
+  get 'dev_ops_report', to: redirect('admin/dev_ops_reports')
   resources :cohorts, only: :index
 
   scope(path: 'projects/*namespace_id',

doc/development/service_ping/index.md

@@ -48,7 +48,7 @@ make better product decisions.
 There are several other benefits to enabling Service Ping:
 
 - As a benefit of having Service Ping active, GitLab lets you analyze the users' activities over time of your GitLab installation.
-- As a benefit of having Service Ping active, GitLab provides you with [DevOps Score](../../user/admin_area/analytics/dev_ops_report.md#devops-score), which gives you an overview of your entire instance's adoption of Concurrent DevOps from planning to monitoring.
+- As a benefit of having Service Ping active, GitLab provides you with [DevOps Score](../../user/admin_area/analytics/dev_ops_reports.md#devops-score), which gives you an overview of your entire instance's adoption of Concurrent DevOps from planning to monitoring.
 - You get better, more proactive support (assuming that our TAMs and support organization used the data to deliver more value).
 - You get insight and advice into how to get the most value out of your investment in GitLab. Wouldn't you want to know that a number of features or values are not being adopted in your organization?
 - You get a report that illustrates how you compare against other similar organizations (anonymized), with specific advice and recommendations on how to improve your DevOps processes.

doc/user/admin_area/analytics/dev_ops_report.md

 ---
-stage: Manage
-group: Optimize
-info: To determine the technical writer assigned to the Stage/Group associated with this page, see https://about.gitlab.com/handbook/engineering/ux/technical-writing/#assignments
+redirect_to: 'dev_ops_reports.md'
+remove_date: '2022-06-16'
 ---
 
-# DevOps Reports **(FREE SELF)**
+This document was moved to [another location](dev_ops_reports.md).
 
-DevOps Reports give you an overview of your entire instance's adoption of
-[Concurrent DevOps](https://about.gitlab.com/topics/concurrent-devops/)
-from planning to monitoring.
-
-To see DevOps Reports:
-
-1. On the top bar, select **Menu > Admin**.
-1. On the left sidebar, select **Analytics > DevOps Reports**.
-
-## DevOps Score
-
-> [Renamed](https://gitlab.com/gitlab-org/gitlab/-/issues/20976) from Conversational Development Index in GitLab 12.6.
-
-NOTE:
-To see the DevOps score, you must activate your GitLab instance's [Service Ping](../settings/usage_statistics.md#service-ping). DevOps Score is a comparative tool, so your score data must be centrally processed by GitLab Inc. first.
-
-You can use the DevOps score to compare your DevOps status to other organizations.
-
-The DevOps Score tab displays usage of major GitLab features on your instance over
-the last 30 days, averaged over the number of billable users in that time period.
-You can also see the Leader usage score, calculated from top-performing instances based on
-[Service Ping data](../settings/usage_statistics.md#service-ping) 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 **DevOps Score** is an average of your
-feature scores.
-
-Service Ping data is aggregated on GitLab servers for analysis. Your usage
-information is **not sent** to any other GitLab instances.
-If you have just started using GitLab, it might take a few weeks for data to be collected before this
-feature is available.
-
-## DevOps Adoption **(ULTIMATE SELF)**
-
-> - [Introduced](https://gitlab.com/gitlab-org/gitlab/-/issues/247112) in GitLab 13.7 as a [Beta feature](../../../policy/alpha-beta-support.md#beta-features).
-> - The Overview tab [introduced](https://gitlab.com/gitlab-org/gitlab/-/issues/330401) in GitLab 14.1.
-> - DAST and SAST metrics [added](https://gitlab.com/gitlab-org/gitlab/-/issues/328033) in GitLab 14.1.
-> - Fuzz Testing metrics [added](https://gitlab.com/gitlab-org/gitlab/-/issues/330398) in GitLab 14.2.
-> - Dependency Scanning metrics [added](https://gitlab.com/gitlab-org/gitlab/-/issues/328034) in GitLab 14.2.
-> - Multi-select [added](https://gitlab.com/gitlab-org/gitlab/-/issues/333586) in GitLab 14.2.
-> - Overview table [added](https://gitlab.com/gitlab-org/gitlab/-/issues/335638) in GitLab 14.3.
-
-DevOps Adoption shows feature adoption for development, security, and operations.
-
-| Category | Feature |
-| ---      | ---      |
-| Development   | Approvals<br>Code owners<br>Issues<br>Merge requests   |
-| Security   | DAST<br>Dependency Scanning<br>Fuzz Testing<br>SAST  |
-| Operations   | Deployments<br>Pipelines<br>Runners   |
-
-You can use Group DevOps Adoption to:
-
-- Identify specific subgroups that are lagging in their adoption of GitLab features, so you can guide them on
-their DevOps journey.
-- Find subgroups that have adopted certain features, and provide guidance to other subgroups on
-how to use those features.
-- Verify if you are getting the return on investment that you expected from GitLab.
-
-## Add or remove a group
-
-To add or remove a subgroup from the DevOps Adoption report:
-
-1. Select **Add or remove groups**.
-1. Select the subgroup you want to add or remove and select **Save changes**.
-
-![DevOps Adoption](img/admin_devops_adoption_v14_2.png)
+<!-- This redirect file can be deleted after <2022-06-16>. -->
+<!-- Before deletion, see: https://docs.gitlab.com/ee/development/documentation/#move-or-rename-a-page -->

doc/user/admin_area/analytics/dev_ops_reports.md

+---
+stage: Manage
+group: Optimize
+info: To determine the technical writer assigned to the Stage/Group associated with this page, see https://about.gitlab.com/handbook/engineering/ux/technical-writing/#assignments
+---
+
+# DevOps Reports **(FREE SELF)**
+
+DevOps Reports give you an overview of your entire instance's adoption of
+[Concurrent DevOps](https://about.gitlab.com/topics/concurrent-devops/)
+from planning to monitoring.
+
+To see DevOps Reports:
+
+1. On the top bar, select **Menu > Admin**.
+1. On the left sidebar, select **Analytics > DevOps Reports**.
+
+## DevOps Score
+
+> [Renamed](https://gitlab.com/gitlab-org/gitlab/-/issues/20976) from Conversational Development Index in GitLab 12.6.
+
+NOTE:
+To see the DevOps score, you must activate your GitLab instance's [Service Ping](../settings/usage_statistics.md#service-ping). DevOps Score is a comparative tool, so your score data must be centrally processed by GitLab Inc. first.
+
+You can use the DevOps score to compare your DevOps status to other organizations.
+
+The DevOps Score tab displays usage of major GitLab features on your instance over
+the last 30 days, averaged over the number of billable users in that time period.
+You can also see the Leader usage score, calculated from top-performing instances based on
+[Service Ping data](../settings/usage_statistics.md#service-ping) 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 **DevOps Score** is an average of your
+feature scores.
+
+Service Ping data is aggregated on GitLab servers for analysis. Your usage
+information is **not sent** to any other GitLab instances.
+If you have just started using GitLab, it might take a few weeks for data to be collected before this
+feature is available.
+
+## DevOps Adoption **(ULTIMATE SELF)**
+
+> - [Introduced](https://gitlab.com/gitlab-org/gitlab/-/issues/247112) in GitLab 13.7 as a [Beta feature](../../../policy/alpha-beta-support.md#beta-features).
+> - The Overview tab [introduced](https://gitlab.com/gitlab-org/gitlab/-/issues/330401) in GitLab 14.1.
+> - DAST and SAST metrics [added](https://gitlab.com/gitlab-org/gitlab/-/issues/328033) in GitLab 14.1.
+> - Fuzz Testing metrics [added](https://gitlab.com/gitlab-org/gitlab/-/issues/330398) in GitLab 14.2.
+> - Dependency Scanning metrics [added](https://gitlab.com/gitlab-org/gitlab/-/issues/328034) in GitLab 14.2.
+> - Multi-select [added](https://gitlab.com/gitlab-org/gitlab/-/issues/333586) in GitLab 14.2.
+> - Overview table [added](https://gitlab.com/gitlab-org/gitlab/-/issues/335638) in GitLab 14.3.
+
+DevOps Adoption shows feature adoption for development, security, and operations.
+
+| Category | Feature |
+| ---      | ---      |
+| Development   | Approvals<br>Code owners<br>Issues<br>Merge requests   |
+| Security   | DAST<br>Dependency Scanning<br>Fuzz Testing<br>SAST  |
+| Operations   | Deployments<br>Pipelines<br>Runners   |
+
+You can use Group DevOps Adoption to:
+
+- Identify specific subgroups that are lagging in their adoption of GitLab features, so you can guide them on
+their DevOps journey.
+- Find subgroups that have adopted certain features, and provide guidance to other subgroups on
+how to use those features.
+- Verify if you are getting the return on investment that you expected from GitLab.
+
+## Add or remove a group
+
+To add or remove a subgroup from the DevOps Adoption report:
+
+1. Select **Add or remove groups**.
+1. Select the subgroup you want to add or remove and select **Save changes**.
+
+![DevOps Adoption](img/admin_devops_adoption_v14_2.png)

doc/user/admin_area/analytics/index.md

@@ -15,5 +15,5 @@ Administrators have access to instance-wide analytics:
 
 There are several kinds of statistics:
 
-- [DevOps Reports](dev_ops_report.md): Provides an overview of your entire instance's feature usage.
+- [DevOps Reports](dev_ops_reports.md): Provides an overview of your entire instance's feature usage.
 - [Usage Trends](usage_trends.md): Shows how much data your instance contains, and how that is changing.

ee/config/metrics/counts_7d/20210216174958_i_analytics_dev_ops_score_weekly.yml

 ---
 data_category: optional
 key_path: redis_hll_counters.analytics.i_analytics_dev_ops_score_weekly
-description: Unique visitors to /admin/dev_ops_report by week
+description: Unique visitors to /admin/dev_ops_reports by week
 product_section: dev
 product_stage: manage
 product_group: group::optimize

ee/spec/features/admin/admin_dev_ops_reports_spec.rb

@@ -33,13 +33,13 @@ RSpec.describe 'DevOps Reports page', :js do
     end
 
     it 'shows the tabbed layout' do
-      visit admin_dev_ops_report_path
+      visit admin_dev_ops_reports_path
 
       expect(page).to have_selector tabs_selector
     end
 
     it 'shows the correct tabs' do
-      visit admin_dev_ops_report_path
+      visit admin_dev_ops_reports_path
 
       within tabs_selector do
         expect(page.all(:css, tab_item_selector).length).to be(6)
@@ -48,7 +48,7 @@ RSpec.describe 'DevOps Reports page', :js do
     end
 
     it 'defaults to the Overview tab' do
-      visit admin_dev_ops_report_path
+      visit admin_dev_ops_reports_path
 
       within tabs_selector do
         expect(page).to have_selector active_tab_selector, text: 'Overview'
@@ -57,7 +57,7 @@ RSpec.describe 'DevOps Reports page', :js do
 
     shared_examples 'displays tab content' do |tab|
       it "displays the #{tab} tab content when selected" do
-        visit admin_dev_ops_report_path
+        visit admin_dev_ops_reports_path
 
         click_link tab
 
@@ -72,22 +72,22 @@ RSpec.describe 'DevOps Reports page', :js do
     end
 
     it 'does not add the tab param when the Overview tab is selected' do
-      visit admin_dev_ops_report_path
+      visit admin_dev_ops_reports_path
 
       within tabs_selector do
         click_link 'Overview'
       end
 
-      expect(page).to have_current_path(admin_dev_ops_report_path)
+      expect(page).to have_current_path(admin_dev_ops_reports_path)
     end
 
     shared_examples 'appends the tab param to the url' do |tab, text|
       it "adds the ?tab=#{tab} param when the #{text} tab is selected" do
-        visit admin_dev_ops_report_path
+        visit admin_dev_ops_reports_path
 
         click_link text
 
-        expect(page).to have_current_path(admin_dev_ops_report_path(tab: tab))
+        expect(page).to have_current_path(admin_dev_ops_reports_path(tab: tab))
       end
     end
 
@@ -96,7 +96,7 @@ RSpec.describe 'DevOps Reports page', :js do
     end
 
     it 'shows the devops core tab when the tab param is set' do
-      visit admin_dev_ops_report_path(tab: 'devops-score')
+      visit admin_dev_ops_reports_path(tab: 'devops-score')
 
       within tabs_selector do
         expect(page).to have_selector active_tab_selector, text: 'DevOps Score'
@@ -105,7 +105,7 @@ RSpec.describe 'DevOps Reports page', :js do
 
     context 'the devops score tab' do
       it 'has dismissable intro callout' do
-        visit admin_dev_ops_report_path(tab: 'devops-score')
+        visit admin_dev_ops_reports_path(tab: 'devops-score')
 
         expect(page).to have_content 'Introducing Your DevOps Reports'
 
@@ -122,13 +122,13 @@ RSpec.describe 'DevOps Reports page', :js do
         end
 
         it 'shows empty state' do
-          visit admin_dev_ops_report_path(tab: 'devops-score')
+          visit admin_dev_ops_reports_path(tab: 'devops-score')
 
           expect(page).to have_text('Service ping is off')
         end
 
         it 'hides the intro callout' do
-          visit admin_dev_ops_report_path(tab: 'devops-score')
+          visit admin_dev_ops_reports_path(tab: 'devops-score')
 
           expect(page).not_to have_content 'Introducing Your DevOps Reports'
         end
@@ -138,7 +138,7 @@ RSpec.describe 'DevOps Reports page', :js do
         it 'shows empty state' do
           stub_application_setting(usage_ping_enabled: true)
 
-          visit admin_dev_ops_report_path(tab: 'devops-score')
+          visit admin_dev_ops_reports_path(tab: 'devops-score')
 
           expect(page).to have_content('Data is still calculating')
         end
@@ -149,7 +149,7 @@ RSpec.describe 'DevOps Reports page', :js do
           stub_application_setting(usage_ping_enabled: true)
           create(:dev_ops_report_metric)
 
-          visit admin_dev_ops_report_path(tab: 'devops-score')
+          visit admin_dev_ops_reports_path(tab: 'devops-score')
 
           expect(page).to have_selector('[data-testid="devops-score-app"]')
         end
@@ -163,7 +163,7 @@ RSpec.describe 'DevOps Reports page', :js do
     end
 
     it 'does not show the tabbed layout' do
-      visit admin_dev_ops_report_path
+      visit admin_dev_ops_reports_path
 
       expect(page).not_to have_selector tabs_selector
     end

spec/features/admin/admin_dev_ops_report_spec.rb → spec/features/admin/admin_dev_ops_reports_spec.rb

@@ -15,7 +15,7 @@ RSpec.describe 'DevOps Report page', :js do
     end
 
     it 'has dismissable intro callout' do
-      visit admin_dev_ops_report_path
+      visit admin_dev_ops_reports_path
 
       expect(page).to have_content 'Introducing Your DevOps Report'
 
@@ -32,13 +32,13 @@ RSpec.describe 'DevOps Report page', :js do
       end
 
       it 'shows empty state' do
-        visit admin_dev_ops_report_path
+        visit admin_dev_ops_reports_path
 
         expect(page).to have_text('Service ping is off')
       end
 
       it 'hides the intro callout' do
-        visit admin_dev_ops_report_path
+        visit admin_dev_ops_reports_path
 
         expect(page).not_to have_content 'Introducing Your DevOps Report'
       end
@@ -48,7 +48,7 @@ RSpec.describe 'DevOps Report page', :js do
       it 'shows empty state' do
         stub_application_setting(usage_ping_enabled: true)
 
-        visit admin_dev_ops_report_path
+        visit admin_dev_ops_reports_path
 
         expect(page).to have_content('Data is still calculating')
       end
@@ -59,7 +59,7 @@ RSpec.describe 'DevOps Report page', :js do
         stub_application_setting(usage_ping_enabled: true)
         create(:dev_ops_report_metric)
 
-        visit admin_dev_ops_report_path
+        visit admin_dev_ops_reports_path
 
         expect(page).to have_selector('[data-testid="devops-score-app"]')
       end

spec/routing/admin_routing_spec.rb

@@ -134,10 +134,17 @@ RSpec.describe Admin::HealthCheckController, "routing" do
   end
 end
 
-# admin_dev_ops_report GET    /admin/dev_ops_report(.:format) admin/dev_ops_report#show
+# admin_dev_ops_reports GET    /admin/dev_ops_reports(.:format) admin/dev_ops_report#show
 RSpec.describe Admin::DevOpsReportController, "routing" do
   it "to #show" do
-    expect(get("/admin/dev_ops_report")).to route_to('admin/dev_ops_report#show')
+    expect(get("/admin/dev_ops_reports")).to route_to('admin/dev_ops_report#show')
+  end
+
+  describe 'admin devops reports' do
+    include RSpec::Rails::RequestExampleGroup
+    it 'redirects from /admin/dev_ops_report to /admin/dev_ops_reports' do
+      expect(get("/admin/dev_ops_report")).to redirect_to(admin_dev_ops_reports_path)
+    end
   end
 end