Merge branch '6953-instance-security-dashboard-enable-flag-and-docs-ee' into 'master'

Enable Instance level Security Dashboard feature by default

See merge request gitlab-org/gitlab!18008

doc/README.md

@@ -364,6 +364,7 @@ The following documentation relates to the DevOps **Secure** stage:
 | [Dependency Scanning](user/application_security/dependency_scanning/index.md) **(ULTIMATE)**          | Analyze your dependencies for known vulnerabilities.                   |
 | [Dynamic Application Security Testing (DAST)](user/application_security/dast/index.md) **(ULTIMATE)** | Analyze running web applications for known vulnerabilities.            |
 | [Group Security Dashboard](user/application_security/security_dashboard/index.md#group-security-dashboard) **(ULTIMATE)**      | View vulnerabilities in all the projects in a group and its subgroups. |
+| [Instance Security Dashboard](user/application_security/security_dashboard/index.md#instance-security-dashboard) **(ULTIMATE)**      | View vulnerabilities in all the projects you're interested in. |
 | [License Compliance](user/application_security/license_compliance/index.md) **(ULTIMATE)**            | Search your project's dependencies for their licenses.                 |
 | [Pipeline Security Dashboard](user/application_security/security_dashboard/index.md#pipeline-security-dashboard) **(ULTIMATE)**    | View the security reports for your project's pipelines.               |
 | [Project Security Dashboard](user/application_security/security_dashboard/index.md#project-security-dashboard) **(ULTIMATE)**    | View the latest security reports for your project.                     |

doc/user/application_security/security_dashboard/index.md

@@ -26,7 +26,7 @@ The Security Dashboard supports the following reports:
 
 ## Requirements
 
-To use the group, project or pipeline security dashboard:
+To use the instance, group, project or pipeline security dashboard:
 
 1. At least one project inside a group must be configured with at least one of
    the [supported reports](#supported-reports).
@@ -110,6 +110,31 @@ vulnerabilities are not included either.
 
 Read more on how to [interact with the vulnerabilities](../index.md#interacting-with-the-vulnerabilities).
 
+## Instance Security Dashboard
+
+> [Introduced](https://gitlab.com/gitlab-org/gitlab/issues/6953) in [GitLab Ultimate](https://about.gitlab.com/pricing/) 12.7.
+
+At the instance level, the Security Dashboard displays the vulnerabilities
+present in all of the projects that you have added to it.
+
+You can access the Instance Security Dashboard from the menu
+bar at the top of the page. Under **More**, select **Security**.
+
+![Instance Security Dashboard navigation link](img/instance_security_dashboard_link_v12_4.png)
+
+### Adding projects to the dashboard
+
+To add projects to the dashboard:
+
+1. Click the **Edit dashboard** button on the Instance Security Dashboard page.
+1. Search for and add one or more projects using the **Search your projects** field.
+1. Click the **Add projects** button.
+
+Once added, the dashboard will display the vulnerabilities found in your chosen
+projects.
+
+![Instance Security Dashboard with projects](img/instance_security_dashboard_with_projects_v12_7.png)
+
 ## Keeping the dashboards up to date
 
 The Security Dashboard displays information from the results of the most recent

ee/app/controllers/security/application_controller.rb

@@ -4,13 +4,13 @@ module Security
   class ApplicationController < ::ApplicationController
     before_action :authorize_read_security_dashboard!
     before_action do
-      push_frontend_feature_flag(:security_dashboard)
+      push_frontend_feature_flag(:security_dashboard, default_enabled: true)
     end
 
     private
 
     def authorize_read_security_dashboard!
-      render_404 unless Feature.enabled?(:security_dashboard) &&
+      render_404 unless Feature.enabled?(:security_dashboard, default_enabled: true) &&
         can?(current_user, :read_security_dashboard)
     end
   end

ee/app/helpers/ee/dashboard_helper.rb

@@ -55,7 +55,7 @@ module EE
           links << :operations
         end
 
-        if ::Feature.enabled?(:security_dashboard) && can?(current_user, :read_security_dashboard)
+        if ::Feature.enabled?(:security_dashboard, default_enabled: true) && can?(current_user, :read_security_dashboard)
           links << :security
         end
       end

ee/changelogs/unreleased/6953-instance-security-dashboard-enable-flag-and-docs-ee.yml

+---
+title: Add Instance Security Dashboard feature
+merge_request: 18008
+author:
+type: added