Merge pull request #213548 from MicrosoftDocs/main

Publish to live, Tuesday 4 AM PST, 10/4

Author: ttorble

.openpublishing.publish.config.json

@@ -128,54 +128,6 @@
       "branch": "master",
       "branch_mapping": {}
     },
-    {
-      "path_to_root": "samples-mediaservices-integration",
-      "url": "https://github.com/Azure-Samples/media-services-dotnet-functions-integration",
-      "branch": "main",
-      "branch_mapping": {}
-    },
-    {
-      "path_to_root": "samples-mediaservices-encryptiondrm",
-      "url": "https://github.com/Azure-Samples/media-services-dotnet-dynamic-encryption-with-drm",
-      "branch": "master",
-      "branch_mapping": {}
-    },
-    {
-      "path_to_root": "samples-mediaservices-encryptionfairplay",
-      "url": "https://github.com/Azure-Samples/media-services-dotnet-dynamic-encryption-with-fairplay",
-      "branch": "master",
-      "branch_mapping": {}
-    },
-    {
-      "path_to_root": "samples-mediaservices-encryptionaes",
-      "url": "https://github.com/Azure-Samples/media-services-dotnet-dynamic-encryption-with-aes",
-      "branch": "master",
-      "branch_mapping": {}
-    },
-    {
-      "path_to_root": "samples-mediaservices-copyblob",
-      "url": "https://github.com/Azure-Samples/media-services-dotnet-copy-blob-into-asset",
-      "branch": "master",
-      "branch_mapping": {}
-    },
-    {
-      "path_to_root": "samples-mediaservices-deliverplayready",
-      "url": "https://github.com/Azure-Samples/media-services-dotnet-deliver-playready-widevine-licenses",
-      "branch": "master",
-      "branch_mapping": {}
-    },
-    {
-      "path_to_root": "samples-mediaservices-livestream",
-      "url": "https://github.com/Azure-Samples/media-services-dotnet-encode-live-stream-with-ams-clear",
-      "branch": "master",
-      "branch_mapping": {}
-    },
-    {
-      "path_to_root": "samples-mediaservices-encoderstandard",
-      "url": "https://github.com/Azure-Samples/media-services-dotnet-on-demand-encoding-with-media-encoder-standard",
-      "branch": "master",
-      "branch_mapping": {}
-    },
     {
       "path_to_root": "azure-app-service-multi-container",
       "url": "https://github.com/Azure-Samples/multicontainerwordpress",
@@ -374,30 +326,6 @@
       "branch": "master",
       "branch_mapping": {}
     },
-    {
-      "path_to_root": "media-services-v3-dotnet-tutorials",
-      "url": "https://github.com/Azure-Samples/media-services-v3-dotnet-tutorials",
-      "branch": "main",
-      "branch_mapping": {}
-    },
-    {
-      "path_to_root": "media-services-v3-dotnet",
-      "url": "https://github.com/Azure-Samples/media-services-v3-dotnet",
-      "branch": "main",
-      "branch_mapping": {}
-    },
-    {
-      "path_to_root": "media-services-v3-dotnet-core-functions-integration",
-      "url": "https://github.com/Azure-Samples/media-services-v3-dotnet-core-functions-integration",
-      "branch": "main",
-      "branch_mapping": {}
-    },
-    {
-      "path_to_root": "media-services-v3-python",
-      "url": "https://github.com/Azure-Samples/media-services-v3-python",
-      "branch": "main",
-      "branch_mapping": {}
-    },
     {
       "path_to_root": "samples-javascript",
       "url": "https://github.com/Microsoft/tsiclient",
@@ -410,24 +338,6 @@
       "branch": "master",
       "branch_mapping": {}
     },
-    {
-      "path_to_root": "media-services-v3-dotnet-core-tutorials",
-      "url": "https://github.com/Azure-Samples/media-services-v3-dotnet-core-tutorials",
-      "branch": "master",
-      "branch_mapping": {}
-    },
-    {
-      "path_to_root": "media-services-v3-rest-postman",
-      "url": "https://github.com/Azure-Samples/media-services-v3-rest-postman",
-      "branch": "master",
-      "branch_mapping": {}
-    },
-    {
-      "path_to_root": "media-services-v3-node-tutorials",
-      "url": "https://github.com/Azure-Samples/media-services-v3-node-tutorials",
-      "branch": "main",
-      "branch_mapping": {}
-    },
     {
       "path_to_root": "media-services-video-indexer",
       "url": "https://github.com/Azure-Samples/media-services-video-indexer",
@@ -1038,6 +948,8 @@
     ".openpublishing.redirection.virtual-desktop.json",
     "articles/applied-ai-services/.openpublishing.redirection.applied-ai-services.json",
     "articles/applied-ai-services/.openpublishing.archived.json",
-    "articles/cognitive-services/.openpublishing.redirection.cognitive-services.json"
+    "articles/cognitive-services/.openpublishing.redirection.cognitive-services.json",
+    ".openpublishing.redirection.baremetal-infrastructure.json"
+
   ]
 }

