add upstream content and parent about page

fix links

correct links

Author: paulOsinski

docs/config/_default/menus/menus.en.toml

@@ -20,7 +20,7 @@
 
 [[main]]
   name = "Connections"
-  url = "/connections/about_connections/"
+  url = "/connections/about/"
   weight = 13
 
 [[main]]
@@ -35,7 +35,7 @@
 
 [[main]]
   name = "Issue Tracking"
-  url = "/connections/downstream/downstream_connections/"
+  url = "/connections/downstream/about/"
   weight = 15
 
 [[main]]

docs/content/asset_modelling/PRO_hierarchy/assets_organizations.md

@@ -82,7 +82,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](/asset_modelling/pro_hierarchy/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`).
+In this diagram, every element under "Core Application" could be recorded as a separate Asset, with unique business criticality (see: [Priority & Risk](/asset_modelling/pro_hierarchy/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
 

…content/connections/about_connections.md docs/content/connections/about.mddocs/content/connections/about_connections.md renamed to docs/content/connections/about.md docs/content/connections/about_connections.md renamed to docs/content/connections/about.md

@@ -60,5 +60,5 @@ On the **Downstream Connections** page:
 
 ## Next Steps
 
-* Read [About Connectors](/import_data/pro/connectors/about_connectors/) and [add your first Upstream Connection](/import_data/pro/connectors/add_edit_connectors/) to start importing findings automatically.
-* Read the [Downstream Connections guide](/connections/downstream/downstream_connections/) to push findings to your issue trackers.
+* Read [About Upstream Connections](/connections/upstream/about/) and [add your first Upstream Connection](/connections/upstream/add_edit/) to start importing findings automatically.
+* Read the [Downstream Connections guide](/connections/downstream/about/) to push findings to your issue trackers.

docs/content/connections/downstream/about.md

@@ -75,16 +75,16 @@ Each vendor will have varying requirements for how DefectDojo will need to inter
 
 For the complete list of requirements, please open the vendor specific pages below:
 
-- [Azure Devops](/connections/downstream/downstream_connections_toolreference/#azure-devops-boards)
-- [Bitbucket](/connections/downstream/downstream_connections_toolreference/#bitbucket)
-- [Freshservice](/connections/downstream/downstream_connections_toolreference/#freshservice)
-- [GitHub](/connections/downstream/downstream_connections_toolreference/#github)
-- [GitLab Boards](/connections/downstream/downstream_connections_toolreference/#gitlab)
-- [Jira](/connections/downstream/downstream_connections_toolreference/#jira)
-- [ServiceDesk Plus](/connections/downstream/downstream_connections_toolreference/#servicedesk-plus)
-- [ServiceNow](/connections/downstream/downstream_connections_toolreference/#servicenow)
-- [Shortcut](/connections/downstream/downstream_connections_toolreference/#shortcut)
-- [Zendesk](/connections/downstream/downstream_connections_toolreference/#zendesk)
+- [Azure Devops](/connections/downstream/downstream_toolreference/#azure-devops-boards)
+- [Bitbucket](/connections/downstream/downstream_toolreference/#bitbucket)
+- [Freshservice](/connections/downstream/downstream_toolreference/#freshservice)
+- [GitHub](/connections/downstream/downstream_toolreference/#github)
+- [GitLab Boards](/connections/downstream/downstream_toolreference/#gitlab)
+- [Jira](/connections/downstream/downstream_toolreference/#jira)
+- [ServiceDesk Plus](/connections/downstream/downstream_toolreference/#servicedesk-plus)
+- [ServiceNow](/connections/downstream/downstream_toolreference/#servicenow)
+- [Shortcut](/connections/downstream/downstream_toolreference/#shortcut)
+- [Zendesk](/connections/downstream/downstream_toolreference/#zendesk)
 
 ## Error Handling and Debugging
 

…ent/import_data/pro/connectors/_index.md …s/content/connections/upstream/_index.mddocs/content/import_data/pro/connectors/_index.md renamed to docs/content/connections/upstream/_index.md docs/content/import_data/pro/connectors/_index.md renamed to docs/content/connections/upstream/_index.md

@@ -1,11 +1,11 @@
 ---
-title: "Connectors"
+title: "Upstream Connections"
 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: 4
+weight: 2
 chapter: true
 seo:
   title: "" # custom title (optional)
@@ -14,4 +14,6 @@ seo:
   robots: "" # custom robot tags (optional)
 audience: pro
 exclude_search: true
+aliases:
+  - /import_data/pro/connectors/
 ---

…_data/pro/connectors/about_connectors.md …cs/content/connections/upstream/about.mddocs/content/import_data/pro/connectors/about_connectors.md renamed to docs/content/connections/upstream/about.md docs/content/import_data/pro/connectors/about_connectors.md renamed to docs/content/connections/upstream/about.md

@@ -1,5 +1,5 @@
 ---
-title: "About Connectors"
+title: "Upstream Connections"
 description: "Seamlessly connect DefectDojo to your security tools suite"
 summary: ""
 date: 2023-09-07T16:06:50+02:00
@@ -16,15 +16,16 @@ seo:
   robots: "" # custom robot tags (optional)
 pro-feature: true
 aliases:
+  - /import_data/pro/connectors/about_connectors/
   - /en/connecting_your_tools/connectors/about_connectors
 ---
-<span style="background-color:rgba(242, 86, 29, 0.3)">Note: Connectors are a DefectDojo Pro-only feature.</span>
+<span style="background-color:rgba(242, 86, 29, 0.3)">Note: Upstream Connections 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.
+But everyone needs a starting point, and that's where Upstream Connections come in. Upstream Connections (formerly known as **API Connectors**) are designed to get your security tools connected and importing data to DefectDojo as quickly as possible.
 
-We currently support Connectors for the following tools, with more on the way:
+We currently support Upstream Connections for the following tools, with more on the way:
 
 * **Akamai API Security**
 * **Anchore**
@@ -43,19 +44,19 @@ We currently support Connectors for the following tools, with more on the way:
 * **Tenable**
 * **Wiz**
 
-These Connectors provide an API\-speed integration with DefectDojo, and can be used to automatically ingest and organize vulnerability data from the tool.
+These connections provide an API\-speed integration with DefectDojo, and can be used to automatically ingest and organize vulnerability data from the tool.
 
-## Connectors Quick\-Start
+## Upstream Connections Quick\-Start
 
 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](../add_edit_connectors/) from a supported tool.
+1. Set up a [Connector](../add_edit/) from a supported tool.
 2. [Discover](../manage_operations/#discover-operations) your tool's data hierarchy.
 3. [Sync](../manage_operations/#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.
 
-## How Connectors Work
+## How Upstream Connections Work
 
 As long as you have the API key from the tool you're trying to connect, a connector can be added in just a few minutes. Once the connection is working, DefectDojo will **Discover** your tool's environment to see how you're organizing your scan data.
 
@@ -73,6 +74,6 @@ Fortunately, DefectDojo can still handle manual import for a wide range of secur
 
 # **Next Steps**
 
-* Check out the Connectors page by switching to DefectDojo's **Pro UI**.
-* Follow our guide to [create your first Connector](../add_edit_connectors/).
+* Check out the **Upstream Connections** page by switching to DefectDojo's **Pro UI** and opening **Connections \> Upstream Connections** under the **Import** header.
+* Follow our guide to [create your first Connector](../add_edit/).
 * Check out the process of [Running Operations](../manage_operations/) with your Connected security tools and see how they can be configured to import data.

…ta/pro/connectors/add_edit_connectors.md …content/connections/upstream/add_edit.mddocs/content/import_data/pro/connectors/add_edit_connectors.md renamed to docs/content/connections/upstream/add_edit.md docs/content/import_data/pro/connectors/add_edit_connectors.md renamed to docs/content/connections/upstream/add_edit.md

@@ -1,31 +1,32 @@
 ---
-title: "Add or Edit a Connector"
+title: "Add or Edit Upstream Connections"
 description: "Connect to a supported security tool"
 aliases:
+  - /import_data/pro/connectors/add_edit_connectors/
   - /en/connecting_your_tools/connectors/add_edit_connectors
 ---
-<span style="background-color:rgba(242, 86, 29, 0.3)">Note: Connectors are a DefectDojo Pro-only feature.</span>
+<span style="background-color:rgba(242, 86, 29, 0.3)">Note: Upstream Connections 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.
+The process for adding and configuring an Upstream Connection 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](../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](../toolreference/) to find the API resources for the tool you're trying to connect.
 
 1. If you haven't already, start by **switching to the Pro UI** in DefectDojo.
-2. From the left\-side menu, click on the **API Connectors** menu item. This is nested under the **Import** header.
+2. From the left\-side menu, open the **Connections** group nested under the **Import** header, and click **Upstream Connections**.
 ​
 ![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.  
+3. Choose a new Connector you want to add to DefectDojo in **Available Connections**, and click the **Add Configuration** button on the tool's tile. You can use the **Search Connections** box to filter each section by tool name, or the **All / Asset / Finding** toggle in the page header to filter by connector type.  
 ​  
 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](../connectors_tool_reference/) for more details.  
+4. You will need an accessible **Location URL** 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](../toolreference/) for more details.  
 ​
 5. Set a **Label** for this connection to help you identify it in DefectDojo.  
 ​
-6. Schedule the **Connector’s** automatic Discovery and Synchronization activities. These can be changed later.  
+6. Schedule the Connector's automatic discovery and sync using the **Discovery Configuration** and **Synchronization Configuration** schedules. These can be changed later.  
 ​
 7. Select whether you wish to **Enable Auto\-Mapping**. Enable Auto\-Mapping will create a new Product in DefectDojo to store the data from this connector. Auto\-Mapping can be turned on or off at any time.  
 ​

…data/pro/connectors/manage_operations.md …onnections/upstream/manage_operations.mddocs/content/import_data/pro/connectors/manage_operations.md renamed to docs/content/connections/upstream/manage_operations.md docs/content/import_data/pro/connectors/manage_operations.md renamed to docs/content/connections/upstream/manage_operations.md

@@ -2,11 +2,12 @@
 title: "Managing Operations"
 description: "Check the status of your Connector's Discover & Sync Operations"
 aliases:
+  - /import_data/pro/connectors/manage_operations/
   - /en/connecting_your_tools/connectors/manage_operations
 ---
-<span style="background-color:rgba(242, 86, 29, 0.3)">Note: Connectors are a DefectDojo Pro-only feature.</span>
+<span style="background-color:rgba(242, 86, 29, 0.3)">Note: Upstream Connections are a DefectDojo Pro-only feature.</span>
 
-Once an API connector is set up, it will run two Operations on a recurring basis:
+Once an Upstream Connection is set up, it will run two Operations on a recurring basis:
 
 * **Discover** will learn the connected tool's structure, and will create records in DefectDojo of any unmapped data;
 * **Sync** will import new Findings from the tool based on your mappings.
@@ -73,7 +74,7 @@ To learn more about Products, Engagements, Tests and Findings, see our [Product
 
 To have DefectDojo run a Sync operation off\-schedule:
 
-1. Navigate to the **Manage Records \& Operations** page for the connector you want to use. From the **API Connectors** page, click the drop\-down menu on the Connector you wish to work with, and select Manage Records \& Operations.  
+1. Navigate to the **Manage Records \& Operations** page for the connector you want to use. From the **Upstream Connections** page, click the **Manage Configuration** drop\-down menu on the Connector you wish to work with, and select **Manage Records \& Operations**.  
 ​
 2. From this page, click the **Sync** button. This button is located next to the **Mapped Records** header.
 

…rt_data/pro/connectors/manage_records.md …t/connections/upstream/manage_records.mddocs/content/import_data/pro/connectors/manage_records.md renamed to docs/content/connections/upstream/manage_records.md docs/content/import_data/pro/connectors/manage_records.md renamed to docs/content/connections/upstream/manage_records.md

@@ -2,9 +2,10 @@
 title: "Managing Records"
 description: "Direct the flow of data from your tool into DefectDojo"
 aliases:
+  - /import_data/pro/connectors/manage_records/
   - /en/connecting_your_tools/connectors/manage_records
 ---
-<span style="background-color:rgba(242, 86, 29, 0.3)">Note: Connectors are a DefectDojo Pro-only feature.</span>
+<span style="background-color:rgba(242, 86, 29, 0.3)">Note: Upstream Connections are a DefectDojo Pro-only feature.</span>
 
 Once you have run your first Discover operation, you should see a list of Mapped or Unmapped records on the **Manage Records and Operations** page.
 

…/connectors/connectors_tool_reference.md …nt/connections/upstream/toolreference.mddocs/content/import_data/pro/connectors/connectors_tool_reference.md renamed to docs/content/connections/upstream/toolreference.md docs/content/import_data/pro/connectors/connectors_tool_reference.md renamed to docs/content/connections/upstream/toolreference.md

@@ -1,10 +1,11 @@
 ---
-title: "Tool-Specific Connector Setup"
+title: "Upstream Connections Tool Reference"
 description: "Our list of supported Connector tools, and how to set them up with DefectDojo"
 aliases:
+  - /import_data/pro/connectors/connectors_tool_reference/
   - /en/connecting_your_tools/connectors/connectors_tool_reference
 ---
-<span style="background-color:rgba(242, 86, 29, 0.3)">Note: Connectors are a DefectDojo Pro-only feature.</span>
+<span style="background-color:rgba(242, 86, 29, 0.3)">Note: Upstream Connections are a DefectDojo Pro-only feature.</span>
 
 When setting up a Connector for a supported tool, you'll need to give DefectDojo specific information related to the tool's API. At a base level, you'll need: