Merge pull request #11461 from DefectDojo/master-into-bugfix/2.41.3-2…

….42.0-dev

Release: Merge back 2.41.3 into bugfix from: master-into-bugfix/2.41.3-2.42.0-dev

.github/release-drafter.yml

@@ -51,7 +51,7 @@ exclude-labels:
 
 change-template: '- $TITLE @$AUTHOR (#$NUMBER)'
 template: |
-  Please consult the [Upgrade notes in the documentation ](https://documentation.defectdojo.com/getting_started/upgrading/) for specific instructions for this release, and general upgrade instructions. Below is an automatically generated list of all PRs merged since the previous release.
+  Please consult the [Upgrade notes in the documentation ](https://docs.defectdojo.com/en/open_source/upgrading/upgrading_guide/) for specific instructions for this release, and general upgrade instructions. Below is an automatically generated list of all PRs merged since the previous release.
 
   ## Changes since $PREVIOUS_TAG
   $CHANGES

docs/content/en/about_defectdojo/new_user_checklist.md

@@ -10,18 +10,18 @@ Here's a quick reference you can use to ensure successful implementation - from
 
 ### The Basics
 
-1. Start by [importing a file](../../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. (note: OS users will need to set up a Product Type and Product before they can import data)
+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. (note: OS users will need to set up a Product Type and Product before they can import data)
 
-2. Now that you have data in DefectDojo, learn more about how to organize it with the [Product Hierarchy Overview](../../working_with_findings/organizing_engagements_tests/product-hierarchy-overview). 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 segement your reports to the correct team.
+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 up into logical categories. These categories can be used to apply access control rules, or to segement your reports to the correct team.
 
-3. Try [creating a Report](../../pro_reports/using-the-report-builder/) to summarize the data you've imported.  Reports can be used to quickly share Findings with stakeholders such as Product Owners.
+3. Try [creating a Report](/en/pro_reports/using_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 190 tools (at time of writing) you should be all set to create a functional security inventory of your entire organizational output.
 
 ### Other guides
 
-- Does your organization use Jira? Learn how to use our [Jira integration](../jira_integration/Connect%20DefectDojo%20to%20Jira.md) 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](../user_management/about-permissions-roles) and set up role-based access control (RBAC).
-- Ready to dive into automation? Learn how to use the [DefectDojo API](../connecting_your_tools/import_scan_files/api_pipeline_modelling) to automatically import new data, and build a robust CI / CD pipeline.
+- Does your organization use Jira? Learn how to use our [Jira integration](/en/jira_integration/connect_to_jira) 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/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.

docs/content/en/changelog/changelog.md

@@ -5,7 +5,12 @@ description: "DefectDojo Changelog"
 
 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 [upgrate notes](../../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).
+
+
+## Dec 16, 2024: v2.41.2
+
+- **(Connectors)** Remove the 'Beta' logo from Connectors
 
 ## Dec 9, 2024: v2.41.1
 

docs/content/en/connecting_your_tools/connectors/_index.md

@@ -1,11 +1,11 @@
 ---
-title: "Set Up API Connectors"
+title: "API Connectors"
 description: "Seamlessly connect DefectDojo to your security tools suite"
 summary: ""
 date: 2023-09-07T16:06:50+02:00
 lastmod: 2023-09-07T16:06:50+02:00
 draft: false
-weight: 2
+weight: 3
 chapter: true
 sidebar:
   collapsed: true

docs/content/en/connecting_your_tools/connectors/about_connectors.md

@@ -17,6 +17,8 @@ seo:
 pro-feature: true
 ---
 
+<span style="background-color:rgba(242, 86, 29, 0.3)">Note: Connectors are a DefectDojo Pro-only feature.</span>
+
 DefectDojo allows users to build sophisticated API integrations, and gives users full control over how their vulnerability data is organized. 
 
 But everyone needs a starting point, and that's where Connectors come in. Connectors are designed to get your security tools connected and importing data to DefectDojo as quickly as possible.
@@ -39,9 +41,9 @@ These Connectors provide an API\-speed integration with DefectDojo, and can be u
 
 If you're using DefectDojo's **Auto\-Map** settings, you can have your first Connector up and running in no time.
 
-1. Set up a [Connector](https://docs.defectdojo.com/en/connecting_your_tools/connectors/add_edit_connectors/) from a supported tool.
-2. [Discover](https://docs.defectdojo.com/en/connecting_your_tools/connectors/operations_discover/) your tool's data hierarchy.
-3. [Sync](https://docs.defectdojo.com/en/connecting_your_tools/connectors/operations_sync/) the vulnerabilities found with your tool into DefectDojo.
+1. Set up a [Connector](../add_edit_connectors/) from a supported tool.
+2. [Discover](../manage_operations/#discover-operations) your tool's data hierarchy.
+3. [Sync](../operations_sync/#sync-operations) the vulnerabilities found with your tool into DefectDojo.
 
 That's all, really! And remember, even if you create your Connector the 'easy' way, you can easily change the way things are set up later, without losing any of your work.
 
@@ -59,10 +61,10 @@ When you're ready to add more tools to DefectDojo, you can easily rearrange your
 
 ## My Connector isn't supported
 
-Fortunately, DefectDojo can still handle manual import for a wide range of security tools. Please see our [Supported Tool List](https://docs.defectdojo.com/en/connecting_your_tools/parsers/), as well as our guide to Importing data.
+Fortunately, DefectDojo can still handle manual import for a wide range of security tools. Please see our [Supported Tool List](../../parsers/), as well as our guide to Importing data.
 
 # **Next Steps**
 
 * Check out the Connectors page by switching to DefectDojo's **Beta UI**.
-* Follow our guide to [create your first Connector](https://docs.defectdojo.com/en/connecting_your_tools/connectors/add_edit_connectors/).
-* Check out the process of [Discovering \& Mapping](https://docs.defectdojo.com/en/connecting_your_tools/connectors/operations_discover/) your security tools and see how they can be configured to import data.
+* Follow our guide to [create your first Connector](../add_edit_connectors/).
+* Check out the process of [Running Operations](../manage_operations/) with your Connected security tools and see how they can be configured to import data.

docs/content/en/connecting_your_tools/connectors/add_edit_connectors.md

@@ -3,21 +3,24 @@ title: "Add or Edit a Connector"
 description: "Connect to a supported security tool"
 ---
 
+<span style="background-color:rgba(242, 86, 29, 0.3)">Note: Connectors are a DefectDojo Pro-only feature.</span>
+
 The process for adding and configuring a connector is similar, regardless of the tool you’re trying to connect. However, certain tools may require you to create API keys or complete additional steps.
 
-Before you begin this process, we recommend checking our [tool-specific reference](https://docs.defectdojo.com/en/connecting_your_tools/connectors/connectors_tool_reference/) to find the API resources for the tool you're trying to connect.
+Before you begin this process, we recommend checking our [Tool-Specific Reference](../connectors_tool_reference/) to find the API resources for the tool you're trying to connect.
 
 1. If you haven't already, start by **switching to the Beta UI** in DefectDojo.
 2. From the left\-side menu, click on the **API Connectors** menu item. This is nested under the **Import** header.
 ​
 ![image](images/add_edit_connectors.png)
+
 3. Choose a new Connector you want to add to DefectDojo in **Available Connections**, and click the **Add Configuration** underneath the tool.  
 ​  
 You can also edit an existing Connection under the **Configured Connections** header. Click **Manage Configuration \> Edit Configuration** for the Configured Connection you want to Edit.  
 ​
 ![image](images/add_edit_connectors_2.png)
 
-4. You will need an accessible URL **Location** for the tool, along with an API **Secret** key. The location of the API key will depend on the tool you are trying to configure. See our [Tool\-Specific Reference](https://docs.defectdojo.com/en/connecting_your_tools/connectors/connectors_tool_reference/) for more details.  
+4. You will need an accessible URL **Location** for the tool, along with an API **Secret** key. The location of the API key will depend on the tool you are trying to configure. See our [Tool\-Specific Reference](../connectors_tool_reference/) for more details.  
 ​
 5. Set a **Label** for this connection to help you identify it in DefectDojo.  
 ​
@@ -31,4 +34,4 @@ You can also edit an existing Connection under the **Configured Connections** he
 
 ## Next Steps
 
-* Now that you've added a connector, you can confirm everything is set up correctly by running a [Discover](https://docs.defectdojo.com/en/connecting_your_tools/connectors/operations_discover/) operation.
+* Now that you've added a connector, you can confirm everything is set up correctly by running a [Discover](../manage_operations/#discover-operations) operation.