.openpublishing.redirection.baremetal-infrastructure.json

@@ -0,0 +1,55 @@
+{
+    "redirections": [
+                                                                                                                                                    
+        {
+            "source_path": "articles/baremetal-infrastructure/workloads/nc2-public-preview/about-the-public-preview.md",
+            "redirect_url": "/azure/baremetal-infrastructure/workloads/nc2-on-azure/about-nc2-on-azure",
+            "redirect_document_id": false
+        }, {
+            "source_path": "articles/baremetal-infrastructure/workloads/nc2-public-preview/architecture.md",
+            "redirect_url": "/azure/baremetal-infrastructure/workloads/nc2-on-azure/architecture",
+            "redirect_document_id": false
+        }, 
+        {
+            "source_path": "articles/baremetal-infrastructure/workloads/nc2-public-preview/faq.md",
+            "redirect_url": "/azure/baremetal-infrastructure/workloads/nc2-on-azure/faq",
+            "redirect_document_id": false
+        },                  
+        {
+            "source_path": "articles/baremetal-infrastructure/workloads/nc2-public-preview/get-started.md",
+            "redirect_url": "/azure/baremetal-infrastructure/workloads/nc2-on-azure/get-started",
+            "redirect_document_id": false
+        },  
+        {
+            "source_path": "articles/baremetal-infrastructure/workloads/nc2-public-preview/nc2-baremetal-overview.md",
+            "redirect_url": "/azure/baremetal-infrastructure/workloads/nc2-on-azure/nc2-baremetal-overview",
+            "redirect_document_id": false
+        },  
+        {
+            "source_path": "articles/baremetal-infrastructure/workloads/nc2-public-preview/requirements.md",
+            "redirect_url": "/azure/baremetal-infrastructure/workloads/nc2-on-azure/requirements",
+            "redirect_document_id": false
+        },                  
+        {
+            "source_path": "articles/baremetal-infrastructure/workloads/nc2-public-preview/skus.md",
+            "redirect_url": "/azure/baremetal-infrastructure/workloads/nc2-on-azure/skus",
+            "redirect_document_id": false
+        },                  
+        {
+            "source_path": "articles/baremetal-infrastructure/workloads/nc2-public-preview/solution-design.md",
+            "redirect_url": "/azure/baremetal-infrastructure/workloads/nc2-on-azure/solution-design",
+            "redirect_document_id": false
+        },                  
+        {
+            "source_path": "articles/baremetal-infrastructure/workloads/nc2-public-preview/supported-instances-and-regions.md",
+            "redirect_url": "/azure/baremetal-infrastructure/workloads/nc2-on-azure/supported-instances-and-regions",
+            "redirect_document_id": false
+        }, 
+        {
+            "source_path": "articles/baremetal-infrastructure/workloads/nc2-public-preview/use-cases-and-supported-scenarios.md",
+            "redirect_url": "/azure/baremetal-infrastructure/workloads/nc2-on-azure/use-cases-and-supported-scenarios",
+            "redirect_document_id": false
+        }                                  
+    ]
+}
+

articles/active-directory/develop/app-resilience-continuous-access-evaluation.md

@@ -137,8 +137,8 @@ Your app would then use the claims challenge to acquire a new access token for t
 ```javascript
 const tokenRequest = {
     claims: window.atob(claimsChallenge), // decode the base64 string
-    scopes: ['User.Read']
-    account: msalInstance.getActiveAccount();
+    scopes: ['User.Read'],
+    account: msalInstance.getActiveAccount()
 };
 
 let tokenResponse;
@@ -173,8 +173,9 @@ You can test your application by signing in a user and then using the Azure port
 
 ## Code samples
 
-- [React single-page application using MSAL React to sign-in users against Azure Active Directory](https://github.com/Azure-Samples/ms-identity-javascript-react-tutorial/tree/main/2-Authorization-I/1-call-graph)
-- [Enable your ASP.NET Core web app to sign in users and call Microsoft Graph with the Microsoft identity platform](https://github.com/Azure-Samples/active-directory-aspnetcore-webapp-openidconnect-v2/tree/master/2-WebApp-graph-user/2-1-Call-MSGraph)
+- [Enable your Angular single-page application to sign in users and call Microsoft Graph](https://github.com/Azure-Samples/ms-identity-javascript-angular-tutorial/tree/main/2-Authorization-I/1-call-graph)
+- [Enable your React single-page application to sign in users and call Microsoft Graph](https://github.com/Azure-Samples/ms-identity-javascript-react-tutorial/tree/main/2-Authorization-I/1-call-graph)
+- [Enable your ASP.NET Core web app to sign in users and call Microsoft Graph](https://github.com/Azure-Samples/active-directory-aspnetcore-webapp-openidconnect-v2/tree/master/2-WebApp-graph-user/2-1-Call-MSGraph)
 
 ## Next steps
 

articles/active-directory/develop/claims-challenge.md

@@ -237,10 +237,14 @@ const checkIsClientCapableOfClaimsChallenge = (req, res, next) => {
 
 ---
 
+## Code samples
+
+- [Enable your Angular single-page application to sign in users and call Microsoft Graph](https://github.com/Azure-Samples/ms-identity-javascript-angular-tutorial/tree/main/2-Authorization-I/1-call-graph)
+- [Enable your React single-page application to sign in users and call Microsoft Graph](https://github.com/Azure-Samples/ms-identity-javascript-react-tutorial/tree/main/2-Authorization-I/1-call-graph)
+- [Enable your ASP.NET Core web app to sign in users and call Microsoft Graph](https://github.com/Azure-Samples/active-directory-aspnetcore-webapp-openidconnect-v2/tree/master/2-WebApp-graph-user/2-1-Call-MSGraph)
+
 ## Next steps
 
 - [Microsoft identity platform and OAuth 2.0 authorization code flow](v2-oauth2-auth-code-flow.md#request-an-authorization-code)
 - [How to use Continuous Access Evaluation enabled APIs in your applications](app-resilience-continuous-access-evaluation.md)
 - [Granular Conditional Access for sensitive data and actions](https://techcommunity.microsoft.com/t5/azure-active-directory-identity/granular-conditional-access-for-sensitive-data-and-actions/ba-p/1751775)
-- [React single-page application using MSAL React to sign-in users against Azure Active Directory](https://github.com/Azure-Samples/ms-identity-javascript-react-tutorial/tree/main/2-Authorization-I/1-call-graph)
-- [Enable your ASP.NET Core web app to sign in users and call Microsoft Graph with the Microsoft identity platform](https://github.com/Azure-Samples/active-directory-aspnetcore-webapp-openidconnect-v2/tree/master/2-WebApp-graph-user/2-1-Call-MSGraph)

articles/active-directory/governance/lifecycle-workflow-tasks.md

@@ -263,7 +263,7 @@ For Microsoft Graph the parameters for the **Run a Custom Task Extension** task
 |---------|---------|
 |category    |  joiner,leaver      |
 |displayName     | Run a Custom Task Extension (Customizable by user)        |
-|description     |  Run a custom Task Extension (Customizable by user)      |
+|description     |  Run a Custom Task Extension to call-out to an external system. (Customizable by user)      |
 |taskDefinitionId     |   "d79d1fcc-16be-490c-a865-f4533b1639ee      |
 |argument     |  Argument contains a name parameter that is the "LogicAppURL", and a value parameter which is the Logic App HTTP trigger.     |
 

articles/aks/TOC.yml

@@ -492,6 +492,8 @@
         - name: Use GitOps
           href: ../azure-arc/kubernetes/tutorial-use-gitops-flux2.md
           maintainContext: true
+        - name: Deploy Kubernetes applications from Azure Marketplace
+          href: deploy-marketplace.md
     - name: Deploy the Open Service Mesh AKS add-on
       items:
         - name: About Open Service Mesh

articles/aks/deploy-marketplace.md

@@ -0,0 +1,109 @@
+---
+title: How to deploy Azure Container offers for Azure Kubernetes Service (AKS) from the Azure Marketplace 
+description: Learn how to deploy Azure Container offers from the Azure Marketplace on an Azure Kubernetes Service (AKS) cluster.
+author: nickomang
+ms.author: nickoman
+ms.service: container-service
+ms.topic: how-to
+ms.date: 09/30/2022
+ms.custom: devx-track-azurecli, ignite-fall-2022, references_regions
+---
+
+# How to deploy a Container offer from Azure Marketplace (preview)
+
+[Azure Marketplace][azure-marketplace] is an online store that contains thousands of IT software applications and services built by industry-leading technology companies. In Azure Marketplace you can find, try, buy, and deploy the software and services you need to build new solutions and manage your cloud infrastructure. The catalog includes solutions for different industries and technical areas, free trials, and also consulting services from Microsoft partners.
+
+Included among these solutions are Kubernetes application-based Container offers, which contain applications meant to run on Kubernetes clusters such as Azure Kubernetes Service (AKS). In this article, you will learn how to:
+
+- Browse offers in Azure Marketplace
+- Purchase an application
+- Deploy the application on your AKS cluster
+- Monitor usage and billing information
+
+[!INCLUDE [preview features callout](./includes/preview/preview-callout.md)]
+
+> [!NOTE]
+> This feature is currently only supported in the following regions:
+>
+> - West Central US
+> - West Europe
+> - East US.
+
+## Register resource providers
+
+You must have registered the `Microsoft.KubernetesConfiguration` and `Microsoft.ContainerService` providers on your subscription using the `az provider register` command:
+
+```azurecli-interactive
+az provider register --namespace Microsoft.KubernetesConfiguration --wait
+az provider register --namespace Microsoft.ContainerService --wait
+```
+
+## Browse offers
+
+- Begin by visiting the Azure portal and searching for *"Marketplace"* in the top search bar.
+
+- You can search for an offer or publisher directly by name or browse all offers. To find Kubernetes application offers, use the *Product type* filter for *Azure Containers*. 
+
+- > [!IMPORTANT]
+  > The *Azure Containers* category includes both Kubernetes applications and standalone container images. This walkthrough is Kubernetes application-specific. If you find the steps to deploy an offer differ in some way, you are most likely trying to deploy a container image-based offer instead of a Kubernetes-application based offer.
+
+- Once you've decided on an application, click on the offer.
+
+    :::image type="content" source="./media/deploy-marketplace/browse-marketplace-inline.png" alt-text="Screenshot of the Azure portal Marketplace offer page. The product type filter, set to Azure Containers, is highlighted and several offers are shown." lightbox="./media/deploy-marketplace/browse-marketplace-full.png":::
+
+## Purchasing a Kubernetes offer
+
+- Review the plan and prices tab, select an option, and ensure the terms are acceptable before proceeding.
+
+    :::image type="content" source="./media/deploy-marketplace/plans-pricing-inline.png" alt-text="Screenshot of the Azure portal offer purchasing page. The tab for viewing plans and pricing information is shown." lightbox="./media/deploy-marketplace/plans-pricing-full.png":::
+
+- Click *"Create"*.
+
+## Deploy a Kubernetes offer
+
+- Follow the form, filling in information for your resource group, cluster, and any configuration options required by the application. You can decide to deploy on a new AKS cluster or use an existing cluster.
+
+    :::image type="content" source="./media/deploy-marketplace/purchase-experience-inline.png" alt-text="Screenshot of the Azure portal form for deploying a new offer. A selector for creating a new or using an existing cluster is shown." lightbox="./media/deploy-marketplace/purchase-experience-full.png":::
+
+- After some time, the application will be deployed, as indicated by the Portal screen.
+
+    :::image type="content" source="./media/deploy-marketplace/deployment-inline.png" alt-text="Screenshot of the Azure portal screen showing a successful resource deployment, indicating the offer has been deployed to the cluster." lightbox="./media/deploy-marketplace/deployment-full.png":::
+
+- You can also verify by listing the extensions running on your cluster:
+
+    ```azurecli-interactive
+    az k8s-extension list --cluster-name <clusterName> --resource-group <resourceGroupName> --cluster-type managedClusters
+    ```
+
+## Manage offer lifecycle
+
+For lifecycle management, an Azure Kubernetes offer is represented as a cluster extension for Azure Kubernetes service(AKS). For more details, see [cluster extensions for AKS][cluster-extensions].
+
+Purchasing an offer from the Azure Marketplace creates a new instance of the extension on your AKS cluster. The extension instance can be viewed from the cluster using the following command:
+
+```azurecli-interactive
+az k8s-extension show --name <extension-name> --cluster-name <clusterName> --resource-group <resourceGroupName> --cluster-type managedClusters
+```
+
+### Removing an offer
+
+A purchased Azure Container offer plan can be deleted by deleting the extension instance on the cluster. For example:
+
+```azurecli-interactive
+az k8s-extension delete --name <extension-name> --cluster-name <clusterName> --resource-group <resourceGroupName> --cluster-type managedClusters
+```
+
+## Monitor billing and usage information
+
+To monitor billing and usage information for the offer you've deployed, visit Cost Management > Cost Analysis in your cluster's resource group's page in the Azure portal. You can see a breakdown of cost for the plan you've selected under "Product".
+
+:::image type="content" source="./media/deploy-marketplace/billing-inline.png" alt-text="Screenshot of the Azure portal page for the resource group. Billing information is shown broken down by offer plan." lightbox="./media/deploy-marketplace/billing-full.png":::
+
+## Next Steps
+
+- Learn more about [exploring and analyzing costs][billing].
+
+<!-- LINKS -->
+[azure-marketplace]: /marketplace/azure-marketplace-overview
+[cluster-extensions]: ./cluster-extensions.md
+[billing]: ../cost-management-billing/costs/quick-acm-cost-analysis.md