Merge branch 'main' of https://github.com/MicrosoftDocs/azure-docs-pr into pauljewell-js-resources

Author: pauljewellmsft

articles/active-directory/fundamentals/whats-deprecated-azure-ad.md

@@ -34,7 +34,7 @@ Use the following table to learn about changes including deprecations, retiremen
 |[License management API, PowerShell](https://techcommunity.microsoft.com/t5/microsoft-entra-azure-ad-blog/migrate-your-apps-to-access-the-license-managements-apis-from/ba-p/2464366)|Retirement|*Mar 31, 2023|
 |[Azure AD Authentication Library (ADAL)](https://techcommunity.microsoft.com/t5/microsoft-entra-azure-ad-blog/microsoft-entra-change-announcements-september-2022-train/ba-p/2967454)|Retirement|Jun 30, 2023|
 |[Azure AD Graph API](https://techcommunity.microsoft.com/t5/microsoft-entra-azure-ad-blog/microsoft-entra-change-announcements-september-2022-train/ba-p/2967454)|Deprecation|Jun 30, 2023|
-|[Azure AD PowerShell](https://techcommunity.microsoft.com/t5/microsoft-entra-azure-ad-blog/microsoft-entra-change-announcements-september-2022-train/ba-p/2967454)|Retirement|Jun 30, 2023|
+|[Azure AD PowerShell and MSOnline PowerShell](https://techcommunity.microsoft.com/t5/microsoft-entra-azure-ad-blog/microsoft-entra-change-announcements-september-2022-train/ba-p/2967454)|Deprecation|Jun 30, 2023|
 |[Azure AD MFA Server](https://techcommunity.microsoft.com/t5/microsoft-entra-azure-ad-blog/microsoft-entra-change-announcements-september-2022-train/ba-p/2967454)|Retirement|Sep 30, 2024|
 
 \* The legacy license management API and PowerShell cmdlets will not work for **new tenants** created after Nov 1, 2022.

articles/ddos-protection/index.yml

@@ -7,7 +7,7 @@ metadata:
   keywords: azure ddos protection
   author: AbdullahBell
   ms.author: abell
-  ms.date: 10/12/2022
+  ms.date: 02/06/2023
   ms.service: ddos-protection
   ms.topic: landing-page
   ms.custom: azure-ddos-protection, ignite-2022
@@ -55,8 +55,19 @@ landingContent:
             url: telemetry.md
           - text: View and configure DDoS diagnostic logging
             url: diagnostic-logging.md
-          - text: View and configure DDoS protection alerts
+      - linkListType: how-to-guide
+        links:
+          - text: Configure Azure DDoS Protection metric alerts through portal
             url: alerts.md
+          - text: Configure Azure DDoS Protection diagnostic logging alerts
+            url: ddos-diagnostic-alert-templates.md
+  # Card
+  - title: View attack analytics
+    linkLists:
+      - linkListType: how-to-guide
+        links:
+        - text: View Azure DDoS Protection alerts in Microsoft Defender for Cloud
+          url: ddos-view-alerts-defender-for-cloud.md
 
   # Card
   - title: Responding to DDoS attacks
@@ -75,4 +86,10 @@ landingContent:
             url: test-through-simulations.md
           - text: Engage DDoS Rapid Response (DRR)
             url: ddos-rapid-response.md
-  
+    # Card
+  - title: Planning 
+    linkLists:
+      - linkListType: concept
+        links:
+        - text: Azure DDoS Solution for Microsoft Sentinel
+          url: https://techcommunity.microsoft.com/t5/azure-network-security-blog/new-azure-ddos-solution-for-microsoft-sentinel/ba-p/3732013

articles/defender-for-iot/organizations/TOC.yml

@@ -301,6 +301,8 @@
       href: how-to-troubleshoot-the-sensor-and-on-premises-management-console.md
 - name: Reference
   items:
+  - name: Data retention
+    href: references-data-retention.md
   - name: OT monitoring appliances
     items:
     - name: Overview

articles/marketplace/partner-center-portal/commercial-marketplace-lead-management-instructions-marketo.md

@@ -3,7 +3,7 @@ title: Lead management in Marketo - Microsoft commercial marketplace
 description: Learn how to use a Marketo CRM system to manage leads from Microsoft AppSource and Azure Marketplace.
 ms.service: marketplace
 ms.subservice: partnercenter-marketplace-publisher
-ms.topic: conceptual
+ms.topic: article
 author: urimsft
 ms.author: uridor
 ms.date: 06/08/2022
@@ -12,7 +12,7 @@ ms.date: 06/08/2022
 # Use Marketo to manage commercial marketplace leads
 
 > [!IMPORTANT]
-> The marketo connector is not currently working due to a change in the Marketo platform. Use Leads from the Referrals workspace.
+> The Marketo connector has been restored. Update your configurations to receive leads as shown in this article.
 
 This article describes how to set up your Marketo CRM system to process sales leads from your offers in Microsoft AppSource and Azure Marketplace.
 
@@ -22,70 +22,87 @@ This article describes how to set up your Marketo CRM system to process sales le
 
 1. Select **Design Studio**.
 
-    ![Marketo Design Studio](./media/commercial-marketplace-lead-management-instructions-marketo/marketo-1.png)
+   :::image type="content" source="./media/commercial-marketplace-lead-management-instructions-marketo/marketo-1.png" alt-text="Screenshot showing Marketo Design Studio.":::
 
-1.  Select **New Form**.
+1. Select **New Form**.
 
-    ![Marketo New Form](./media/commercial-marketplace-lead-management-instructions-marketo/marketo-2.png)
+   :::image type="content" source="./media/commercial-marketplace-lead-management-instructions-marketo/marketo-2.png" alt-text="Screenshot showing Marketo Design Studio New Form.":::
 
-1.  Fill in the required fields in the **New Form** dialog box, and then select **Create**.
+1. Fill in the required fields in the **New Form** dialog box, and then select **Create**.
 
-    ![Marketo create new form](./media/commercial-marketplace-lead-management-instructions-marketo/marketo-3.png)
+   :::image type="content" source="./media/commercial-marketplace-lead-management-instructions-marketo/marketo-3.png" alt-text="Screenshot showing Marketo Design Studio New Form creation.":::
+    
+1. Ensure that the fields mappings are setup correctly. Here are the list of fields that the connector needs to be setup on the form. 
 
-1.  On the **Field Details** page, select **Finish**.
+   > [!NOTE]
+   > The field with name "Lead Source" is expected to be configured in the form. It can be mapped to the **SourceSystemName** system field in Marketo or a custom field.
 
-    ![Marketo finish form](./media/commercial-marketplace-lead-management-instructions-marketo/marketo-4.png)
+   :::image type="content" source="./media/commercial-marketplace-lead-management-instructions-marketo/marketo-field-details.png" alt-text="Screenshot showing Marketo new form details.":::
 
-1.  Approve and close.
+1. On the **Field Details** page, select **Finish**.
+
+   :::image type="content" source="./media/commercial-marketplace-lead-management-instructions-marketo/marketo-4.png" alt-text="Screenshot showing finishing the Marketo creation form.":::
+
+1. Approve and close.
 
 1. On the **MarketplaceLeadBackend** tab, select **Embed Code**. 
 
-    ![Marketo Embed Code](./media/commercial-marketplace-lead-management-instructions-marketo/marketo-6.png)
+   :::image type="content" source="./media/commercial-marketplace-lead-management-instructions-marketo/marketo-6.png" alt-text="Screenshot showing the Marketo Embed Code form.":::
 
 1. Marketo Embed Code displays code similar to the following example.
 
-    ```html
-    <form id="mktoForm_1179"></form>
-    <script>MktoForms2.loadForm("("//app-ys12.marketo.com", "123-PQR-789", 1179);</script>
-    ```
+   ```html
+   <form id="mktoForm_1179"></form>
+   <script>MktoForms2.loadForm("("//app-ys12.marketo.com", "123-PQR-789", 1179);</script>
+   ```
 
 1. Copy the values for the following fields shown in the Embed Code form. You'll use these values to configure your offer to receive leads in the next step. Use the next example as a guide for getting the IDs you need from the Marketo Embed Code example.
 
-    - Server ID = **ys12**
-    - Munchkin ID = **123-PQR-789**
-    - Form ID = **1179**
+   - Munchkin ID = **123-PQR-789**
+   - Form ID = **1179**
+
+   The following is another way to figure out these values:
+
+   - Get your subscription's Munchkin ID by going to your **Admin** > **Munchkin** menu in the **Munchkin Account ID** field, or from the first part of your Marketo REST API host subdomain: `https://{Munchkin ID}.mktorest.com`.
+   - Form ID is the ID of the Embed Code form you created in step 7 to route leads from the marketplace.
+
+## Obtain a API access from your Marketo Admin
 
-    Another way to figure out these values:
+1. See this [Marketo article on getting API access](https://aka.ms/marketo-api), specifically a **ClientID** and **Client Secret** needed for the new Marketo configuration. Follow the step-by-step guide to create an API-only user and a Launchpoint connection for the Partner Center lead management service.
 
-    - Server ID is found in the URL of your Marketo instance, for example, `serverID.marketo.com`.
-    - Get your subscription's Munchkin ID by going to your **Admin** > **Munchkin** menu in the **Munchkin Account ID** field, or from the first part of your Marketo REST API host subdomain: `https://{Munchkin ID}.mktorest.com`.
-    - Form ID is the ID of the Embed Code form you created in step 7 to route leads from the marketplace.
+1. Ensure that the **Custom service created** indicates Partner Center as shown below.
+
+   :::image type="content" source="./media/commercial-marketplace-lead-management-instructions-marketo/marketo-new-service.png" alt-text="Screenshot showing Marketo API new service form":::
+
+1. Once you click the View details link for the new service created, you can copy the **Client ID** and **Client secret** for use in the Partner center connector configuration.
+
+   :::image type="content" source="./media/commercial-marketplace-lead-management-instructions-marketo/marketo-admin-installed-services.png" alt-text="Screenshot showing the Marketo admin installed services.":::
+
+   :::image type="content" source="./media/commercial-marketplace-lead-management-instructions-marketo/marketo-api-access-details.png" alt-text="Screenshot showing the Marketo API access details.":::
 
 ## Configure your offer to send leads to Marketo
 
 When you're ready to configure the lead management information for your offer in the publishing portal, follow these steps. 
 
-1. Sign in to [Partner Center](https://go.microsoft.com/fwlink/?linkid=2165290).
+1. Sign in to [Partner Center](https://partner.microsoft.com/dashboard/home) and select **Marketplace offers**.
 
 1. Select your offer, and go to the **Offer setup** tab.
 
 1. Under the **Customer leads** section, select **Connect**.
 
-    :::image type="content" source="./media/commercial-marketplace-lead-management-instructions-marketo/customer-leads.png" alt-text="Customer leads":::
+   :::image type="content" source="./media/commercial-marketplace-lead-management-instructions-marketo/customer-leads.png" alt-text="Screenshot showing the Partner Center customer leads page.":::
 
 1. On the **Connection details** pop-up window, select **Marketo** for the **Lead destination**.
 
-    ![Choose a lead destination](./media/commercial-marketplace-lead-management-instructions-marketo/choose-lead-destination.png)
-
-1. Provide the **Server ID**, **Munchkin account ID**, and **Form ID**.
+   :::image type="content" source="./media/commercial-marketplace-lead-management-instructions-marketo/choose-lead-destination.png" alt-text="Screenshot showing the Partner Center customer lead destination.":::
 
-    > [!NOTE]
-    > You must finish configuring the rest of the offer and publish it before you can receive leads for the offer. 
+1. Provide the **Munchkin ID**, **Form ID**, **Client ID** and **Client Secret** fields.
 
-1. Under **Contact email**, enter email addresses for people in your company who should receive email notifications when a new lead is received. You can provide multiple email addresses by separating them with a semicolon.
+   > [!NOTE]
+   > You must finish configuring the rest of the offer and publish it before you can receive leads for the offer. 
 
 1. Select **OK**.
 
    To make sure you've successfully connected to a lead destination, select **Validate**. If successful, you'll have a test lead in the lead destination.
 
-   ![Connection details pop-up window](./media/commercial-marketplace-lead-management-instructions-marketo/marketo-connection-details.png)
+   :::image type="content" source="./media/commercial-marketplace-lead-management-instructions-marketo/marketo-connection-details.png" alt-text="Screenshot showing the Partner Center connection details.":::

articles/marketplace/partner-center-portal/media/commercial-marketplace-lead-management-instructions-marketo/marketo-admin-installed-services.png

@@ -5,7 +5,7 @@ author: joharder
 ms.author: joharder
 ms.service: azure-redhat-openshift
 ms.topic: conceptual
-ms.date: 06/16/2021
+ms.date: 02/06/2023
 ---
 
 # Support lifecycle for Azure Red Hat OpenShift 4
@@ -16,27 +16,27 @@ Azure Red Hat OpenShift is built from specific releases of OCP. This article cov
 
 ## Red Hat OpenShift versions
 
-Red Hat OpenShift Container Platform uses semantic versioning. Semantic versioning uses different levels of version numbers to specify different levels of versioning. The following table illustrates the different parts of a semantic version number, in this case using the example version number 4.4.11.
+Red Hat OpenShift Container Platform uses semantic versioning. Semantic versioning uses different levels of version numbers to specify different levels of versioning. The following table illustrates the different parts of a semantic version number, in this case using the example version number 4.10.3.
 
 |Major version (x)|Minor version (y)|Patch (z)|
 |-|-|-|
-|4|4|11|
+|4|10|3|
 
 Each number in the version indicates general compatibility with the previous version:
 
 * **Major version**: No major version releases are planned at this time. Major versions change when incompatible API changes or backwards compatibility may be broken.
 * **Minor version**: Released approximately every three months. Minor version upgrades can include feature additions, enhancements, deprecations, removals, bug fixes, security enhancements, and other improvements.
 * **Patches**: Typically released each week, or as needed. Patch version upgrades can include bug fixes, security enhancements, and other improvements.
 
-Customers should aim to run the latest minor release of the major version they're running. For example, if your production cluster is on 4.4, and 4.5 is the latest generally available minor version for the 4 series, you should upgrade to 4.5 as soon as you can. 
+Customers should aim to run the latest minor release of the major version they're running. For example, if your production cluster is on 4.9, and 4.10 is the latest generally available minor version for the 4 series, you should upgrade to 4.10 as soon as you can. 
 
 ### Upgrade channels
 
-Upgrade channels are tied to a minor version of Red Hat OpenShift Container Platform (OCP). For instance, OCP 4.4 upgrade channels will never include an upgrade to a 4.5 release. Upgrade channels control only release selection and don't impact the version of the cluster.
+Upgrade channels are tied to a minor version of Red Hat OpenShift Container Platform (OCP). For instance, OCP 4.9 upgrade channels will never include an upgrade to a 4.10 release. Upgrade channels control only release selection and don't impact the version of the cluster.
 
-Azure Red Hat OpenShift 4 supports stable channels only. For example: stable-4.4.
+Azure Red Hat OpenShift 4 supports stable channels only. For example: stable-4.9.
 
-You can use the stable-4.5 channel to upgrade from a previous minor version of Azure Red Hat OpenShift. Clusters upgraded using fast, prerelease, and candidate channels won't be supported.
+You can use the stable-4.10 channel to upgrade from a previous minor version of Azure Red Hat OpenShift. Clusters upgraded using fast, prerelease, and candidate channels won't be supported.
 
 If you change to a channel that doesn't include your current release, an alert displays and no updates can be recommended. However, you can safely change back to your original channel at any point.
 
@@ -50,15 +50,15 @@ If available in a stable upgrade channel, newer minor releases (N+1, N+2) availa
 
 Critical patch updates are applied to clusters automatically by Azure Red Hat OpenShift Site Reliability Engineers (SRE). Customers that wish to install patch updates in advance are free to do so.
 
-For example, if Azure Red Hat OpenShift introduces 4.5.z today, support is provided for the following versions:
+For example, if Azure Red Hat OpenShift introduces 4.10.z today, support is provided for the following versions:
 
 |New minor version|Supported version list|
 |-|-|
-|4.5.z|4.5.z, 4.4.z|
+|4.10.z|4.10.z, 4.9.z|
 
-".z" is representative of patch versions. If available in a stable upgrade channel, customers may also upgrade to 4.6.z.
+".z" is representative of patch versions. If available in a stable upgrade channel, customers may also upgrade to 4.9.z.
 
-When a new minor version is introduced, the oldest minor version is deprecated and removed. For example, say the current supported version list is 4.5.z and 4.4.z. When Azure Red Hat OpenShift releases 4.6.z, the 4.4.z release will be removed and will be out of support within 30 days.
+When a new minor version is introduced, the oldest minor version is deprecated and removed. For example, say the current supported version list is 4.10.z and 4.9.z. When Azure Red Hat OpenShift releases 4.11.z, the 4.9.z release will be removed and will be out of support within 30 days.
 
 > [!NOTE]
 > Please note that if customers are running an unsupported Red Hat OpenShift version, they may be asked to upgrade when requesting support for the cluster. Clusters running unsupported Red Hat OpenShift releases are not covered by the Azure Red Hat OpenShift SLA.
@@ -84,7 +84,7 @@ Specific patch releases may be skipped, or rollout may be accelerated depending
 
 ## Azure portal and CLI versions
 
-When you deploy an Azure Red Hat OpenShift cluster in the portal or with the Azure CLI, the cluster is defaulted to the latest (N) minor version and latest critical patch. For example, if Azure Red Hat OpenShift supports 4.5.z and 4.4.z, the default version for new installations is 4.5.z. Customers that wish to use the latest upstream OCP minor version (N+1, N+2) can upgrade their cluster at any time to any release available in the stable upgrade channels.
+When you deploy an Azure Red Hat OpenShift cluster in the portal or with the Azure CLI, the cluster is defaulted to the latest (N) minor version and latest critical patch. For example, if Azure Red Hat OpenShift supports 4.10.z and 4.9.z, the default version for new installations is 4.10.z. Customers that wish to use the latest upstream OCP minor version (N+1, N+2) can upgrade their cluster at any time to any release available in the stable upgrade channels.
 
 ## Azure Red Hat OpenShift release calendar
 
@@ -106,8 +106,8 @@ See the following guide for the [past Red Hat OpenShift Container Platform (upst
 
 If you're on the N-2 version or older, it means you are outside of support and will be asked to upgrade to continue receiving support. When your upgrade from version N-2 to N-1 succeeds, you're back within support. Upgrading from version N-3 version or older to a supported version can be challenging, and in some cases not possible. We recommend you keep your cluster on the latest OpenShift version to avoid potential upgrade issues. 
 For example:
-* If the oldest supported Azure Red Hat OpenShift version is 4.4.z and you are on 4.3.z or older, you are outside of support.
-* When the upgrade from 4.3.z to 4.4.z or higher succeeds, you're back within our support policies. 
+* If the oldest supported Azure Red Hat OpenShift version is 4.9.z and you are on 4.8.z or older, you are outside of support.
+* When the upgrade from 4.8.z to 4.9.z or higher succeeds, you're back within our support policies. 
 
 Reverting your cluster to a previous version, or a rollback, isn't supported. Only upgrading to a newer version is supported.