](https://community-defectdojo.tightknit.community/)
+[
](https://twitter.com/defectdojo)
+[
](https://x.com/defectdojo)
[
](https://www.youtube.com/channel/UCWw9qzqptiIvTqSqhOFuCuQ)
-[Join the OWASP Slack Community](https://owasp.org/slack/invite) and participate in the discussion! You can find us in
-our channel there, [#defectdojo](https://owasp.slack.com/channels/defectdojo). Follow DefectDojo on
-[Twitter](https://twitter.com/defectdojo), [LinkedIn](https://www.linkedin.com/company/defectdojo), and
-[YouTube](https://www.youtube.com/channel/UCWw9qzqptiIvTqSqhOFuCuQ) for project updates!
+Checkout our new [Community Portal](https://community-defectdojo.tightknit.community/) and join the DefectDojo community on [Slack](https://join.slack.com/t/defectdojocommunity/shared_invite/zt-3l9028wlf-ezDB29D_MIh9ShXdesCHZA)!
+
+Follow DefectDojo on [LinkedIn](https://www.linkedin.com/company/defectdojo), [YouTube](https://www.youtube.com/channel/UCWw9qzqptiIvTqSqhOFuCuQ), and [X](https://twitter.com/defectdojo) for platform updates!
## Contributing
@@ -113,7 +95,7 @@ Please see our [contributing guidelines](readme-docs/CONTRIBUTING.md) for detail
## Pro Edition
-[Upgrade to DefectDojo Pro!](https://defectdojo.com/pricing) Pro transcends the do-it-yourself approach of open-source: A new UI, incredibile scalability, API connectors, ServiceNow, GitHub, GitLab, Azure DevOps, automatic data enrichment, prioritization, and more! See all the differentiators at the bottom of our pricing page: [defectdojo.com/pricing](https://defectdojo.com/pricing).
+[Upgrade to DefectDojo Pro!](https://defectdojo.com/pricing) Pro transcends the do-it-yourself approach of open-source: A new UI, risk-based vulnerability management, incredibile scalability, API connectors, ServiceNow, GitHub, GitLab, Azure DevOps, automatic data enrichment, prioritization, and more! See all the differentiators at the bottom of our pricing page: [defectdojo.com/pricing](https://defectdojo.com/pricing).
Alternatively, for information please email hello@defectdojo.com
@@ -128,7 +110,6 @@ Core Moderators can help you with pull requests or feedback on dev ideas:
* Cody Maffucci ([@Maffooch](https://github.com/maffooch) | [LinkedIn](https://www.linkedin.com/in/cody-maffucci))
Moderators can help you with pull requests or feedback on dev ideas:
-* Charles Neill ([@cneill](https://github.com/cneill) | [@ccneill](https://twitter.com/ccneill))
* Blake Owens ([@blakeaowens](https://github.com/blakeaowens))
## Hall of Fame
@@ -148,6 +129,11 @@ Moderators can help you with pull requests or feedback on dev ideas:
Aaron has been a long time contributor and user of DefectDojo. He did the second major UI overhaul and his
contributions include automation enhancements, CI/CD engagements, increased metadata at the product level, and many
more.
+* Jay Paz ([@jjpaz](https://github.com/grendel513)) – Jay was a DefectDojo
+ maintainer for years. He performed Dojo's first UI overhaul, optomized code structure/features, and added numerous enhancements.
+* Charles Neill ([@ccneill](https://github.com/cneill)) – Charles served as a
+ maintainer of DefectDojo for years and wrote some of Dojo's core functionality.
+
## Security
diff --git a/components/package.json b/components/package.json
index f652c2733ea..c25b207b862 100644
--- a/components/package.json
+++ b/components/package.json
@@ -1,6 +1,6 @@
{
"name": "defectdojo",
- "version": "2.54.3",
+ "version": "2.55.0",
"license" : "BSD-3-Clause",
"private": true,
"dependencies": {
@@ -24,7 +24,7 @@
"google-code-prettify": "^1.0.0",
"jquery": "^3.7.1",
"jquery-highlight": "3.5.0",
- "jquery-ui": "1.14.1",
+ "jquery-ui": "1.14.2",
"jquery.cookie": "1.4.1",
"jquery.flot.tooltip": "^0.9.0",
"jquery.hotkeys": "jeresig/jquery.hotkeys#master",
@@ -33,7 +33,7 @@
"metismenu": "~3.0.7",
"moment": "^2.30.1",
"morris.js": "morrisjs/morris.js",
- "pdfmake": "^0.3.0",
+ "pdfmake": "^0.3.3",
"startbootstrap-sb-admin-2": "1.0.7"
},
"engines": {
diff --git a/components/yarn.lock b/components/yarn.lock
index 8f2f00bbfa1..ecfd05a3377 100644
--- a/components/yarn.lock
+++ b/components/yarn.lock
@@ -287,10 +287,10 @@ jquery-highlight@3.5.0:
dependencies:
jquery ">= 1.0.0"
-jquery-ui@1.14.1:
- version "1.14.1"
- resolved "https://registry.yarnpkg.com/jquery-ui/-/jquery-ui-1.14.1.tgz#ba342ea3ffff662b787595391f607d923313e040"
- integrity sha512-DhzsYH8VeIvOaxwi+B/2BCsFFT5EGjShdzOcm5DssWjtcpGWIMsn66rJciDA6jBruzNiLf1q0KvwMoX1uGNvnQ==
+jquery-ui@1.14.2:
+ version "1.14.2"
+ resolved "https://registry.yarnpkg.com/jquery-ui/-/jquery-ui-1.14.2.tgz#515288b5c730b720acca6e53a0366827ad834053"
+ integrity sha512-1gSl7PUjyipa2adSr780Ujk16faicrV7PjPPzPtvWk7tTqBnsqp67NNV9jZK2+BIxUPXWSnIUU/LBCgwgGZE+Q==
dependencies:
jquery ">=1.12.0 <5.0.0"
@@ -385,10 +385,10 @@ pdfkit@^0.17.2:
linebreak "^1.1.0"
png-js "^1.0.0"
-pdfmake@^0.3.0:
- version "0.3.0"
- resolved "https://registry.yarnpkg.com/pdfmake/-/pdfmake-0.3.0.tgz#b42c5af9aef4095f1310564d4a2f2d49f950cae9"
- integrity sha512-sS7ow3ZrdFjlC7s4J5k3UA5IHQQbXRs6+NtdzfWDR0SvPa7+M8d69rITObFAsJ4t6iwkKRsc87Q+I/gFlTUVQg==
+pdfmake@^0.3.3:
+ version "0.3.3"
+ resolved "https://registry.yarnpkg.com/pdfmake/-/pdfmake-0.3.3.tgz#2705e8fabff4bf52a4a7b7ae9d93caee1b200cb7"
+ integrity sha512-jSnF8rVLkbLLX37bnXWRFhEDO48quE7OIg7lgWBa6ihAbpCxASaBLWFOXNxSDeLBNt92304SBwpYcPkJnIArlA==
dependencies:
linebreak "^1.1.0"
pdfkit "^0.17.2"
diff --git a/docker-compose.override.dev.yml b/docker-compose.override.dev.yml
index d3d3a3cd4c1..db1da0d9d7a 100644
--- a/docker-compose.override.dev.yml
+++ b/docker-compose.override.dev.yml
@@ -16,6 +16,10 @@ services:
DD_ADMIN_PASSWORD: "${DD_ADMIN_PASSWORD:-admin}"
DD_EMAIL_URL: "smtp://mailhog:1025"
celeryworker:
+ build:
+ context: .
+ dockerfile: Dockerfile.django-${DEFECT_DOJO_OS:-debian}
+ target: development
entrypoint: ['/wait-for-it.sh', '${DD_DATABASE_HOST:-postgres}:${DD_DATABASE_PORT:-5432}', '-t', '30', '--', '/entrypoint-celery-worker-dev.sh']
volumes:
- '.:/app:z'
@@ -24,12 +28,20 @@ services:
DD_DEBUG: 'True'
DD_EMAIL_URL: "smtp://mailhog:1025"
celerybeat:
+ build:
+ context: .
+ dockerfile: Dockerfile.django-${DEFECT_DOJO_OS:-debian}
+ target: development
volumes:
- '.:/app:z'
environment:
PYTHONWARNINGS: error # We are strict about Warnings during development
DD_DEBUG: 'True'
initializer:
+ build:
+ context: .
+ dockerfile: Dockerfile.django-${DEFECT_DOJO_OS:-debian}
+ target: development
volumes:
- '.:/app:z'
environment:
@@ -60,4 +72,4 @@ services:
protocol: tcp
mode: host
"webhook.endpoint":
- image: mccutchen/go-httpbin:2.19.0@sha256:be41c6c3772393c097e15f9f8ac381de4ce9e9841c545556af98fbe2e707c619
+ image: mccutchen/go-httpbin:2.20.0@sha256:b1620821b6ff191d911629f87a720b88df5397c2554045f1cfb1ffde17c9b898
diff --git a/docker-compose.override.integration_tests.yml b/docker-compose.override.integration_tests.yml
index 8d6efe954f7..24d522f73a0 100644
--- a/docker-compose.override.integration_tests.yml
+++ b/docker-compose.override.integration_tests.yml
@@ -36,6 +36,7 @@ services:
DD_SECURE_CROSS_ORIGIN_OPENER_POLICY: 'None'
DD_SECRET_KEY: "${DD_SECRET_KEY:-.}"
DD_EMAIL_URL: "smtp://mailhog:1025"
+ DD_V3_FEATURE_LOCATIONS: ${DD_V3_FEATURE_LOCATIONS:-False}
celerybeat:
environment:
DD_DATABASE_URL: ${DD_TEST_DATABASE_URL:-postgresql://defectdojo:defectdojo@postgres:5432/test_defectdojo}
@@ -43,6 +44,7 @@ services:
entrypoint: ['/wait-for-it.sh', '${DD_DATABASE_HOST:-postgres}:${DD_DATABASE_PORT:-5432}', '-t', '30', '--', '/entrypoint-celery-worker-dev.sh']
environment:
DD_DATABASE_URL: ${DD_TEST_DATABASE_URL:-postgresql://defectdojo:defectdojo@postgres:5432/test_defectdojo}
+ DD_V3_FEATURE_LOCATIONS: ${DD_V3_FEATURE_LOCATIONS:-False}
initializer:
environment:
PYTHONWARNINGS: error # We are strict about Warnings during testing
diff --git a/docker-compose.override.unit_tests_cicd.yml b/docker-compose.override.unit_tests_cicd.yml
index 1151d43600a..ee52511b0ec 100644
--- a/docker-compose.override.unit_tests_cicd.yml
+++ b/docker-compose.override.unit_tests_cicd.yml
@@ -28,6 +28,7 @@ services:
DD_CELERY_BROKER_PATH: '/dojo.celerydb.sqlite'
DD_CELERY_BROKER_PARAMS: ''
DD_JIRA_EXTRA_ISSUE_TYPES: 'Vulnerability' # Shouldn't trigger a migration error
+ DD_V3_FEATURE_LOCATIONS: ${DD_V3_FEATURE_LOCATIONS:-False}
celerybeat: !reset
celeryworker: !reset
initializer: !reset
diff --git a/docker-compose.yml b/docker-compose.yml
index fb566f29611..d8a1b14d4a9 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -120,7 +120,7 @@ services:
source: ./docker/extra_settings
target: /app/docker/extra_settings
postgres:
- image: postgres:18.1-alpine@sha256:b40d931bd0e7ce6eecc59a5a6ac3b3c04a01e559750e73e7086b6dbd7f8bf545
+ image: postgres:18.1-alpine@sha256:4eb15de8e7b692c02427a2df278d18eb89422a534e428efb6d43c968250334d4
environment:
POSTGRES_DB: ${DD_DATABASE_NAME:-defectdojo}
POSTGRES_USER: ${DD_DATABASE_USER:-defectdojo}
diff --git a/docs/assets/images/import_scan_ui.png b/docs/assets/images/import_scan_ui.png
index 851dfa95d34..ccf9a1b4aee 100644
Binary files a/docs/assets/images/import_scan_ui.png and b/docs/assets/images/import_scan_ui.png differ
diff --git a/docs/assets/images/metrics_image1.png b/docs/assets/images/metrics_image1.png
new file mode 100644
index 00000000000..6cc5b8f0119
Binary files /dev/null and b/docs/assets/images/metrics_image1.png differ
diff --git a/docs/assets/images/metrics_image2.png b/docs/assets/images/metrics_image2.png
new file mode 100644
index 00000000000..4216af8301f
Binary files /dev/null and b/docs/assets/images/metrics_image2.png differ
diff --git a/docs/assets/images/metrics_image3.png b/docs/assets/images/metrics_image3.png
new file mode 100644
index 00000000000..31b902848a8
Binary files /dev/null and b/docs/assets/images/metrics_image3.png differ
diff --git a/docs/assets/images/metrics_image4.gif b/docs/assets/images/metrics_image4.gif
new file mode 100644
index 00000000000..b13835114f5
Binary files /dev/null and b/docs/assets/images/metrics_image4.gif differ
diff --git a/docs/assets/images/metrics_image6.png b/docs/assets/images/metrics_image6.png
new file mode 100644
index 00000000000..1e2bbfdcab6
Binary files /dev/null and b/docs/assets/images/metrics_image6.png differ
diff --git a/docs/assets/images/updated-dojo-chop.png b/docs/assets/images/updated-dojo-chop.png
new file mode 100644
index 00000000000..c69904b7ada
Binary files /dev/null and b/docs/assets/images/updated-dojo-chop.png differ
diff --git a/docs/assets/images/x_logo.jpg b/docs/assets/images/x_logo.jpg
new file mode 100644
index 00000000000..cf44cd38143
Binary files /dev/null and b/docs/assets/images/x_logo.jpg differ
diff --git a/docs/assets/js/custom.js b/docs/assets/js/custom.js
index c5525d04e5e..f6cb612dd0c 100644
--- a/docs/assets/js/custom.js
+++ b/docs/assets/js/custom.js
@@ -1 +1,60 @@
-// Put your custom JS code here
+// custom js
+
+
+// version toggler
+(() => {
+ "use strict";
+
+ console.log("[VersionToggle] custom.js loaded");
+
+ const setVersion = (version) => {
+ console.log("[VersionToggle] Setting version to:", version);
+
+ document.querySelectorAll(".version-opensource, .version-pro").forEach(el => {
+ el.style.display = el.classList.contains(`version-${version}`) ? "" : "none";
+ });
+
+ localStorage.setItem("version", version);
+ console.log("[VersionToggle] localStorage updated:", localStorage.getItem("version"));
+
+ // Update dropdown
+ const selects = document.querySelectorAll("#version-select");
+ selects.forEach(sel => {
+ sel.value = version;
+ sel.dataset.version = version;
+ sel.style.visibility = "visible";
+ });
+
+ // unhide sidebar after version is applied
+ const sidebar = document.querySelector(".docs-sidebar");
+ if (sidebar) {
+ sidebar.style.visibility = "visible";
+ console.log("[VersionToggle] Sidebar revealed");
+ }
+ };
+
+ const initVersionToggle = () => {
+ const storedVersion = localStorage.getItem("version") || "opensource";
+ console.log("[VersionToggle] Stored version:", storedVersion);
+ setVersion(storedVersion);
+ };
+
+ // Delegated listener on body
+ document.body.addEventListener("change", (e) => {
+ if (e.target && e.target.id === "version-select") {
+ console.log("[VersionToggle] Dropdown changed to:", e.target.value);
+ setVersion(e.target.value);
+ }
+ });
+
+ // Run on DOM ready
+ window.addEventListener("DOMContentLoaded", initVersionToggle);
+
+ // MutationObserver to detect dynamically replaced sidebar
+ const observer = new MutationObserver(() => {
+ // Re-run init to make sure menus match stored version
+ initVersionToggle();
+ });
+ observer.observe(document.body, { childList: true, subtree: true });
+
+})();
diff --git a/docs/assets/scss/common/_custom.scss b/docs/assets/scss/common/_custom.scss
index e3429be7722..d16f34214b7 100644
--- a/docs/assets/scss/common/_custom.scss
+++ b/docs/assets/scss/common/_custom.scss
@@ -43,4 +43,38 @@
.DocSearch-Modal {
position: fixed !important;
}
+}
+
+.logo-darkmode {
+ display: none;
+}
+
+[data-bs-theme="dark"] .logo-lightmode {
+ display: none;
+}
+
+[data-bs-theme="dark"] .logo-darkmode {
+ display: inline-block;
+}
+
+html {
+ font-size: 85%; /* scales all rem/em fonts */
+}
+
+/* Hide sidebar until version is resolved */
+.docs-sidebar {
+ visibility: hidden;
+}
+
+
+#version-select[data-version="opensource"] {
+ background-color: #003964b7;
+ border: 2px solid #003864;
+ color: white;
+}
+
+#version-select[data-version="pro"] {
+ background-color: #a84e32b7;
+ border: 2px solid #a84e32;
+ color: white;
}
\ No newline at end of file
diff --git a/docs/config/_default/menus/menus.en.toml b/docs/config/_default/menus/menus.en.toml
index 2189b85513a..58752fbcba0 100644
--- a/docs/config/_default/menus/menus.en.toml
+++ b/docs/config/_default/menus/menus.en.toml
@@ -1,28 +1,48 @@
[[main]]
- name = "Docs Home"
- url = "/en/about_defectdojo/about_docs/"
+ name = "Get started ⏷"
+ url = "/get_started/about/about_defectdojo"
weight = 10
[[main]]
- name = "Supported Tools"
- url = "/supported_tools/"
- weight = 11
+ name = "Import data ⏷"
+ url = "/import_data/import_intro/comparison/"
+ weight = 12
[[main]]
- name = "Pro Features"
- url = "/en/about_defectdojo/pro_features"
+ name = "Triage Findings ⏷"
+ url = "/triage_findings/findings_workflows/intro_to_findings/"
weight = 12
[[main]]
- name = "Changelog"
- url = "/en/changelog/changelog/"
+ name = "Model your assets ⏷"
+ url = "/asset_modelling/hierarchy/pro__assets_organizations/"
weight = 13
[[main]]
- name = "Support"
- url = "/en/about_defectdojo/contact_defectdojo_support"
+ name = "Metrics & reports ⏷"
+ url = "/metrics_reports/dashboards/introduction_dashboard/"
weight = 14
+[[main]]
+ name = "Admin ⏷"
+ url = "/admin/admin_intro/intro/"
+ weight = 16
+
+[[main]]
+ name = "Issue tracking ⏷"
+ url = "/issue_tracking/intro/intro/"
+ weight = 15
+
+[[main]]
+ name = "Automation ⏷"
+ url = "/automation/api/api-v2-docs/"
+ weight = 15
+
+[[main]]
+ name = "Supported tools ⏷"
+ url = "/supported_tools/"
+ weight = 16
+
[[social]]
name = "YouTube"
pre = ''
diff --git a/docs/config/_default/params.toml b/docs/config/_default/params.toml
index 876e6d44e2f..36331f1428b 100644
--- a/docs/config/_default/params.toml
+++ b/docs/config/_default/params.toml
@@ -44,9 +44,21 @@ mainSections = ["docs"]
bootstrapJavascript = false # false (default) or true
# Nav
- sectionNav = ["docs", "en", "supported_tools"] # ["docs"] (default) or list of sections (e.g. ["docs", "guides"])
+ sectionNav = [
+ "docs",
+ "en",
+ "supported_tools",
+ "get_started",
+ "import_data",
+ "triage_findings",
+ "metrics_reports",
+ "admin",
+ "automation",
+ "asset_modelling",
+ "issue_tracking"] # ["docs"] (default) or list of sections (e.g. ["docs", "guides"])
+
toTopButton = false # false (default) or true
- breadcrumbTrail = true # false (default) or true
+ breadcrumbTrail = false # false (default) or true
headlineHash = true # true (default) or false
scrollSpy = true # true (default) or false
diff --git a/docs/content/admin/admin_intro/_index.md b/docs/content/admin/admin_intro/_index.md
new file mode 100644
index 00000000000..8452f739bba
--- /dev/null
+++ b/docs/content/admin/admin_intro/_index.md
@@ -0,0 +1,16 @@
+---
+title: "Intro"
+description: ""
+summary: ""
+date: 2023-09-07T16:06:50+02:00
+lastmod: 2023-09-07T16:06:50+02:00
+draft: false
+weight: 3
+chapter: true
+seo:
+ title: "" # custom title (optional)
+ description: "" # custom description (recommended)
+ canonical: "" # custom canonical URL (optional)
+ robots: "" # custom robot tags (optional)
+exclude_search: true
+---
\ No newline at end of file
diff --git a/docs/content/admin/admin_intro/intro.md b/docs/content/admin/admin_intro/intro.md
new file mode 100644
index 00000000000..eef83cdd763
--- /dev/null
+++ b/docs/content/admin/admin_intro/intro.md
@@ -0,0 +1,9 @@
+---
+title: "DefectDojo Admin Controls"
+description: "Administrative controls for configuring, securing, and maintaining your DefectDojo instance."
+weight: 0
+---
+
+Admin actions in DefectDojo provide the controls needed to configure and maintain the platform across your organization. These actions are designed for administrators who are responsible for user management, system configuration, and ensuring DefectDojo operates securely and reliably at scale.
+
+Administrative actions allow you to manage core aspects of DefectDojo, including authentication methods, user access, global settings, and integrations. From initial setup to ongoing maintenance, these controls define how DefectDojo behaves and how users interact with it.
\ No newline at end of file
diff --git a/docs/content/en/customize_dojo/notifications/_index.md b/docs/content/admin/notifications/_index.md
similarity index 93%
rename from docs/content/en/customize_dojo/notifications/_index.md
rename to docs/content/admin/notifications/_index.md
index 218ba05ea85..3c6eb3a19d5 100644
--- a/docs/content/en/customize_dojo/notifications/_index.md
+++ b/docs/content/admin/notifications/_index.md
@@ -6,8 +6,6 @@ lastmod: 2023-09-07T16:06:50+02:00
draft: false
weight: 7
chapter: true
-sidebar:
- collapsed: true
seo:
title: "" # custom title (optional)
description: "" # custom description (recommended)
diff --git a/docs/content/en/customize_dojo/notifications/about_notifications.md b/docs/content/admin/notifications/about_notifications.md
similarity index 97%
rename from docs/content/en/customize_dojo/notifications/about_notifications.md
rename to docs/content/admin/notifications/about_notifications.md
index 1426d42ac5d..cb27b5e0995 100644
--- a/docs/content/en/customize_dojo/notifications/about_notifications.md
+++ b/docs/content/admin/notifications/about_notifications.md
@@ -74,4 +74,4 @@ For more information about this behavior see the [related pull request #9699](ht
### Webhooks (experimental)
-DefectDojo also supports webhooks that follow the same events as other notifications (you can be notified in the same situations). Details about setup are described in [related page](/en/open_source/notification_webhooks/how_to).
+DefectDojo also supports webhooks that follow the same events as other notifications (you can be notified in the same situations). Details about setup are described in [related page](/open_source/notification_webhooks/how_to).
diff --git a/docs/content/en/customize_dojo/notifications/configure_personal_notifs.md b/docs/content/admin/notifications/configure_personal_notifs.md
similarity index 100%
rename from docs/content/en/customize_dojo/notifications/configure_personal_notifs.md
rename to docs/content/admin/notifications/configure_personal_notifs.md
diff --git a/docs/content/en/customize_dojo/notifications/configure_system_notifs.md b/docs/content/admin/notifications/configure_system_notifs.md
similarity index 100%
rename from docs/content/en/customize_dojo/notifications/configure_system_notifs.md
rename to docs/content/admin/notifications/configure_system_notifs.md
diff --git a/docs/content/en/customize_dojo/notifications/email_slack_teams.md b/docs/content/admin/notifications/email_slack_teams.md
similarity index 100%
rename from docs/content/en/customize_dojo/notifications/email_slack_teams.md
rename to docs/content/admin/notifications/email_slack_teams.md
diff --git a/docs/content/en/customize_dojo/user_management/_index.md b/docs/content/admin/user_management/_index.md
similarity index 93%
rename from docs/content/en/customize_dojo/user_management/_index.md
rename to docs/content/admin/user_management/_index.md
index d7ef4c307e1..e35cf318f4b 100644
--- a/docs/content/en/customize_dojo/user_management/_index.md
+++ b/docs/content/admin/user_management/_index.md
@@ -7,8 +7,6 @@ lastmod: 2023-09-07T16:06:50+02:00
draft: false
weight: 5
chapter: true
-sidebar:
- collapsed: true
seo:
title: "" # custom title (optional)
description: "" # custom description (recommended)
diff --git a/docs/content/en/customize_dojo/user_management/about_perms_and_roles.md b/docs/content/admin/user_management/about_perms_and_roles.md
similarity index 100%
rename from docs/content/en/customize_dojo/user_management/about_perms_and_roles.md
rename to docs/content/admin/user_management/about_perms_and_roles.md
diff --git a/docs/content/en/customize_dojo/user_management/audit_logging.md b/docs/content/admin/user_management/audit_logging.md
similarity index 100%
rename from docs/content/en/customize_dojo/user_management/audit_logging.md
rename to docs/content/admin/user_management/audit_logging.md
diff --git a/docs/content/en/customize_dojo/user_management/configure_sso.md b/docs/content/admin/user_management/configure_sso.md
similarity index 98%
rename from docs/content/en/customize_dojo/user_management/configure_sso.md
rename to docs/content/admin/user_management/configure_sso.md
index e86eb3fb1f5..67d804d6e7d 100644
--- a/docs/content/en/customize_dojo/user_management/configure_sso.md
+++ b/docs/content/admin/user_management/configure_sso.md
@@ -16,7 +16,7 @@ Users can connect to DefectDojo with a Username and Password, but if you prefer,
All of these methods can only be configured by a Superuser in DefectDojo. DefectDojo Pro users can quickly set up SSO through their system settings, while Open Source users will need to configure these settings on the back-end by setting an environment variable within Docker. This article covers both methods of configuration.
-**NOTE: DefectDojo Pro users will all need to add the IP addresses of SAML or SSO services to their Firewall whitelist. See [Firewall Rules](/en/cloud_management/using-cloud-manager/#changing-your-firewall-settings) for more information.**
+**NOTE: DefectDojo Pro users will all need to add the IP addresses of SAML or SSO services to their Firewall whitelist. See [Firewall Rules](/get_started/pro/cloud/using-cloud-manager/#changing-your-firewall-settings) for more information.**
## Disable username / password use
You may wish to disable traditional username/password login on your instance.
@@ -70,7 +70,7 @@ Both DefectDojo Pro
### Open-Source
-Open-Source users will need to map these variables in the local_settings.py file. (see [Configuration](/en/open_source/installation/configuration/)).
+Open-Source users will need to map these variables in the local_settings.py file. (see [Configuration](/get_started/open_source/configuration/)).
1. Fill out the variables as follows:
{{< highlight python >}}
@@ -143,7 +143,7 @@ When a user is removed from a given group in Azure AD, they will also be removed
### Open-Source
-Open-Source users will need to set these variables as an environment variable, or without the `DD_` prefix in the `local_settings.py` file. (see [Configuration](/en/open_source/installation/configuration)).
+Open-Source users will need to set these variables as an environment variable, or without the `DD_` prefix in the `local_settings.py` file. (see [Configuration](/get_started/open_source/configuration)).
1. Set the following environment variables
@@ -215,7 +215,7 @@ Both DefectDojo Pro
### Open-Source
-Open-Source users will need to set these variables as an environment variable, or without the `DD_` prefix in the `local_settings.py` file. (see [Configuration](/en/open_source/installation/configuration)).
+Open-Source users will need to set these variables as an environment variable, or without the `DD_` prefix in the `local_settings.py` file. (see [Configuration](/get_started/open_source/configuration)).
1. Set the following environment variables
{{< highlight python >}}
@@ -261,7 +261,7 @@ Follow along below.
### Open-Source
-Open-Source users will need to set these variables as an environment variable, or without the `DD_` prefix in the `local_settings.py` file. (see [Configuration](/en/open_source/installation/configuration)).
+Open-Source users will need to set these variables as an environment variable, or without the `DD_` prefix in the `local_settings.py` file. (see [Configuration](/get_started/open_source/configuration)).
1. Set the following environment variables
{{< highlight python >}}
@@ -323,7 +323,7 @@ In order to use Google Authentication, a Google Authentication Server will need
### Open-Source
-Open-Source users will need to set these variables as an environment variable, or without the `DD_` prefix in the `local_settings.py` file. (see [Configuration](/en/open_source/installation/configuration)).
+Open-Source users will need to set these variables as an environment variable, or without the `DD_` prefix in the `local_settings.py` file. (see [Configuration](/get_started/open_source/configuration)).
1. Set the following environment variables
@@ -407,7 +407,7 @@ This guide assumes you already have a KeyCloak Realm set up. If not, you will n
### Open-Source
-Open-Source users will need to set these variables as an environment variable, or without the `DD_` prefix in the `local_settings.py` file. (see [Configuration](/en/open_source/installation/configuration)).
+Open-Source users will need to set these variables as an environment variable, or without the `DD_` prefix in the `local_settings.py` file. (see [Configuration](/get_started/open_source/configuration)).
1. Set the following environment variables
@@ -495,7 +495,7 @@ Both DefectDojo Pro
### Open-Source
-Open-Source users will need to set these variables as an environment variable, or without the `DD_` prefix in the `local_settings.py` file. (see [Configuration](/en/open_source/installation/configuration)).
+Open-Source users will need to set these variables as an environment variable, or without the `DD_` prefix in the `local_settings.py` file. (see [Configuration](/get_started/open_source/configuration)).
1. Set the following environment variables
@@ -621,7 +621,7 @@ The left side of the ‘=’ sign represents the attribute you want to map from
### Open-Source SAML
1. Navigate to your SAML IdP and find your metadata.
-2. Set these variables as an environment variable, or without the `DD_` prefix in the `local_settings.py` file. (see [Configuration](/en/open_source/installation/configuration)).
+2. Set these variables as an environment variable, or without the `DD_` prefix in the `local_settings.py` file. (see [Configuration](/get_started/open_source/configuration)).
{{< highlight python >}}
DD_SAML2_ENABLED=(bool, **True**),
diff --git a/docs/content/en/customize_dojo/user_management/create_user_group.md b/docs/content/admin/user_management/create_user_group.md
similarity index 100%
rename from docs/content/en/customize_dojo/user_management/create_user_group.md
rename to docs/content/admin/user_management/create_user_group.md
diff --git a/docs/content/admin/user_management/pro_permissions_overhaul.md b/docs/content/admin/user_management/pro_permissions_overhaul.md
new file mode 100644
index 00000000000..ba174ac7eee
--- /dev/null
+++ b/docs/content/admin/user_management/pro_permissions_overhaul.md
@@ -0,0 +1,52 @@
+---
+title: "Set Permissions in Pro"
+description: "Overhaul, pro feature"
+weight: 3
+audience: pro
+---
+
+## Introduction to Permission Types
+
+Individual users have four different kinds of permission that they can be assigned:
+
+* Users can be assigned as **Members to Products or Product Types**. This allows them to view and interact with Data Types (Product Types, Products, Engagements, Tests and Findings) in DefectDojo depending on the role they are assigned on the specific Product. Users can have multiple Product or Product Type memberships, with different levels of access.
+
+* Users can also have **Configuration Permissions** assigned, which allow them to access configuration pages in DefectDojo. Configuration Permissions are not related to Products or Product Types.
+
+* Users can be assigned **Global Roles**, which give them a standardized level of access to all Products and Product Types.
+
+* Users can be set up as **Superusers**: administrator level roles which give them control and access to all DefectDojo data and configuration.
+
+You can also create Groups if you want to assign Product Membership, Configuration Permissions or Global Roles to a group of users at the same time. If you have a large number of users in DefectDojo, such as a dedicated testing team for a particular Product, Groups may be a more helpful feature.
+
+## Superusers \& Global Roles
+
+Part of your Role\-Based Access Control (RBAC) configuration may require you to create additional Superusers, or users with Global Roles.
+
+* Superusers (Admins) have no limitations in the system. They can change all settings, manage users and have read / write access to all data. They can also change access rules for all users in DefectDojo. Superusers will also receive notifications for all system issues and alerts.
+* Users with Global Roles can view and interact with any Data Type (Product Types, Products, Engagements, Tests and Findings) in DefectDojo depending on their assigned Role. For more information about each Role and associated privileges, please refer to our Introduction to Roles article.
+* Users can also have specific Configuration Permissions assigned, allowing them to access certain DefectDojo configuration pages. Users have no Configuration Permissions by default.
+
+By default, the first account created on a new DefectDojo instance will have Superuser permissions. That user will be able to edit permissions for all subsequent DefectDojo users. Only an existing Superuser can add another superuser, or add a Global Role to a user.
+
+Permissions in DefectDojo Pro have been simplified, to make it easier to assign object access. This feature can be accessed through the [Pro UI](/get_started/about/ui_pro_vs_os/).
+
+### Opening the Permissions window
+
+
+
+When looking at Product Type or Product, you can open the Permissions window to set permissions quickly. This menu can be found in a Table by clicking the horizontal dots **"⋮"**. IF looking at an individual **Product** or **Product Type** page, this menu can be found under the blue gear ‘⚙️’.
+
+## Setting Permissions through the permissions window
+
+
+
+1. At the top of this window, you can choose to manage permissions for an individual user or for a [user group](../create_user_group).
+2. Here, you can select a user or group to add to the Product, and select the [Role](../about_perms_and_roles) that you want that user to have.
+3. On the lower table, you can see a list of all users or groups who have access to this object. You can also quickly assign a new role for one of these users or groups from the drop-down menu.
+
+## Setting Configuration Permissions through the User view
+
+A user's configuration permissions can now be set in a more user-friendly approach. From the Users View, all configuration permissions are displayed in a dropdown, then grouped by the permission type. If the selection of configuration permissions is different from their current value, an “Update Configuration Permissions” button is displayed. When clicked, the user will be asked to confirm they would like to update the permissions for the selected group before an update is made.
+
+
diff --git a/docs/content/en/customize_dojo/user_management/set_user_permissions.md b/docs/content/admin/user_management/set_user_permissions.md
similarity index 97%
rename from docs/content/en/customize_dojo/user_management/set_user_permissions.md
rename to docs/content/admin/user_management/set_user_permissions.md
index 4c81d381913..538cde02d26 100644
--- a/docs/content/en/customize_dojo/user_management/set_user_permissions.md
+++ b/docs/content/admin/user_management/set_user_permissions.md
@@ -2,6 +2,7 @@
title: "Set a User's permissions"
description: "How to grant Roles & Permissions to a user, as well as superuser status"
weight: 2
+audience: opensource
---
## Introduction to Permission Types
@@ -42,7 +43,7 @@ By default, the first account created on a new DefectDojo instance will have Sup
4. From the Edit User page:
-For Superuser Status, check off the ☑️Superuser Status box, located in the user's Default Information.
+For Superuser Status, check off the ☑️ Superuser Status box, located in the user's Default Information.
To assign a Global Role, select one from the dropdown Global Role menu at the bottom of the page.
@@ -118,7 +119,7 @@ Configuration Permissions are not related to a specific Product or Product Type
* **Finding Templates:** Access to the Findings \> Finding Templates page
* **Groups**: Access the 👤Users \> Groups page
* **Jira Instances:** Access the ⚙️Configuration \> JIRA page
-* **Language Types**:Access the [Language Types](/en/open_source/languages/) API endpoint
+* **Language Types**:Access the [Language Types](/open_source/languages/) API endpoint
* **Login Banner**: Edit the ⚙️Configuration \> Login Banner page
* **Announcements**: Access ⚙️Configuration \> Announcements
* **Note Types:** Access the ⚙️Configuration \> Note Types page
diff --git a/docs/content/en/customize_dojo/user_management/user_permission_chart.md b/docs/content/admin/user_management/user_permission_chart.md
similarity index 100%
rename from docs/content/en/customize_dojo/user_management/user_permission_chart.md
rename to docs/content/admin/user_management/user_permission_chart.md
diff --git a/docs/content/en/working_with_findings/_index.md b/docs/content/asset_modelling/_index.md
similarity index 74%
rename from docs/content/en/working_with_findings/_index.md
rename to docs/content/asset_modelling/_index.md
index cd8d34e560c..850ae7f8369 100644
--- a/docs/content/en/working_with_findings/_index.md
+++ b/docs/content/asset_modelling/_index.md
@@ -1,5 +1,5 @@
---
-title: "🚩 Work With Findings"
+title: "Organize DefectDojo"
date: 2021-02-02T20:46:29+01:00
draft: false
type: docs
diff --git a/docs/content/en/working_with_findings/organizing_engagements_tests/_index.md b/docs/content/asset_modelling/engagements_tests/_index.md
similarity index 53%
rename from docs/content/en/working_with_findings/organizing_engagements_tests/_index.md
rename to docs/content/asset_modelling/engagements_tests/_index.md
index d1823bda407..a61b559371c 100644
--- a/docs/content/en/working_with_findings/organizing_engagements_tests/_index.md
+++ b/docs/content/asset_modelling/engagements_tests/_index.md
@@ -1,10 +1,8 @@
---
-title: "Organizing Data"
+title: "Engagements & Tests"
date: 2021-02-02T20:46:29+01:00
draft: false
-weight: 4
type: docs
-sidebar:
- collapsed: false
+weight: 1
exclude_search: true
---
diff --git a/docs/content/en/working_with_findings/sla_configuration.md b/docs/content/asset_modelling/hierarchy/OS__sla_configuration.md
similarity index 79%
rename from docs/content/en/working_with_findings/sla_configuration.md
rename to docs/content/asset_modelling/hierarchy/OS__sla_configuration.md
index 3a9bc1e0781..5dc7957adb5 100644
--- a/docs/content/en/working_with_findings/sla_configuration.md
+++ b/docs/content/asset_modelling/hierarchy/OS__sla_configuration.md
@@ -2,11 +2,12 @@
title: "SLA Configuration"
description: "Configure Service Level Agreements for different Products"
weight: 2
+audience: opensource
---
Each Product in DefectDojo can have its own Service Level Agreement (SLA) configuration, which represents the days your organization has to remediate or otherwise manage a Finding.
-SLA can be set based on either **[Finding Severity](/en/working_with_findings/organizing_engagements_tests/product_hierarchy/#findings)** or **[Finding Risk](/en/working_with_findings/finding_priority/)** (in DefectDojo Pro).
+SLA can be set based on either **[Finding Severity](/asset_modelling/hierarchy/product_hierarchy/#findings)** or **[Finding Risk](/asset_modelling/hierarchy/pro__priority_sla/)** (in DefectDojo Pro).

@@ -17,9 +18,9 @@ SLAs apply a countdown of days to a Finding based on the day that the Finding wa
You can use SLAs as a way to represent your organizations remediation policies. You can also use them as a way to prioritize the longest-active, most critical Findings in your DefectDojo instance.
* You can sort or filter Finding tables by SLA days.
-* SLA violations can be configured to trigger [Notifications](/en/customize_dojo/notifications/about_notifications/) to DefectDojo users assigned to the related Product.
-* In **DefectDojo Pro**, SLA performance is also tracked on the [Executive Insights and Remediation](/en/customize_dojo/dashboards/pro_dashboards/) Metrics Dashboards.
-* SLA compliance can also be used to create custom [Dashboard Tiles](/en/customize_dojo/dashboards/about_custom_dashboard_tiles/#sla-violation-tile) in **DefectDojo Pro**.
+* SLA violations can be configured to trigger [Notifications](/admin/notifications/about_notifications/) to DefectDojo users assigned to the related Product.
+* In **DefectDojo Pro**, SLA performance is also tracked on the [Executive Insights and Remediation](/metrics_reports/pro_metrics/pro__overview/) Metrics Dashboards.
+* SLA compliance can also be used to create custom [Dashboard Tiles](/metrics_reports/dashboards/about_custom_dashboard_tiles/#sla-violation-tile) in **DefectDojo Pro**.
### Mitigated Within SLA status
@@ -41,7 +42,7 @@ In DefectDojo Pro, one or more SLA Configurations are managed under the **Config

-SLA Configurations can only be edited by Superusers or by a user with the corresponding [Configuration Permission](/en/customize_dojo/user_management/user_permission_chart/#configuration-permission-chart).
+SLA Configurations can only be edited by Superusers or by a user with the corresponding [Configuration Permission](/admin/user_management/user_permission_chart/#configuration-permission-chart).
### Configuring SLA
@@ -71,6 +72,6 @@ Once a new SLA has been selected for a Product, all of the associated Findings'
## Notes on SLAs
-* SLAs can be optionally restarted once a [Risk Accepted](/en/working_with_findings/findings_workflows/risk_acceptances/) Finding reactivates. This is set when creating the Risk Acceptance by setting the **Restart SLA Expired** field.
+* SLAs can be optionally restarted once a [Risk Accepted](/triage_findings/findings_workflows/risk_acceptances/) Finding reactivates. This is set when creating the Risk Acceptance by setting the **Restart SLA Expired** field.
* Reimporting a Finding does not restart the SLA - SLAs are always calculated from when a Finding was first detected unless **Restart SLA on Finding Reactivation** is enabled.
* Risk Acceptance expiry or reactivation of a Closed Finding are the only ways to reset or recalculate an SLA for a Finding once it is created (without changing the Product's SLA configuration).
diff --git a/docs/content/en/working_with_findings/organizing_engagements_tests/source-code-repositories.md b/docs/content/asset_modelling/hierarchy/OS__source-code-repositories.md
similarity index 98%
rename from docs/content/en/working_with_findings/organizing_engagements_tests/source-code-repositories.md
rename to docs/content/asset_modelling/hierarchy/OS__source-code-repositories.md
index c1d9766e456..dfd25c66c6b 100644
--- a/docs/content/en/working_with_findings/organizing_engagements_tests/source-code-repositories.md
+++ b/docs/content/asset_modelling/hierarchy/OS__source-code-repositories.md
@@ -1,8 +1,9 @@
---
title: "Link Findings to source code"
-description: "Integration of repositories to navigate to the locaction of findings in the source code."
+description: "Integration of repositories to navigate to the location of findings in the source code."
draft: false
weight: 5
+audience: opensource
---
Certain tools (particularly SAST tools) will include the associated file name and line number in vulnerability data. If the repository of the source code is specified in the Engagement, DefectDojo will present the filepath as a link and the user can navigate directly to the location of the vulnerability.
diff --git a/docs/content/en/working_with_findings/organizing_engagements_tests/pro_assets_organizations.md b/docs/content/asset_modelling/hierarchy/PRO__assets_organizations.md
similarity index 94%
rename from docs/content/en/working_with_findings/organizing_engagements_tests/pro_assets_organizations.md
rename to docs/content/asset_modelling/hierarchy/PRO__assets_organizations.md
index 877097c74d1..65c56d584b5 100644
--- a/docs/content/en/working_with_findings/organizing_engagements_tests/pro_assets_organizations.md
+++ b/docs/content/asset_modelling/hierarchy/PRO__assets_organizations.md
@@ -1,6 +1,8 @@
---
-title: "⚠️ Assets and Organizations (Pro)"
+title: "Assets and Organization structure"
description: "DefectDojo Pro - Product Hierarchy Overhaul"
+audience: pro
+weight: 1
---
DefectDojo Pro is extending the Product/Product Type object classes to provide greater flexibility with the data model.
@@ -62,7 +64,7 @@ Core Application [Organization]
└── nginx
```
-In this diagram, every element under "Core Application" could be recorded as a separate Asset, with unique business criticality (see: [Priority & Risk](/en/working_with_findings/priority_adjustments/)), RBAC, and corresponding Engagements and Tests. You could continue to test, and store results, on the parent Asset (for example, `webapp-backend`), but you could also run isolated testing on a particular child Asset (for example, `database`).
+In this diagram, every element under "Core Application" could be recorded as a separate Asset, with unique business criticality (see: [Priority & Risk](/asset_modelling/hierarchy/pro__priority_sla/#prioritization-engines/)), RBAC, and corresponding Engagements and Tests. You could continue to test, and store results, on the parent Asset (for example, `webapp-backend`), but you could also run isolated testing on a particular child Asset (for example, `database`).
### Pen Tests: Isolated RBAC
diff --git a/docs/content/asset_modelling/hierarchy/PRO__priority_sla.md b/docs/content/asset_modelling/hierarchy/PRO__priority_sla.md
new file mode 100644
index 00000000000..75abb100e54
--- /dev/null
+++ b/docs/content/asset_modelling/hierarchy/PRO__priority_sla.md
@@ -0,0 +1,264 @@
+---
+title: "Assign Priority, Risk and SLAs"
+description: "How DefectDojo ranks your Findings"
+weight: 1
+audience: pro
+---
+
+
+
+Effective risk-based vulnerability management requires an approach that considers
+both business context and technical exploitability. Using DefectDojo Pro’s Priority and Risk feature, users can automatically sort Findings into a meaningful context, ensuring
+high-impact vulnerabilities can be addressed first.
+
+**Priority** is a calculated numerical rank applied to all Findings in your DefectDojo
+instance. It allows you to quickly understand vulnerabilities in context, especially within
+large organizations that are overseeing security needs for many Findings and/or
+Products.
+
+**Risk** is a 4-level ranking system which factors in a Finding’s exploitability to a greater
+degree. This is meant as a less granular, more ’executive-level’ version of Priority.
+
+
+
+Priority and Risk values can be used with other filters to compare Findings in any context, such as:
+
+* within a single Product, Engagement or Test
+* globally in all DefectDojo Products
+* between a few specific Products
+
+Applying Finding Priority and Risk helps your team respond to the most relevant
+vulnerabilities in your organization, and also provides a framework to assist in
+compliance with regulatory standards.
+
+
+Learn more about Priority and Risk with DefectDojo Inc's May 2025 Office Hours:
+
+
+
+## How Priority & Risk are calculated
+The range of Priority values is from 0 to 1150. The higher the number, the more urgency
+the Finding is to triage or remediate.
+
+Similar to Severity, Risk is scored from Low -> Medium -> Needs Action -> Urgent. **Risk** considers Priority fields and may be different from a tool's reported Severity as a result.
+
+
+
+## Priority Fields: Product-Level
+
+Each Product in DefectDojo has metadata that tracks business criticality and risk
+factors. This metadata is used to help calculate Priority and Risk for any associated
+Findings.
+
+All of these metadata fields can be set on the **Edit Product** form for a given Product.
+
+
+
+* **Criticality** can be set to any value of None, Very Low, Low, Medium, High, or Very
+High. Criticality is a subjective field, so when assigning this field, consider how the
+Product compares to other Products in your organization.
+* **User Records** is a numerical estimation of user records in a database (or a system
+that can access that database).
+* **Revenue** is a numerical estimation of annual revenue for the Product. To calculate Priority, DefectDojo will calculate a percentage by comparing this Product's revenue to the sum of all Products within the Product Type.
+
+It is not possible to set a currency type in DefectDojo, so make sure that all of your Revenue
+estimations have the same currency denomination. (“50000” could mean $50,000
+US Dollars or ¥50,000 Japanese Yen - the denomination does not matter as long as
+all of your Products have revenue calculated in the same currency).
+* **External Audience** is a true/false value - set this to True if this Product can be
+accessed by an external audience. For example, customers, users, or anyone
+outside of your organization.
+* **Internet Accessible** is a true/false value. If this Product can connect to the open
+internet, you should set this value to True.
+
+Priority is a ‘relative’ calculation, which is meant to compare different Products within
+your DefectDojo instance. It is ultimately up to your organization to decide how these
+filters are set. These values should be as accurate as possible, but the primary goal is
+to highlight your key Products so that you can prioritize vulnerabilities according to your
+organization’s policies, so these fields do not necessarily need to be set perfectly.
+
+## Priority Fields: Finding-Level
+
+Findings within a Product can have additional metadata which can further adjust the Finding’s Priority and Risk level:
+
+* Whether or not the Finding has an EPSS score, this is automatically added to Findings and kept up to date for Pro users
+* How many Endpoints in the Product are affected by this Finding
+* Whether or not a Finding is Under Review
+* Whether the Finding is in the KEV (Known Exploited Vulnerabilities) database, which is checked by DefectDojo on a regular basis
+* The tool-reported Severity of a Finding (Info, Low, Medium, High, Critical)
+
+
+## Finding Risk Calculation
+
+
+
+The Risk column on a Findings table is another way to quickly prioritize Findings. Risk is calculated using a Finding's Priority level, but also factors in a Finding's exploitability to a greater degree. This is meant as a less granular, more 'executive-level' version of Priority.
+
+The four assignable Risk levels are:
+
+
+
+A Finding's EPSS / exploitability is much more emphasized in the Risk calculation. As a result, a Finding can have both a high priority and a low risk value.
+
+As with Finding Priority, the Risk calculation cannot currently be adjusted.
+
+## Priority Insights Dashboard
+
+Users can take an executive-level view of Priority and Risk in their environment using
+the Priority Insights Dashboard (Metrics > Priority Insights in the sidebar)
+
+
+
+This dashboard can be filtered to include specific Products or date ranges. As with
+other Pro dashboards, this dashboard can be exported from DefectDojo as a PDF to
+quickly produce a report.
+
+## Setting Priority & Risk for Regulatory Compliance
+
+This is a non-exhaustive list of regulatory standards that specifically require
+vulnerability prioritization methods:
+
+* [SOX (Sarbanes-Oxley Act](https://www.sarbanes-oxley-act.com/)) compliance requires revenue-based prioritization for
+systems impacting financial data. In DefectDojo, a system’s revenue can be entered
+at the Product level.
+* [PCI DSS](https://www.pcisecuritystandards.org/standards/pci-dss/) compliance requires prioritization based on risk ratings and criticality to
+cardholder data environments. Business Criticality and External Audience can be
+set at the Product level, while DefectDojo’s Finding-level EPSS sync supports PCI’s
+risk-based approach.
+* [NIST SP 800-40](https://csrc.nist.gov/pubs/sp/800/40/r4/final) is a preventative maintenance guide which specifically calls for
+vulnerability prioritization based on business impact, product criticality and
+internet accessibility factors. All of these can be set at DefectDojo’s Product level.
+* [ISO 27001/27002](https://www.iso.org/standard/27001) Control A.12.6.1 compliance requires management of technical
+vulnerabilities with Priority based on risk assessment.
+* [GDPR Article 32](https://gdpr-info.eu/art-32-gdpr/) requires risk-based security measures - user records and external
+audience flags at the Product level can help prioritize systems in your organization
+that process personal data.
+* [FISMA/FedRAMP](https://help.fedramp.gov/hc/en-us) compliance require continuous monitoring and risk-based vulnerability remediation.
+
+DefectDojo Pro's Priority and Risk calculations can be adjusted, allowing you to tailor DefectDojo Pro to match your internal standards for Finding Priority and Risk.
+
+## Prioritization Engines
+
+Similar to SLA configurations, Prioritization Engines allow you to set the rules governing how Priority and Risk are calculated.
+
+
+
+DefectDojo comes with a built-in Prioritization Engine, which is applied to all Products. However, you can edit this Prioritization Engine to change the weighting of **Finding** and **Product** multipliers, which will adjust how Finding Priority and Risk are assigned.
+
+### Finding Multipliers
+
+Eight contextual factors impact the Priority score of a Finding. Three of these are Finding-specific, and the other five are assigned based on the Product that holds the Finding.
+
+You can tune your Prioritization Engine by adjusting how these factors are applied to the final calculation.
+
+
+
+Select a factor by clicking the button, and adjust this slider allows you to control the percentage a particular factor is applied. As you adjust the slider, you'll see the Risk thresholds change as a result.
+
+#### Finding-Level Multipliers
+
+* **Severity** - a Finding's Severity level
+* **Exploitability** - a Finding's KEV and/or EPSS score
+* **Endpoints** - the amount of Endpoints associated with a Finding
+
+#### Product-Level Multipliers
+
+* **Business Criticality** - the related Product's Business Criticality (None, Very Low, Low, Medium, High, or Very
+High)
+* **User Records** - the related Product's User Records count
+* **Revenue** - the related Product's revenue, relative to the total revenue of the Product Type
+* **External Audience** - whether or not the related Product has an external audience
+* **Internet Accessible** - whether or not the related Product is internet accessible
+
+### Risk Thresholds
+
+Based on the tuning of the Priority Engine, DefectDojo will automatically recommend Risk Thresholds. However, these thresholds can be adjusted as well and set to whatever values you deem appropriate.
+
+
+
+## Creating New Prioritization Engines
+
+You can use multiple Prioritization Engines, which can each be assigned to different Products.
+
+
+
+Creating a new Prioritization Engine will open the Prioritization Engine form. Once this form is submitted, a new Prioritization Engine will be added to the table.
+
+## Assigning Prioritization Engines to Products
+
+Each Product can have a Prioritization Engine currently in use via the **Edit Product** form for a given Product.
+
+
+
+Note that when a Product's Prioritization Engine is changed, or a Prioritization Engine is updated, the Product's Prioritization Engine or the Prioritization Engine itself will be "Locked" until the prioritization calculation has completed.
+
+Each Product in DefectDojo can have its own Service Level Agreement (SLA) configuration, which represents the days your organization has to remediate or otherwise manage a Finding.
+
+SLA can be set based on either **[Finding Severity](/asset_modelling/hierarchy/product_hierarchy/#findings)** or **[Finding Risk](/asset_modelling/hierarchy/pro__priority_sla/)** (in DefectDojo Pro).
+
+
+
+SLAs apply a countdown of days to a Finding based on the day that the Finding was created in DefectDojo. If a Finding is not Closed within the countdown, the Finding will be labeled as in breach of SLA.
+
+## Working with SLAs
+
+You can use SLAs as a way to represent your organizations remediation policies. You can also use them as a way to prioritize the longest-active, most critical Findings in your DefectDojo instance.
+
+* You can sort or filter Finding tables by SLA days.
+* SLA violations can be configured to trigger [Notifications](/admin/notifications/about_notifications/) to DefectDojo users assigned to the related Product.
+* In **DefectDojo Pro**, SLA performance is also tracked on the [Executive Insights and Remediation](/metrics_reports/pro_metrics/pro__overview/) Metrics Dashboards.
+* SLA compliance can also be used to create custom [Dashboard Tiles](/metrics_reports/dashboards/about_custom_dashboard_tiles/#sla-violation-tile) in **DefectDojo Pro**.
+
+### Mitigated Within SLA status
+
+If a Finding is successfully Mitigated by the SLA deadline, the Finding will record a ✅ green check mark in the Mitigated Within SLA column.
+
+
+
+If a Finding was Mitigated, but not before the SLA was violated, the Finding will record a ❌ red X in the Mitigated Within SLA column.
+
+### Breaching SLAs
+
+When an SLA for a given Finding is violated (the Finding is not Closed within the SLA timeline) the ✅ green check will switch to a ❌ red X. The SLA will continue to be tracked with a negative number, to represent how many days the SLA has been breached by.
+
+
+
+## Managing SLA Configurations (Pro)
+
+In DefectDojo Pro, one or more SLA Configurations are managed under the **Configuration > Service Level Agreements** part of the sidebar. You can create a **New Service Level Agreement** or work with existing SLA configurations from the **All Service Level Agreements** page.
+
+
+
+SLA Configurations can only be edited by Superusers or by a user with the corresponding [Configuration Permission](/admin/user_management/user_permission_chart/#configuration-permission-chart).
+
+### Configuring SLA
+
+SLA configurations contain the days assigned to each **Severity** or **Risk** value of DefectDojo.
+
+
+
+Each Service Level Agreement can have a unique name, along with an optional description.
+
+**Restart SLA on Finding Reactivation**: if enabled, this option will start an SLA over when a Finding is Reopened. Otherwise, the SLA will be based on when the Finding was created.
+
+When editing an SLA, you can choose whether that SLA will use **Severity** or **Risk** as a benchmark for assigning Days To Remediate. This is done by selecting the related option from the **Service Level configuration Type** section of the form.
+
+From here, you can set the number of days allowed for each **Severity** or **Risk** level. You can also selectively enforce SLAs; by unchecking the **Enforce ___ Finding Days** you can ignore SLA calculation for those levels of Severity or Risk.
+
+## Apply an SLA Configuration to a Product (Pro)
+
+Newly created Products in DefectDojo will always apply the **Default SLA Configuration**, which can be set to different values if you wish.
+
+If you have SLA configurations, you can choose which of these is applied to your Product from the **Edit Product** form.
+
+
+
+### SLA Recalculation
+
+Once a new SLA has been selected for a Product, all of the associated Findings' SLAs will need to be recalculated by DefectDojo. While this process is running, a Product's SLA cannot be changed.
+
+## Notes on SLAs
+
+* SLAs can be optionally restarted once a [Risk Accepted](/triage_findings/findings_workflows/risk_acceptances/) Finding reactivates. This is set when creating the Risk Acceptance by setting the **Restart SLA Expired** field.
+* Reimporting a Finding does not restart the SLA - SLAs are always calculated from when a Finding was first detected unless **Restart SLA on Finding Reactivation** is enabled.
+* Risk Acceptance expiry or reactivation of a Closed Finding are the only ways to reset or recalculate an SLA for a Finding once it is created (without changing the Product's SLA configuration).
diff --git a/docs/content/en/working_with_findings/finding_deduplication/_index.md b/docs/content/asset_modelling/hierarchy/_index.md
similarity index 63%
rename from docs/content/en/working_with_findings/finding_deduplication/_index.md
rename to docs/content/asset_modelling/hierarchy/_index.md
index 4a35b777b6a..8a33bb5eda6 100644
--- a/docs/content/en/working_with_findings/finding_deduplication/_index.md
+++ b/docs/content/asset_modelling/hierarchy/_index.md
@@ -1,10 +1,10 @@
---
-title: "Finding Deduplication"
+title: "Asset Hierarchy"
date: 2021-02-02T20:46:29+01:00
draft: false
type: docs
weight: 3
sidebar:
- collapsed: true
+ collapsed: false
exclude_search: true
---
diff --git a/docs/content/en/working_with_findings/organizing_engagements_tests/product_health_grade.md b/docs/content/asset_modelling/hierarchy/product_health_grade.md
similarity index 100%
rename from docs/content/en/working_with_findings/organizing_engagements_tests/product_health_grade.md
rename to docs/content/asset_modelling/hierarchy/product_health_grade.md
diff --git a/docs/content/en/working_with_findings/organizing_engagements_tests/product_hierarchy.md b/docs/content/asset_modelling/hierarchy/product_hierarchy.md
similarity index 99%
rename from docs/content/en/working_with_findings/organizing_engagements_tests/product_hierarchy.md
rename to docs/content/asset_modelling/hierarchy/product_hierarchy.md
index 093ba1d90e0..77458d98df1 100644
--- a/docs/content/en/working_with_findings/organizing_engagements_tests/product_hierarchy.md
+++ b/docs/content/asset_modelling/hierarchy/product_hierarchy.md
@@ -2,6 +2,7 @@
title: "Product Hierarchy: Overview"
description: "Understand Product Types, Products, Engagements, Tests and Findings"
weight: 1
+audience: opensource
---
DefectDojo uses five main data classes to organize your work: **Product Types, Products**, **Engagements**, **Tests**, and **Findings**.
diff --git a/docs/content/asset_modelling/tags/OS__tagging_objects.md b/docs/content/asset_modelling/tags/OS__tagging_objects.md
new file mode 100644
index 00000000000..e9f5f7fcfb3
--- /dev/null
+++ b/docs/content/asset_modelling/tags/OS__tagging_objects.md
@@ -0,0 +1,149 @@
+---
+title: "Tagging Objects"
+description: "Use Tags to create a new slice of your data model"
+draft: false
+weight: 2
+exclude_search: false
+audience: opensource
+---
+
+Tags are ideal for grouping objects in a manner that can be filtered out into smaller, more digestible chunks. They can be used to denote status, or to create custom sets of Product Type, Products, Engagements or Findings across the data model.
+
+In DefectDojo, tags are a first class citizen and are recognized as the facilitators
+of organization within each level of the data model.
+
+Here is an example with a Product with two tags and four findings each with a single tag:
+
+
+
+### Tag Formats
+
+Tags can be formatted in any of the following ways:
+- StringWithNoSpaces
+- string-with-hyphens
+- string_with_underscores
+- colons:acceptable
+
+## Tag Management
+
+### Adding and Removing
+
+Tags can be managed in the following ways:
+
+1. Creating or Editing new objects
+
+ When a new object is created or edited through the UI or API, there is a field for specifying
+ the tags to be set on a given object. This field is a multiselect field that also has
+ auto completion to make searching and adding existing tags a breeze. Here is what the field
+ looks like on the Product from the screenshot in the previous section:
+
+ 
+
+2. Import and Reimport
+
+ Tags can also be applied to a given test at the time of import or reimport. This is a very
+ handy use case when importing via the API with automation as it provides an opportunity to
+ append automation run details and tool information that may not be captured in the test
+ or finding object directly.
+
+ The field looks and behaves exactly as it does on a given object
+
+3. Bulk Edit Menu (Findings only)
+
+ When needing to update many Findings with the same set of tags, the bulk edit menu can be
+ used to ease the burden.
+
+ In the following example, lets say I want to update the tags of the two findings with the tag "tag-group-alpha" to be a new tag list like this ["tag-group-charlie", "tag-group-delta"].
+ First I would select the tags to be updated:
+
+ 
+
+ Once a finding is selected, a new button appears with the name "Bulk Edit". Clicking this button
+ produces a dropdown menu with many options, but the focus is just on tags for now. Update the
+ field to have the desired tag list as follows, and click submit
+
+ 
+
+ The tags on the selected Findings will be updated to whatever was specified in the tags field
+ within the bulk edit menu
+
+ 
+
+## Tag Inheritance
+
+When Tag Inheritance is enabled, tags applied to a given Product will automatically be applied to all objects under Products in the [Product Hierarchy](/asset_modelling/hierarchy/product_hierarchy/).
+
+### Configuration
+
+Tag Inheritance can be enabled at the following scope levels:
+- Global Scope
+ - Every Product system wide will begin applying tags to all children objects (Engagements, Tests and Findings)
+ - This is set within the System Settings
+- Product Scope
+ - Only the selected Product will begin applying tags to all children objects (Engagements, Tests and Findings)
+ - This is set at the Product creation/edit page
+
+### Behaviors
+
+When Tag Inheritance is enabled, standard Tags can be added to and removed from objects in the standard way.
+However inherited tags cannot be removed from a child object without removing them from the parent object
+See the following example of adding a tag "test_only_tag" to the Test object and a tag "engagement_only_tag" to the Engagement.
+
+
+
+When updates are made to the tag list on a Product, the same changes are made to all objects within the Product asynchronously. The duration of this task directly correlates to the number the objects contained within a finding.
+
+**Open-Source:** If Tag changes are not observed within a reasonable time period, consult the celery worker logs to identify where any problems might have arisen.
+
+
+### Filtering for Tags (Classic UI)
+
+Tags can be filtered in many ways through both the UI and the API. For example, here is a snippet
+of the Finding filters:
+
+
+
+There are ten fields related to tags:
+
+ - Tags: filter on any tags that are attached to a given Finding
+ - Examples:
+ - Finding will be returned
+ - Finding Tags: ["A", "B", "C"]
+ - Filter Query: "B"
+ - Finding Will *not* be returned
+ - Finding Tags: ["A", "B", "C"]
+ - Filter Query: "F"
+ - Not Tags: filter on any tags that are *not* attached to a given Finding
+ - Examples:
+ - Finding will be returned
+ - Finding Tags: ["A", "B", "C"]
+ - Filter Query: "F"
+ - Finding Will *not* be returned
+ - Finding Tags: ["A", "B", "C"]
+ - Filter Query: "B"
+ - Tag Name Contains: filter on any tags that contain part or all of the query in the given Finding
+ - Examples:
+ - Finding will be returned
+ - Finding Tags: ["Alpha", "Beta", "Charlie"]
+ - Filter Query: "et" (part of "Beta")
+ - Finding Will *not* be returned
+ - Finding Tags: ["Alpha", "Beta", "Charlie"]
+ - Filter Query: "meg" (part of "Omega")
+ - Not Tags: filter on any tags that do *not* contain part or all of the query in the given Finding
+ - Examples:
+ - Finding will be returned
+ - Finding Tags: ["Alpha", "Beta", "Charlie"]
+ - Filter Query: "meg" (part of "Omega")
+ - Finding Will *not* be returned
+ - Finding Tags: ["Alpha", "Beta", "Charlie"]
+ - Filter Query: "et" (part of "Beta")
+
+For the other six tag filters, they follow the same rules as "Tags" and "Not Tags" as above,
+but at different levels in the data model:
+
+ - Tags (Test): filter on any tags that are attached to the Test of a given Finding
+ - Not Tags (Test): filter on any tags that are *not* attached to the Test of a given Finding
+ - Tags (Engagement): filter on any tags that are attached to the Engagement of a given Finding
+ - Not Tags (Engagement): filter on any tags that are *not* attached to the Engagement of a given Finding
+ - Tags (Product): filter on any tags that are attached to the Product of a given Finding
+ - Not Tags (Product): filter on any tags that are *not* attached to the Product of a given Finding
diff --git a/docs/content/en/working_with_findings/organizing_engagements_tests/tagging_objects.md b/docs/content/asset_modelling/tags/PRO__tagging_objects copy.md
similarity index 95%
rename from docs/content/en/working_with_findings/organizing_engagements_tests/tagging_objects.md
rename to docs/content/asset_modelling/tags/PRO__tagging_objects copy.md
index d551f07de0b..cc729ee5141 100644
--- a/docs/content/en/working_with_findings/organizing_engagements_tests/tagging_objects.md
+++ b/docs/content/asset_modelling/tags/PRO__tagging_objects copy.md
@@ -1,15 +1,16 @@
---
-title: "Tags"
+title: "Tagging Objects"
description: "Use Tags to create a new slice of your data model"
draft: false
weight: 2
exclude_search: false
+audience: pro
---
Tags are ideal for grouping objects in a manner that can be filtered out into smaller, more digestible chunks. They can be used to denote status, or to create custom sets of Product Type, Products, Engagements or Findings across the data model.
In DefectDojo, tags are a first class citizen and are recognized as the facilitators
-of organization within each level of the [data model](../product_hierarchy).
+of organization within each level of the data model.
Here is an example with a Product with two tags and four findings each with a single tag:
@@ -48,8 +49,6 @@ Tags can be managed in the following ways:

- For more information, see our guide to [Bulk Editing Findings](/en/working_with_findings/findings_workflows/editing_findings/#bulk-edit-findings).
-
## Tag Management (Classic UI / OpenSource)
@@ -100,7 +99,7 @@ Tags can be managed in the following ways:
**Pro UI note: though Tag inheritance can be configured using the Pro UI, inherited Tags currently can only be accessed and filtered for through the Classic UI or the API.**
-When Tag Inheritance is enabled, tags applied to a given Product will automatically be applied to all objects under Products in the [Product Hierarchy](/en/working_with_findings/organizing_engagements_tests/Product_hierarchy).
+When Tag Inheritance is enabled, tags applied to a given Product will automatically be applied to all objects under Products in the [Product Hierarchy](/asset_modelling/hierarchy/product_hierarchy/).
### Configuration
diff --git a/docs/content/asset_modelling/tags/_index.md b/docs/content/asset_modelling/tags/_index.md
new file mode 100644
index 00000000000..9e85b155376
--- /dev/null
+++ b/docs/content/asset_modelling/tags/_index.md
@@ -0,0 +1,8 @@
+---
+title: "Tags"
+date: 2021-02-02T20:46:29+01:00
+draft: false
+type: docs
+weight: 1
+exclude_search: true
+---
diff --git a/docs/content/en/changelog/_index.md b/docs/content/automation/api/_index.md
similarity index 93%
rename from docs/content/en/changelog/_index.md
rename to docs/content/automation/api/_index.md
index e0913288e2e..c415210e8d4 100644
--- a/docs/content/en/changelog/_index.md
+++ b/docs/content/automation/api/_index.md
@@ -1,5 +1,5 @@
---
-title: "📝 Changelog"
+title: "Automation"
description: ""
summary: ""
date: 2023-09-07T16:06:50+02:00
diff --git a/docs/content/en/api/api-v2-docs.md b/docs/content/automation/api/api-v2-docs.md
similarity index 96%
rename from docs/content/en/api/api-v2-docs.md
rename to docs/content/automation/api/api-v2-docs.md
index 819138bf43a..df8ba8b6d70 100644
--- a/docs/content/en/api/api-v2-docs.md
+++ b/docs/content/automation/api/api-v2-docs.md
@@ -188,7 +188,7 @@ Some of the api wrappers contain quite a bit of logic to ease scanning and impor
## Import
Importing via the API is performed via the [import-scan](https://demo.defectdojo.org/api/v2/doc/) endpoint.
-As described in the [Product Hierarchy](/en/working_with_findings/organizing_engagements_tests/product_hierarchy), Test gets created inside an Engagement, inside a Product, inside a Product Type.
+As described in the [Product Hierarchy](/asset_modelling/hierarchy/product_hierarchy/), Test gets created inside an Engagement, inside a Product, inside a Product Type.
An import can be performed by specifying the names of these entities in the API request:
@@ -207,7 +207,7 @@ An import can be performed by specifying the names of these entities in the API
}
```
-When `auto_create_context` is `True`, the product, engagement, and environment will be created if needed. Make sure your user has sufficient [permissions](/en/customize_dojo/user_management/about_perms_and_roles/) to do this.
+When `auto_create_context` is `True`, the product, engagement, and environment will be created if needed. Make sure your user has sufficient [permissions](/admin/user_management/about_perms_and_roles/) to do this.
A classic way of importing a scan is by specifying the ID of the engagement instead:
@@ -243,7 +243,7 @@ A reimport can be performed by specifying the names of these entities in the API
}
```
-When `auto_create_context` is `True`, the Product Type, Product and Engagement will be created if they do not already exist. Make sure your user has sufficient [permissions](/en/customize_dojo/user_management/about_perms_and_roles/) to create a Product/Product Type.
+When `auto_create_context` is `True`, the Product Type, Product and Engagement will be created if they do not already exist. Make sure your user has sufficient [permissions](/admin/user_management/about_perms_and_roles/) to create a Product/Product Type.
When `do_not_reactivate` is `True`, the importing/reimporting will ignore uploaded active findings and not reactivate previously closed findings, while still creating new findings if there are new ones. You will get a note on the finding to explain that it was not reactivated for that reason.
diff --git a/docs/content/en/api/_index.md b/docs/content/automation/rules_engine/_index.md
similarity index 91%
rename from docs/content/en/api/_index.md
rename to docs/content/automation/rules_engine/_index.md
index c49a452ad0b..25a5b4b104f 100644
--- a/docs/content/en/api/_index.md
+++ b/docs/content/automation/rules_engine/_index.md
@@ -1,5 +1,5 @@
---
-title: "🤖 API Documentation"
+title: "Rules Engine"
description: ""
summary: ""
date: 2023-09-07T16:06:50+02:00
diff --git a/docs/content/en/customize_dojo/rules_engine.md b/docs/content/automation/rules_engine/about.md
similarity index 91%
rename from docs/content/en/customize_dojo/rules_engine.md
rename to docs/content/automation/rules_engine/about.md
index 22f156dd56c..86700c3853c 100644
--- a/docs/content/en/customize_dojo/rules_engine.md
+++ b/docs/content/automation/rules_engine/about.md
@@ -2,13 +2,14 @@
title: "Rules Engine Automation"
description: "Working with Rules Engine Automation"
weight: 1
+audience: pro
---
Note: Rules Engine is a DefectDojo Pro-only feature.
DefectDojo's Rules Engine allows you to build custom workflows and bulk actions to handle Findings and other objects. Rules Engine allows you to build automated actions that are triggered when an object matches a Rule.
-Rules Engine can only be accessed through the [Pro UI](/en/about_defectdojo/ui_pro_vs_os/).
+Rules Engine can only be accessed through the [Pro UI](/get_started/about/ui_pro_vs_os/).
Currently, Rules can only be created for Findings, however more object types will be supported in the future.
@@ -25,10 +26,10 @@ Each Rule can apply one or more of these changes to a Finding when it is trigger
* Create an Alert in DefectDojo with custom text
### Filter conditions
-Rules are automatically triggered when a Finding meets specific Filter conditions. For more information on Filters that can be used to create Rule Actions, see the [Filter Index](/en/working_with_findings/organizing_engagements_tests/filter_index/) page.
+Rules are automatically triggered when a Finding meets specific Filter conditions. For more information on Filters that can be used to create Rule Actions, see the [Filter Index](/navigation/pro__filter_index) page.
## Creating a New Rule
-Start this process from the New Rule page. In the [Pro UI](/en/about_defectdojo/ui_pro_vs_os/), under **Manage Category**, Expand the **Rules Engine** dropdown and click **+ New Rule**.
+Start this process from the New Rule page. In the [Pro UI](/get_started/about/ui_pro_vs_os/), under **Manage Category**, Expand the **Rules Engine** dropdown and click **+ New Rule**.

@@ -38,7 +39,7 @@ Enter a Label as the identifier for the new rule, and click Next.

### Step 2: Set trigger conditions with a Filter
-You will see an All Findings table. Using the All Findings Table, set the Filter conditions to filter the set of Findings that you want your rule to apply to. For more information on applying Filters to a table, see [our guide to the Pro UI](/en/about_defectdojo/ui_pro_vs_os/#navigational-changes).
+You will see an All Findings table. Using the All Findings Table, set the Filter conditions to filter the set of Findings that you want your rule to apply to. For more information on applying Filters to a table, see [our guide to the Pro UI](/get_started/about/ui_pro_vs_os/#navigational-changes).
The table will preview the list of existing Findings that you have filtered.
diff --git a/docs/content/en/open_source/upgrading/1.10.md b/docs/content/changelog/os_upgrading/1.10.md
similarity index 100%
rename from docs/content/en/open_source/upgrading/1.10.md
rename to docs/content/changelog/os_upgrading/1.10.md
diff --git a/docs/content/en/open_source/upgrading/1.11.md b/docs/content/changelog/os_upgrading/1.11.md
similarity index 100%
rename from docs/content/en/open_source/upgrading/1.11.md
rename to docs/content/changelog/os_upgrading/1.11.md
diff --git a/docs/content/en/open_source/upgrading/1.12.md b/docs/content/changelog/os_upgrading/1.12.md
similarity index 100%
rename from docs/content/en/open_source/upgrading/1.12.md
rename to docs/content/changelog/os_upgrading/1.12.md
diff --git a/docs/content/en/open_source/upgrading/1.13.md b/docs/content/changelog/os_upgrading/1.13.md
similarity index 100%
rename from docs/content/en/open_source/upgrading/1.13.md
rename to docs/content/changelog/os_upgrading/1.13.md
diff --git a/docs/content/en/open_source/upgrading/1.14.md b/docs/content/changelog/os_upgrading/1.14.md
similarity index 100%
rename from docs/content/en/open_source/upgrading/1.14.md
rename to docs/content/changelog/os_upgrading/1.14.md
diff --git a/docs/content/en/open_source/upgrading/1.15.md b/docs/content/changelog/os_upgrading/1.15.md
similarity index 100%
rename from docs/content/en/open_source/upgrading/1.15.md
rename to docs/content/changelog/os_upgrading/1.15.md
diff --git a/docs/content/en/open_source/upgrading/1.2.2.md b/docs/content/changelog/os_upgrading/1.2.2.md
similarity index 100%
rename from docs/content/en/open_source/upgrading/1.2.2.md
rename to docs/content/changelog/os_upgrading/1.2.2.md
diff --git a/docs/content/en/open_source/upgrading/1.2.3.md b/docs/content/changelog/os_upgrading/1.2.3.md
similarity index 100%
rename from docs/content/en/open_source/upgrading/1.2.3.md
rename to docs/content/changelog/os_upgrading/1.2.3.md
diff --git a/docs/content/en/open_source/upgrading/1.2.4.md b/docs/content/changelog/os_upgrading/1.2.4.md
similarity index 100%
rename from docs/content/en/open_source/upgrading/1.2.4.md
rename to docs/content/changelog/os_upgrading/1.2.4.md
diff --git a/docs/content/en/open_source/upgrading/1.2.8.md b/docs/content/changelog/os_upgrading/1.2.8.md
similarity index 100%
rename from docs/content/en/open_source/upgrading/1.2.8.md
rename to docs/content/changelog/os_upgrading/1.2.8.md
diff --git a/docs/content/en/open_source/upgrading/1.2.9.md b/docs/content/changelog/os_upgrading/1.2.9.md
similarity index 100%
rename from docs/content/en/open_source/upgrading/1.2.9.md
rename to docs/content/changelog/os_upgrading/1.2.9.md
diff --git a/docs/content/en/open_source/upgrading/1.3.1.md b/docs/content/changelog/os_upgrading/1.3.1.md
similarity index 100%
rename from docs/content/en/open_source/upgrading/1.3.1.md
rename to docs/content/changelog/os_upgrading/1.3.1.md
diff --git a/docs/content/en/open_source/upgrading/1.7.0.md b/docs/content/changelog/os_upgrading/1.7.0.md
similarity index 100%
rename from docs/content/en/open_source/upgrading/1.7.0.md
rename to docs/content/changelog/os_upgrading/1.7.0.md
diff --git a/docs/content/en/open_source/upgrading/1.8.0.md b/docs/content/changelog/os_upgrading/1.8.0.md
similarity index 100%
rename from docs/content/en/open_source/upgrading/1.8.0.md
rename to docs/content/changelog/os_upgrading/1.8.0.md
diff --git a/docs/content/en/open_source/upgrading/1.9.3.md b/docs/content/changelog/os_upgrading/1.9.3.md
similarity index 100%
rename from docs/content/en/open_source/upgrading/1.9.3.md
rename to docs/content/changelog/os_upgrading/1.9.3.md
diff --git a/docs/content/en/open_source/upgrading/2.0.md b/docs/content/changelog/os_upgrading/2.0.md
similarity index 96%
rename from docs/content/en/open_source/upgrading/2.0.md
rename to docs/content/changelog/os_upgrading/2.0.md
index f9fe4e44c59..788ee81d1b1 100644
--- a/docs/content/en/open_source/upgrading/2.0.md
+++ b/docs/content/changelog/os_upgrading/2.0.md
@@ -54,7 +54,7 @@ This can take a while depending on your instance size.
### Authorization
-The new authorization system for Products and Product Types based on roles is the default now. The fields for authorized users are not available anymore, but you can assign roles as described in [Permissions](/en/customize_dojo/user_management/about_perms_and_roles). Users are migrated automatically, so that their permissions are as close as possible to the previous authorization:
+The new authorization system for Products and Product Types based on roles is the default now. The fields for authorized users are not available anymore, but you can assign roles as described in [Permissions](/admin/user_management/about_perms_and_roles/). Users are migrated automatically, so that their permissions are as close as possible to the previous authorization:
- Superusers will still have all permissions on Products and Product Types, so they must not be changed.
- Staff users have had all permissions for all product types and products, so they will be get a global role as *Owner*.
- Product_Members and Product Type_Members will be added for authorized users according to the settings for the previous authorization:
diff --git a/docs/content/en/open_source/upgrading/2.10.md b/docs/content/changelog/os_upgrading/2.10.md
similarity index 100%
rename from docs/content/en/open_source/upgrading/2.10.md
rename to docs/content/changelog/os_upgrading/2.10.md
diff --git a/docs/content/en/open_source/upgrading/2.12.md b/docs/content/changelog/os_upgrading/2.12.md
similarity index 100%
rename from docs/content/en/open_source/upgrading/2.12.md
rename to docs/content/changelog/os_upgrading/2.12.md
diff --git a/docs/content/en/open_source/upgrading/2.13.md b/docs/content/changelog/os_upgrading/2.13.md
similarity index 100%
rename from docs/content/en/open_source/upgrading/2.13.md
rename to docs/content/changelog/os_upgrading/2.13.md
diff --git a/docs/content/en/open_source/upgrading/2.15.md b/docs/content/changelog/os_upgrading/2.15.md
similarity index 100%
rename from docs/content/en/open_source/upgrading/2.15.md
rename to docs/content/changelog/os_upgrading/2.15.md
diff --git a/docs/content/en/open_source/upgrading/2.16.md b/docs/content/changelog/os_upgrading/2.16.md
similarity index 100%
rename from docs/content/en/open_source/upgrading/2.16.md
rename to docs/content/changelog/os_upgrading/2.16.md
diff --git a/docs/content/en/open_source/upgrading/2.17.md b/docs/content/changelog/os_upgrading/2.17.md
similarity index 100%
rename from docs/content/en/open_source/upgrading/2.17.md
rename to docs/content/changelog/os_upgrading/2.17.md
diff --git a/docs/content/en/open_source/upgrading/2.18.md b/docs/content/changelog/os_upgrading/2.18.md
similarity index 100%
rename from docs/content/en/open_source/upgrading/2.18.md
rename to docs/content/changelog/os_upgrading/2.18.md
diff --git a/docs/content/en/open_source/upgrading/2.19.md b/docs/content/changelog/os_upgrading/2.19.md
similarity index 100%
rename from docs/content/en/open_source/upgrading/2.19.md
rename to docs/content/changelog/os_upgrading/2.19.md
diff --git a/docs/content/en/open_source/upgrading/2.2.md b/docs/content/changelog/os_upgrading/2.2.md
similarity index 90%
rename from docs/content/en/open_source/upgrading/2.2.md
rename to docs/content/changelog/os_upgrading/2.2.md
index d0785c9dc01..f7b1a9ea3c8 100644
--- a/docs/content/en/open_source/upgrading/2.2.md
+++ b/docs/content/changelog/os_upgrading/2.2.md
@@ -8,5 +8,5 @@ exclude_search: true
Upgrade to 2.0.0 contained migration of endpoints. Some parts of migration haven't been done properly. This deficiency
may manifest as a doubled slash in endpoint URLs (like `http://foo.bar:8080//test`) or as a problem with deduplication
of the same endpoints. The mentioned bug was fixed in 2.2.0 and if you have seen these kinds of problems, just rerun
-"Endpoint migration" as it is written in [Upgrading to DefectDojo Version 2.0.x.](/en/open_source/upgrading/2.0/#endpoints).
+"Endpoint migration" as it is written in [Upgrading to DefectDojo Version 2.0.x.](/open_source/upgrading/2.0/#endpoints).
diff --git a/docs/content/en/open_source/upgrading/2.20.md b/docs/content/changelog/os_upgrading/2.20.md
similarity index 100%
rename from docs/content/en/open_source/upgrading/2.20.md
rename to docs/content/changelog/os_upgrading/2.20.md
diff --git a/docs/content/en/open_source/upgrading/2.21.md b/docs/content/changelog/os_upgrading/2.21.md
similarity index 100%
rename from docs/content/en/open_source/upgrading/2.21.md
rename to docs/content/changelog/os_upgrading/2.21.md
diff --git a/docs/content/en/open_source/upgrading/2.22.md b/docs/content/changelog/os_upgrading/2.22.md
similarity index 100%
rename from docs/content/en/open_source/upgrading/2.22.md
rename to docs/content/changelog/os_upgrading/2.22.md
diff --git a/docs/content/en/open_source/upgrading/2.23.md b/docs/content/changelog/os_upgrading/2.23.md
similarity index 100%
rename from docs/content/en/open_source/upgrading/2.23.md
rename to docs/content/changelog/os_upgrading/2.23.md
diff --git a/docs/content/en/open_source/upgrading/2.24.md b/docs/content/changelog/os_upgrading/2.24.md
similarity index 100%
rename from docs/content/en/open_source/upgrading/2.24.md
rename to docs/content/changelog/os_upgrading/2.24.md
diff --git a/docs/content/en/open_source/upgrading/2.25.md b/docs/content/changelog/os_upgrading/2.25.md
similarity index 100%
rename from docs/content/en/open_source/upgrading/2.25.md
rename to docs/content/changelog/os_upgrading/2.25.md
diff --git a/docs/content/en/open_source/upgrading/2.26.md b/docs/content/changelog/os_upgrading/2.26.md
similarity index 100%
rename from docs/content/en/open_source/upgrading/2.26.md
rename to docs/content/changelog/os_upgrading/2.26.md
diff --git a/docs/content/en/open_source/upgrading/2.27.md b/docs/content/changelog/os_upgrading/2.27.md
similarity index 100%
rename from docs/content/en/open_source/upgrading/2.27.md
rename to docs/content/changelog/os_upgrading/2.27.md
diff --git a/docs/content/en/open_source/upgrading/2.28.md b/docs/content/changelog/os_upgrading/2.28.md
similarity index 100%
rename from docs/content/en/open_source/upgrading/2.28.md
rename to docs/content/changelog/os_upgrading/2.28.md
diff --git a/docs/content/en/open_source/upgrading/2.29.md b/docs/content/changelog/os_upgrading/2.29.md
similarity index 100%
rename from docs/content/en/open_source/upgrading/2.29.md
rename to docs/content/changelog/os_upgrading/2.29.md
diff --git a/docs/content/en/open_source/upgrading/2.3.md b/docs/content/changelog/os_upgrading/2.3.md
similarity index 100%
rename from docs/content/en/open_source/upgrading/2.3.md
rename to docs/content/changelog/os_upgrading/2.3.md
diff --git a/docs/content/en/open_source/upgrading/2.30.md b/docs/content/changelog/os_upgrading/2.30.md
similarity index 100%
rename from docs/content/en/open_source/upgrading/2.30.md
rename to docs/content/changelog/os_upgrading/2.30.md
diff --git a/docs/content/en/open_source/upgrading/2.31.md b/docs/content/changelog/os_upgrading/2.31.md
similarity index 100%
rename from docs/content/en/open_source/upgrading/2.31.md
rename to docs/content/changelog/os_upgrading/2.31.md
diff --git a/docs/content/en/open_source/upgrading/2.32.md b/docs/content/changelog/os_upgrading/2.32.md
similarity index 100%
rename from docs/content/en/open_source/upgrading/2.32.md
rename to docs/content/changelog/os_upgrading/2.32.md
diff --git a/docs/content/en/open_source/upgrading/2.33.md b/docs/content/changelog/os_upgrading/2.33.md
similarity index 100%
rename from docs/content/en/open_source/upgrading/2.33.md
rename to docs/content/changelog/os_upgrading/2.33.md
diff --git a/docs/content/en/open_source/upgrading/2.34.md b/docs/content/changelog/os_upgrading/2.34.md
similarity index 100%
rename from docs/content/en/open_source/upgrading/2.34.md
rename to docs/content/changelog/os_upgrading/2.34.md
diff --git a/docs/content/en/open_source/upgrading/2.35.md b/docs/content/changelog/os_upgrading/2.35.md
similarity index 100%
rename from docs/content/en/open_source/upgrading/2.35.md
rename to docs/content/changelog/os_upgrading/2.35.md
diff --git a/docs/content/en/open_source/upgrading/2.36.md b/docs/content/changelog/os_upgrading/2.36.md
similarity index 100%
rename from docs/content/en/open_source/upgrading/2.36.md
rename to docs/content/changelog/os_upgrading/2.36.md
diff --git a/docs/content/en/open_source/upgrading/2.37.md b/docs/content/changelog/os_upgrading/2.37.md
similarity index 100%
rename from docs/content/en/open_source/upgrading/2.37.md
rename to docs/content/changelog/os_upgrading/2.37.md
diff --git a/docs/content/en/open_source/upgrading/2.38.md b/docs/content/changelog/os_upgrading/2.38.md
similarity index 100%
rename from docs/content/en/open_source/upgrading/2.38.md
rename to docs/content/changelog/os_upgrading/2.38.md
diff --git a/docs/content/en/open_source/upgrading/2.39.md b/docs/content/changelog/os_upgrading/2.39.md
similarity index 100%
rename from docs/content/en/open_source/upgrading/2.39.md
rename to docs/content/changelog/os_upgrading/2.39.md
diff --git a/docs/content/en/open_source/upgrading/2.4.md b/docs/content/changelog/os_upgrading/2.4.md
similarity index 100%
rename from docs/content/en/open_source/upgrading/2.4.md
rename to docs/content/changelog/os_upgrading/2.4.md
diff --git a/docs/content/en/open_source/upgrading/2.40.md b/docs/content/changelog/os_upgrading/2.40.md
similarity index 100%
rename from docs/content/en/open_source/upgrading/2.40.md
rename to docs/content/changelog/os_upgrading/2.40.md
diff --git a/docs/content/en/open_source/upgrading/2.41.md b/docs/content/changelog/os_upgrading/2.41.md
similarity index 100%
rename from docs/content/en/open_source/upgrading/2.41.md
rename to docs/content/changelog/os_upgrading/2.41.md
diff --git a/docs/content/en/open_source/upgrading/2.42.md b/docs/content/changelog/os_upgrading/2.42.md
similarity index 100%
rename from docs/content/en/open_source/upgrading/2.42.md
rename to docs/content/changelog/os_upgrading/2.42.md
diff --git a/docs/content/en/open_source/upgrading/2.43.md b/docs/content/changelog/os_upgrading/2.43.md
similarity index 100%
rename from docs/content/en/open_source/upgrading/2.43.md
rename to docs/content/changelog/os_upgrading/2.43.md
diff --git a/docs/content/en/open_source/upgrading/2.44.1.md b/docs/content/changelog/os_upgrading/2.44.1.md
similarity index 100%
rename from docs/content/en/open_source/upgrading/2.44.1.md
rename to docs/content/changelog/os_upgrading/2.44.1.md
diff --git a/docs/content/en/open_source/upgrading/2.44.md b/docs/content/changelog/os_upgrading/2.44.md
similarity index 100%
rename from docs/content/en/open_source/upgrading/2.44.md
rename to docs/content/changelog/os_upgrading/2.44.md
diff --git a/docs/content/en/open_source/upgrading/2.45.md b/docs/content/changelog/os_upgrading/2.45.md
similarity index 100%
rename from docs/content/en/open_source/upgrading/2.45.md
rename to docs/content/changelog/os_upgrading/2.45.md
diff --git a/docs/content/en/open_source/upgrading/2.46.md b/docs/content/changelog/os_upgrading/2.46.md
similarity index 100%
rename from docs/content/en/open_source/upgrading/2.46.md
rename to docs/content/changelog/os_upgrading/2.46.md
diff --git a/docs/content/en/open_source/upgrading/2.47.md b/docs/content/changelog/os_upgrading/2.47.md
similarity index 100%
rename from docs/content/en/open_source/upgrading/2.47.md
rename to docs/content/changelog/os_upgrading/2.47.md
diff --git a/docs/content/en/open_source/upgrading/2.48.2.md b/docs/content/changelog/os_upgrading/2.48.2.md
similarity index 100%
rename from docs/content/en/open_source/upgrading/2.48.2.md
rename to docs/content/changelog/os_upgrading/2.48.2.md
diff --git a/docs/content/en/open_source/upgrading/2.48.md b/docs/content/changelog/os_upgrading/2.48.md
similarity index 100%
rename from docs/content/en/open_source/upgrading/2.48.md
rename to docs/content/changelog/os_upgrading/2.48.md
diff --git a/docs/content/en/open_source/upgrading/2.49.md b/docs/content/changelog/os_upgrading/2.49.md
similarity index 100%
rename from docs/content/en/open_source/upgrading/2.49.md
rename to docs/content/changelog/os_upgrading/2.49.md
diff --git a/docs/content/en/open_source/upgrading/2.5.md b/docs/content/changelog/os_upgrading/2.5.md
similarity index 100%
rename from docs/content/en/open_source/upgrading/2.5.md
rename to docs/content/changelog/os_upgrading/2.5.md
diff --git a/docs/content/en/open_source/upgrading/2.50.md b/docs/content/changelog/os_upgrading/2.50.md
similarity index 100%
rename from docs/content/en/open_source/upgrading/2.50.md
rename to docs/content/changelog/os_upgrading/2.50.md
diff --git a/docs/content/en/open_source/upgrading/2.51.md b/docs/content/changelog/os_upgrading/2.51.md
similarity index 97%
rename from docs/content/en/open_source/upgrading/2.51.md
rename to docs/content/changelog/os_upgrading/2.51.md
index 6c796b103d7..92aac433e95 100644
--- a/docs/content/en/open_source/upgrading/2.51.md
+++ b/docs/content/changelog/os_upgrading/2.51.md
@@ -50,8 +50,8 @@ The following Helm chart values have been modified in this release:
## GitHub Scan Type and Parser Updates
The Github Vulnerability scan type and parser has been split into two disctinct scan types:
-- [Github Vulnerability](https://github.com/DefectDojo/django-DefectDojo/blob/master/docs/content/en/connecting_your_tools/parsers/file/github_vulnerability.md) (original)
-- [Github SAST](https://github.com/DefectDojo/django-DefectDojo/blob/master/docs/content/en/connecting_your_tools/parsers/file/github_sast.md)
+- [Github Vulnerability](https://github.com/DefectDojo/django-DefectDojo/blob/master/docs/content/supported_tools/file/github_vulnerability.md) (original)
+- [Github SAST](https://github.com/DefectDojo/django-DefectDojo/blob/master/docs/content/supported_tools/file/github_sast.md)
The original Github Vulnerability scan type will continue to accept SCA vulnerabilities uploaded in GitHub's GraphQL format, as it has always done. It will also continue to accept SAST uploads, however we recommend upgrading to the new Github SAST scan type for uploading these types of vulnerabilities going forward. This new scan type will accept the raw JSON response from [GitHub's REST API for code scanning alerts](https://docs.github.com/en/rest/code-scanning/code-scanning). Sample Github SAST scan data can be found [here](https://github.com/DefectDojo/django-DefectDojo/tree/master/unittests/scans/github_sast).
diff --git a/docs/content/en/open_source/upgrading/2.52.md b/docs/content/changelog/os_upgrading/2.52.md
similarity index 95%
rename from docs/content/en/open_source/upgrading/2.52.md
rename to docs/content/changelog/os_upgrading/2.52.md
index 20eef3fb214..18aa85e15be 100644
--- a/docs/content/en/open_source/upgrading/2.52.md
+++ b/docs/content/changelog/os_upgrading/2.52.md
@@ -90,7 +90,7 @@ There are other instructions for upgrading to 2.52.x. Check the [Release Notes](
## Merge of MobSF parsers
-Mobsfscan Scan" has been merged into the "MobSF Scan" parser. The "Mobsfscan Scan" scan_type has been retained to keep deduplication working for existing Tests, but users are encouraged to move to the "MobSF Scan" scan_type.
+"Mobsfscan Scan" has been merged into the "MobSF Scan" parser. The "Mobsfscan Scan" scan_type has been retained to keep deduplication working for existing Tests, but users are encouraged to move to the "MobSF Scan" scan_type.
## Release notes
Check the [Release Notes](https://github.com/DefectDojo/django-DefectDojo/releases/tag/2.52.0) for the contents of the release.
diff --git a/docs/content/en/open_source/upgrading/2.53.md b/docs/content/changelog/os_upgrading/2.53.md
similarity index 100%
rename from docs/content/en/open_source/upgrading/2.53.md
rename to docs/content/changelog/os_upgrading/2.53.md
diff --git a/docs/content/en/open_source/upgrading/2.54.3.md b/docs/content/changelog/os_upgrading/2.54.3.md
similarity index 100%
rename from docs/content/en/open_source/upgrading/2.54.3.md
rename to docs/content/changelog/os_upgrading/2.54.3.md
diff --git a/docs/content/en/open_source/upgrading/2.54.md b/docs/content/changelog/os_upgrading/2.54.md
similarity index 100%
rename from docs/content/en/open_source/upgrading/2.54.md
rename to docs/content/changelog/os_upgrading/2.54.md
diff --git a/docs/content/en/open_source/upgrading/2.6.md b/docs/content/changelog/os_upgrading/2.6.md
similarity index 100%
rename from docs/content/en/open_source/upgrading/2.6.md
rename to docs/content/changelog/os_upgrading/2.6.md
diff --git a/docs/content/en/open_source/upgrading/2.7.md b/docs/content/changelog/os_upgrading/2.7.md
similarity index 92%
rename from docs/content/en/open_source/upgrading/2.7.md
rename to docs/content/changelog/os_upgrading/2.7.md
index 526813dbb45..aa1ef6cba96 100644
--- a/docs/content/en/open_source/upgrading/2.7.md
+++ b/docs/content/changelog/os_upgrading/2.7.md
@@ -9,7 +9,7 @@ This release is a breaking change regarding the Choctaw Hog parser. As the maint
There is another breaking change regarding the import of SSLyze scans. The parser has been renamed from `SSLyze 3 Scan (JSON)` to `SSLyze Scan (JSON)`. The data in the database is fixed by the initializer, but it may break scripted API calls.
-Release 2.7.0 contains a beta functionality to make permissions for the configuration of DefectDojo more flexible. When the settings parameter `FEATURE_CONFIGURATION_AUTHORIZATION` is set to `True`, many configuration dialogues and API endpoints can be enabled for users or groups of users, regardless of their **Superuser** or **Staff** status, see [Configuration Permissions](/en/customize_dojo/user_management/about_perms_and_roles).
+Release 2.7.0 contains a beta functionality to make permissions for the configuration of DefectDojo more flexible. When the settings parameter `FEATURE_CONFIGURATION_AUTHORIZATION` is set to `True`, many configuration dialogues and API endpoints can be enabled for users or groups of users, regardless of their **Superuser** or **Staff** status, see [Configuration Permissions](/admin/user_management/about_perms_and_roles/).
The functionality using the flag `AUTHORIZATION_STAFF_OVERRIDE` has been removed. The same result can be achieved with giving the staff users a global Owner role.
diff --git a/docs/content/en/open_source/upgrading/2.8.md b/docs/content/changelog/os_upgrading/2.8.md
similarity index 100%
rename from docs/content/en/open_source/upgrading/2.8.md
rename to docs/content/changelog/os_upgrading/2.8.md
diff --git a/docs/content/en/open_source/upgrading/2.9.md b/docs/content/changelog/os_upgrading/2.9.md
similarity index 100%
rename from docs/content/en/open_source/upgrading/2.9.md
rename to docs/content/changelog/os_upgrading/2.9.md
diff --git a/docs/content/en/open_source/upgrading/_index.md b/docs/content/changelog/os_upgrading/_index.md
similarity index 100%
rename from docs/content/en/open_source/upgrading/_index.md
rename to docs/content/changelog/os_upgrading/_index.md
diff --git a/docs/content/en/open_source/upgrading/upgrading_guide.md b/docs/content/changelog/os_upgrading/upgrading_guide.md
similarity index 100%
rename from docs/content/en/open_source/upgrading/upgrading_guide.md
rename to docs/content/changelog/os_upgrading/upgrading_guide.md
diff --git a/docs/content/en/changelog/changelog.md b/docs/content/changelog/pro_changelog.md
similarity index 97%
rename from docs/content/en/changelog/changelog.md
rename to docs/content/changelog/pro_changelog.md
index a3561c407d5..fa3466d6505 100644
--- a/docs/content/en/changelog/changelog.md
+++ b/docs/content/changelog/pro_changelog.md
@@ -6,7 +6,7 @@ exclude_search: true
Here are the release notes for **DefectDojo Pro (Cloud Version)**. These release notes are focused on UX, so will not include all code changes.
-For Open Source release notes, please see the [Releases page on GitHub](https://github.com/DefectDojo/django-DefectDojo/releases), or alternatively consult the Open Source [upgrade notes](/en/open_source/upgrading/upgrading_guide/).
+For Open Source release notes, please see the [Releases page on GitHub](https://github.com/DefectDojo/django-DefectDojo/releases), or alternatively consult the Open Source [upgrade notes](/open_source/upgrading/upgrading_guide/).
## Jan 2025: v2.54
@@ -43,7 +43,7 @@ No significant UX changes.
### Dec 8, 2025: v2.53.1
-* **(Assets/Organizations)** Introduced overhaul to Products/Product Types, added the ability to create and diagram relationships between Assets. See [Assets/Organizations documentation](/en/working_with_findings/organizing_engagements_tests/pro_assets_organizations/) for details, and information on opting in to the Beta.
+* **(Assets/Organizations)** Introduced overhaul to Products/Product Types, added the ability to create and diagram relationships between Assets. See [Assets/Organizations documentation](/asset_modelling/hierarchy/pro__assets_organizations/) for details, and information on opting in to the Beta.
* **(Findings)** Added new KEV fields for ransomware, exploits, and date handling.
* **(Pro UI)** Added Table Preferences menu, allowing you to store preset lists of columns for each table.
@@ -150,7 +150,7 @@ The Pro UI has been significantly reorganized, with changes to page organization
#### August 25: 2.49.3
-[Integrations](/en/share_your_findings/integrations/) has been added to DefectDojo Pro, adding an Jira-style integrations for Azure DevOps, GitHub and GitLab boards.
+[Integrations](/issue_tracking/intro/intro/) has been added to DefectDojo Pro, adding an Jira-style integrations for Azure DevOps, GitHub and GitLab boards.
* **(API)** Basic Auth Login has been removed from the swagger form. Only cookieAuth and tokenAuth are accepted.
* **(API)** When MFA is enabled, an MFA code will be required to use the `/api-token-auth` endpoint.
@@ -322,8 +322,8 @@ Hotfix release - no significant feature changes.

-- **(Pro UI)** Added a link to Universal Importer to the sidebar, which provides access to the [Universal Importer and DefectDojo CLI](/en/connecting_your_tools/external_tools/) tools.
-- **(Pro UI)** Added smart Prioritization and Risk fields to DefectDojo Pro, which can be used to more easily triage Findings based on the impact of the Product they affect. See [Priority](/en/working_with_findings/finding_priority/) documentation for more information.
+- **(Pro UI)** Added a link to Universal Importer to the sidebar, which provides access to the [Universal Importer and DefectDojo CLI](/import_data/pro/specialized_import/external_tools/) tools.
+- **(Pro UI)** Added smart Prioritization and Risk fields to DefectDojo Pro, which can be used to more easily triage Findings based on the impact of the Product they affect. See [Priority](/asset_modelling/hierarchy/pro__priority_sla/) documentation for more information.
- **(Tools)** Updated Fortify Webinspect parser to handle Fortify's new XML report format.
#### Apr 14, 2025: v2.45.1
@@ -390,7 +390,7 @@ Hotfix release - no significant feature changes.
- **(Pro UI)** Added 'Has Jira' (True/False) as a filter, to filter Findings, Products or Engagements that have associated Jira data.
- **(Pro UI)** Notes can now be added to Engagement / Findings / Tests from All Engagements / Findings / Tests lists as well as View Engagement / Findings / Tests pages.
- **(Pro UI)** Added ability to Close Finding from a Finding List, without needing to first open the Edit Finding form.
-- **(CLI Tools)** Improved help text for Universal Importer / DefectDojo CLI. Many guides and examples are now in our [docs](/en/connecting_your_tools/external_tools/) instead of being displayed in the CLI itself.
+- **(CLI Tools)** Improved help text for Universal Importer / DefectDojo CLI. Many guides and examples are now in our [docs](/import_data/pro/specialized_import/external_tools/) instead of being displayed in the CLI itself.
- **(Tools)** Updated Burp scan to use Hashcode Deduplication. Default hashcode forms are `title`, `file_path`, `severity`, and `vuln_id_from_tool`.
- **(Tools)** Corrected issue with AWS Inspector2 OSS parser related to `mitigated date` being handled incorrectly.
@@ -591,7 +591,7 @@ configuration fields.
- **(API)** It is now possible to prefetch a Finding with attached files via API.
- **(Login)** A new "Forgot Username" link has been added to the login form. The link will navigate to a page which requests the user's email address. The username will be sent to that address if it exists.
- **Risk Acceptances** Notes are now added to Findings when they are removed from Risk Acceptances.
-- **(Risk Acceptance)** Risk Acceptance overhaul. Feature has been extended with new functions. See [Risk Acceptance documentation](/en/working_with_findings/findings_workflows/risk_acceptances/) for more details.
+- **(Risk Acceptance)** Risk Acceptance overhaul. Feature has been extended with new functions. See [Risk Acceptance documentation](/triage_findings/findings_workflows/risk_acceptances/) for more details.
- **Tools** Qualys HackerGuardian parser added.
- **Tools** Semgrep Parser updated with new severity mappings. HackerOne parser updated and now supports bug bounty reports.
- **Tools** fixed an issue where certain tools would not process asyncronously: Whitehat_Sentinel, SSLyze, SSLscan, Qualys_Webapp, Mend, Intsights, H1, and Blackduck.
diff --git a/docs/content/en/about_defectdojo/_index.md b/docs/content/en/about_defectdojo/_index.md
deleted file mode 100644
index aa822dcdbe4..00000000000
--- a/docs/content/en/about_defectdojo/_index.md
+++ /dev/null
@@ -1,18 +0,0 @@
----
-title: "About DefectDojo"
-date: 2021-02-02T20:46:29+01:00
-draft: false
-type: docs
-weight: 1
-
-cascade:
-- type: "blog"
- # set to false to include a blog section in the section nav along with docs
- toc_root: true
- _target:
- path: "/blog/**"
-- type: "docs"
- _target:
- path: "/**"
-exclude_search: true
----
diff --git a/docs/content/en/about_defectdojo/new_user_checklist.md b/docs/content/en/about_defectdojo/new_user_checklist.md
deleted file mode 100644
index d2e93499da9..00000000000
--- a/docs/content/en/about_defectdojo/new_user_checklist.md
+++ /dev/null
@@ -1,43 +0,0 @@
----
-title: "☑️ New User Checklist"
-description: "Get Started With DefectDojo"
-draft: "false"
-weight: 3
-chapter: true
----
-
-Here's a quick reference you can use to ensure successful implementation, from a blank canvas to a fully functional app.
-
-The essence of DefectDojo is to import security data, organize it, and present it to the folks who need to know. Here are ways to achieve those things in DefectDojo Pro and Open-Source:
-
-### DefectDojo Pro
-
-1. Start by [importing a file](/en/connecting_your_tools/import_scan_files/import_scan_ui) using the UI. This is generally the quickest way to see how your data fits into the DefectDojo model.
-
-2. Now that you have data in DefectDojo, learn more about how to organize it with the [Product Hierarchy Overview](/en/working_with_findings/organizing_engagements_tests/product_hierarchy). The Product Hierarchy creates a working inventory of your apps, which helps you divide your data into logical categories, apply access control rules, sort Findings by [Priority and Risk](/en/working_with_findings/finding_priority/) or to segment your reports to the correct team.
-
-3. Check out your [Metrics pages](/en/customize_dojo/dashboards/pro_dashboards/) which can be used to quickly share Finding reports with key stakeholders.
-
-### DefectDojo Open-Source
-
-1. Open-Source users can start by creating their first [Product Type and Product](/en/working_with_findings/organizing_engagements_tests/product_hierarchy). Once those are created, they can [import a file](/en/connecting_your_tools/import_scan_files/import_scan_ui) to one of those Products using the UI.
-
-2. Now that you have data in DefectDojo, consider expanding your Product layout [Product Hierarchy Overview](/en/working_with_findings/organizing_engagements_tests/product_hierarchy). The Product Hierarchy creates a working inventory of your apps, which helps you divide your data up into logical categories. These categories can be used to apply access control rules, or to segment your reports to the correct team.
-
-3. Use the [Report Builder](/en/share_your_findings/pro_reports/using_the_report_builder/#opening-the-report-builder) to summarize the data you've imported. Reports can be used to quickly share Findings with stakeholders such as Product Owners.
-
-This is the essence of DefectDojo - import security data, organize it, and present it to the folks who need to know.
-
-All of these features can be automated, and because DefectDojo can handle over 200 tools (at time of writing) you should be all set to create a functional security inventory of your entire organizational output.
-
-## Other guides
-
-### Pro Features
-- If your organization uses ServiceNow, AzureDevops, GitHub or GitLab for issue tracking, check out our [documentation](/en/share_your_findings/integrations/) on those integrations.
-- Customize your [main Dashboard](/en/customize_dojo/dashboards/introduction_dashboard/) with filtered tiles to view your environment at a glance.
-- Learn how to rapidly import data and mirror your team's existing security environment with [Connectors](/en/connecting_your_tools/connectors/about_connectors/).
-
-### Open-Source Features
-- Does your organization use Jira? Learn how to use our [Jira integration](/en/share_your_findings/jira_guide/) to create Jira tickets from the data you ingest.
-- Are you expecting to share DefectDojo with many users in your organization? Check out our guides to [user management](/en/customize_dojo/user_management/about_perms_and_roles/) and set up role-based access control (RBAC).
-- Ready to dive into automation? Learn how to use the [DefectDojo API](/en/connecting_your_tools/import_scan_files/api_pipeline_modelling) to automatically import new data, and build a robust CI/CD pipeline.
\ No newline at end of file
diff --git a/docs/content/en/connecting_your_tools/parsers/file/openreports.md b/docs/content/en/connecting_your_tools/parsers/file/openreports.md
deleted file mode 100644
index c3ec62d9a42..00000000000
--- a/docs/content/en/connecting_your_tools/parsers/file/openreports.md
+++ /dev/null
@@ -1,136 +0,0 @@
----
-title: "OpenReports"
-toc_hide: true
----
-
-Import vulnerability scan reports formatted as [OpenReports](https://github.com/openreports/reports-api).
-
-OpenReports is a Kubernetes-native reporting framework that aggregates vulnerability scan results and compliance checks from various security tools into a unified format. It provides a standardized API for collecting and reporting security findings across your Kubernetes infrastructure.
-
-### File Types
-
-DefectDojo parser accepts a .json file.
-
-### Exporting Reports from Kubernetes
-
-To export OpenReports from your Kubernetes cluster, use kubectl:
-
-```bash
-kubectl get reports -A -ojson > reports.json
-```
-
-This command retrieves all Report objects from all namespaces and saves them in JSON format. You can then import the `reports.json` file into DefectDojo.
-
-To export reports from a specific namespace:
-
-```bash
-kubectl get reports -n
-
{{ partial "main/showFlexSearch" . }}
{{ $showFlexSearch := .Scratch.Get "showFlexSearch" -}}
@@ -148,73 +133,76 @@ Start your journey with DefectDojo with our New User Checklist.
-Learn how to import data from 190+ supported security tools here.
-Use the Report Builder to present customizable reports of Findings.
-