Merge branch 'master' of https://github.com/MicrosoftDocs/azure-docs-pr into may20updates

Author: KumudD

articles/batch/batch-docker-container-workloads.md

@@ -2,11 +2,9 @@
 title: Container workloads
 description: Learn how to run and scale apps from container images on Azure Batch. Create a pool of compute nodes that support running container tasks.
 ms.topic: article
-ms.date: 03/02/2020
+ms.date: 05/20/2020
 ms.custom: seodec18
-
 ---
-
 # Run container applications on Azure Batch
 
 Azure Batch lets you run and scale large numbers of batch computing jobs on Azure. Batch tasks can run directly on virtual machines (nodes) in a Batch pool, but you can also set up a Batch pool to run tasks in Docker-compatible containers on the nodes. This article shows you how to create a pool of compute nodes that support running container tasks, and then run container tasks on the pool.
@@ -155,32 +153,40 @@ new_pool = batch.models.PoolAddParameter(
 The following C# example assumes that you want to prefetch a TensorFlow image from [Docker Hub](https://hub.docker.com). This example includes a start task that runs in the VM host on the pool nodes. You might run a start task in the host, for example, to mount a file server that can be accessed from the containers.
 
 ```csharp
-
 ImageReference imageReference = new ImageReference(
     publisher: "microsoft-azure-batch",
     offer: "ubuntu-server-container",
     sku: "16-04-lts",
     version: "latest");
 
+ContainerRegistry containerRegistry = new ContainerRegistry(
+    registryServer: "https://hub.docker.com",
+    userName: "UserName",
+    password: "YourPassword"                
+);
+
 // Specify container configuration, prefetching Docker images
-ContainerConfiguration containerConfig = new ContainerConfiguration(
-    containerImageNames: new List<string> { "tensorflow/tensorflow:latest-gpu" } );
+ContainerConfiguration containerConfig = new ContainerConfiguration();
+containerConfig.ContainerImageNames = new List<string> { "tensorflow/tensorflow:latest-gpu" };
+containerConfig.ContainerRegistries = new List<ContainerRegistry> { containerRegistry };
 
 // VM configuration
 VirtualMachineConfiguration virtualMachineConfiguration = new VirtualMachineConfiguration(
     imageReference: imageReference,
-    containerConfiguration: containerConfig,
     nodeAgentSkuId: "batch.node.ubuntu 16.04");
+virtualMachineConfiguration.ContainerConfiguration = containerConfig;
 
 // Set a native host command line start task
-StartTask startTaskNative = new StartTask( CommandLine: "<native-host-command-line>" );
+StartTask startTaskContainer = new StartTask( commandLine: "<native-host-command-line>" );
 
 // Create pool
 CloudPool pool = batchClient.PoolOperations.CreatePool(
     poolId: poolId,
-    targetDedicatedComputeNodes: 4,
     virtualMachineSize: "Standard_NC6",
-    virtualMachineConfiguration: virtualMachineConfiguration, startTaskContainer);
+    virtualMachineConfiguration: virtualMachineConfiguration);
+
+// Start the task in the pool
+pool.StartTask = startTaskContainer;
 ...
 ```
 
@@ -191,22 +197,22 @@ You can also prefetch container images by authenticating to a private container
 
 ```csharp
 // Specify a container registry
-ContainerRegistry containerRegistry = new ContainerRegistry (
-	registryServer: "myContainerRegistry.azurecr.io",
-    username: "myUserName",
+ContainerRegistry containerRegistry = new ContainerRegistry(
+    registryServer: "myContainerRegistry.azurecr.io",
+    userName: "myUserName",
     password: "myPassword");
 
 // Create container configuration, prefetching Docker images from the container registry
-ContainerConfiguration containerConfig = new ContainerConfiguration(
-    containerImageNames: new List<string> {
-        "myContainerRegistry.azurecr.io/tensorflow/tensorflow:latest-gpu" },
-    containerRegistries: new List<ContainerRegistry> { containerRegistry } );
+ContainerConfiguration containerConfig = new ContainerConfiguration();
+containerConfig.ContainerImageNames = new List<string> {
+        "myContainerRegistry.azurecr.io/tensorflow/tensorflow:latest-gpu" };
+containerConfig.ContainerRegistries = new List<ContainerRegistry> { containerRegistry } );
 
 // VM configuration
 VirtualMachineConfiguration virtualMachineConfiguration = new VirtualMachineConfiguration(
     imageReference: imageReference,
-    containerConfiguration: containerConfig,
     nodeAgentSkuId: "batch.node.ubuntu 16.04");
+virtualMachineConfiguration.ContainerConfiguration = containerConfig;
 
 // Create pool
 CloudPool pool = batchClient.PoolOperations.CreatePool(
@@ -281,7 +287,6 @@ The following C# example shows basic container settings for a cloud task:
 
 ```csharp
 // Simple container task command
-
 string cmdLine = "c:\\app\\myApp.exe";
 
 TaskContainerSettings cmdContainerSettings = new TaskContainerSettings (
@@ -291,11 +296,10 @@ TaskContainerSettings cmdContainerSettings = new TaskContainerSettings (
 
 CloudTask containerTask = new CloudTask (
     id: "Task1",
-    containerSettings: cmdContainerSettings,
-    commandLine: cmdLine);
+    commandline: cmdLine);
+containerTask.ContainerSettings = cmdContainerSettings;
 ```
 
-
 ## Next steps
 
 * Also see the [Batch Shipyard](https://github.com/Azure/batch-shipyard) toolkit for easy deployment of container workloads on Azure Batch through [Shipyard recipes](https://github.com/Azure/batch-shipyard/tree/master/recipes).

articles/cost-management-billing/manage/switch-azure-offer.md

@@ -6,7 +6,7 @@ ms.reviewer: amberb
 tags: billing,top-support-issue
 ms.service: cost-management-billing
 ms.topic: conceptual
-ms.date: 02/13/2020
+ms.date: 05/14/2020
 ms.author: banders
 ---
 
@@ -40,16 +40,16 @@ You can switch from an individual subscription with pay-as-you-go rates to:
 
 1. Sign in at [Azure Account Center](https://account.windowsazure.com/Subscriptions).
 1. Select your individual subscription with pay-as-you-go rates.
-1. Click **Switch to another offer**. The option is only available if you have a individual subscription with pay-as-you-go rates and have completed your first billing period.
+1. Click **Switch to another offer**. The option is only available if you have an individual subscription with pay-as-you-go rates and have completed your first billing period.
 
    ![Notice the Switch offer button on the right side of the page](./media/switch-azure-offer/switchbutton.png)
 1. **Select the offer you want** from the list of offers your subscription can be switched to. This list varies based on the memberships that your account is associated with. If nothing is available, check the [list of available offers you can switch to](#whats-supported) and make sure you have the right memberships.
 
    ![Select an offer that you want to switch to](./media/switch-azure-offer/selectoffer.png)
-1. Depending on the offer you’re switching to, you may see a note about the impact of switching. Go through this list carefully and follow the instructions before you proceed.
+1. Depending on the offer you’re switching to, you may see a note about the impact of switching. Go through the list carefully and follow the instructions before you continue.
 
    ![Review the notes](./media/switch-azure-offer/thingstonote.png)
-1. You can rename your subscription. By default, it is set to the new offer name. Click **Switch Offer** to complete the process.
+1. You can rename your subscription. By default, it isn't set to the new offer name. Click **Switch Offer** to complete the process.
 
    ![Click the green button](./media/switch-azure-offer/confirmpage.png)
 1. Success! Your subscription is now switched to the new offer.
@@ -91,11 +91,11 @@ When you switch offers, any [limit or quota increases above the default limit](.
 
 #### Billing
 
-On the day you switch, an invoice is generated for all outstanding charges. Then, your subscription is billed per the new offer’s pricing terms. Your subscription billing anniversary changes to the date on which you changed offers. Usage and billing data before the offer change is not retained, so we recommend that you download a copy before switching.
+On the day you switch, an invoice is generated for all outstanding charges. Then, your subscription is billed per the new offer’s pricing terms. Your subscription billing anniversary changes to the date on which you changed offers. Usage and billing data before the offer change isn't kept, so we recommend that you download a copy before switching.
 
 ### Can I migrate from a subscription with pay-as-you-go rates to Cloud Solution Provider (CSP) or Enterprise Agreement (EA)?
 
-* To migrate to CSP, see [Azure Pay-As-You-Go Subscription Migration to CSP](https://docs.microsoft.com/azure/cloud-solution-provider/migration/migration-from-payg-to-csp).
+* To migrate to CSP, see [Transfer Azure subscriptions between subscribers and CSPs](transfer-subscriptions-subscribers-csp.md).
 * To migrate to EA, have your Enrollment Admin add your account into the EA. Follow instructions in the invitation email to have your subscriptions moved under EA enrollment. To learn more, see [Associate an Existing Account](https://ea.azure.com/helpdocs/associateExistingAccount) in the EA portal.
 
 ### Can I migrate data and services to a new subscription?

articles/cost-management-billing/reservations/charge-back-usage.md

@@ -0,0 +1,42 @@
+---
+title: Charge back Azure Reservation costs
+description: Learn how to view Azure Reservation costs for chargeback.
+author: yashesvi
+ms.service: cost-management-billing
+ms.topic: conceptual
+ms.date: 05/14/2020
+ms.author: banders
+---
+
+# Charge back Azure Reservation costs
+
+Enterprise Agreement and Microsoft Customer Agreement billing readers can view amortized cost data for reservations. They can use the cost data to charge back the monetary value for a subscription, resource group, resource, or a tag to their partners. In amortized data, the effective price is the prorated hourly reservation cost. The cost is the total cost of reservation usage by the resource on that day.
+
+Users with an individual subscription can get the amortized cost data from their usage file. When a resource gets a reservation discount, the *AdditionalInfo* section in the usage file contains the reservation details. For more information, see [Download usage from the Azure portal](https://docs.microsoft.com/azure/cost-management-billing/understand/download-azure-daily-usage#download-usage-from-the-azure-portal-csv).
+
+## Get reservation charge back data for chargeback
+
+1. Sign in to the [Azure portal](https://portal.azure.com).
+1. Navigate to **Cost Management + Billing**.
+1. Under **Actual Cost**, select the **Amortized Cost** metric.
+1. To see which resources were used by a reservation, apply a filter for **Reservation** and then select reservations.
+1. Set the **Granularity** to **Monthly** or **Daily**.
+1. Set the chart type to **Table**.
+1. Set the **Group by** option to **Resource**.
+
+[![Example showing reservation resource costs that you can use for chargeback](./media/charge-back-usage/amortized-reservation-costs.png)](./media/charge-back-usage/amortized-reservation-costs.png#lightbox)
+
+Here's a video showing how to view reservation utilization costs in the Azure portal.
+
+ > [!VIDEO https://www.microsoft.com/videoplayer/embed/RE4sQOw] 
+
+## Need help? Contact us.
+
+If you have questions or need help, [create a support request](https://portal.azure.com/#blade/Microsoft_Azure_Support/HelpAndSupportBlade/newsupportrequest).
+
+## Next steps
+
+- To learn how to manage a reservation, see [Manage Azure Reservations](manage-reserved-vm-instance.md).
+- To learn more about Azure Reservations, see the following articles:
+  - [What are Azure Reservations?](save-compute-costs-reservations.md)
+  - [Manage Reservations in Azure](manage-reserved-vm-instance.md)

articles/cost-management-billing/reservations/media/charge-back-usage/amortized-reservation-costs.png

@@ -6,7 +6,6 @@
   - name: What are Azure Reservations?
     href: save-compute-costs-reservations.md
 - name: How-to guides
-  expanded: true
   items:
   - name: Determine what to purchase
     items:
@@ -56,12 +55,17 @@
       href: manage-reserved-vm-instance.md#change-optimize-setting-for-reserved-vm-instances
     - name: Exchange and refund reservations
       href: exchange-and-refund-azure-reservations.md
+  - name: Report costs
+    items:
+    - name: View reservation transactions
+      href: view-purchase-refunds.md
+    - name: Charge back reservation costs
+      href: charge-back-usage.md
   - name: Renew reservations
     items:
     - name: Renew a reservation
       href: reservation-renew.md
 - name: Concepts
-  expanded: true
   items:
   - name: How reservation recommendations are created
     href: reserved-instance-purchase-recommendations.md
@@ -119,4 +123,3 @@
     href: /rest/api/consumption/usagedetails
   - name: Cost Management - Consumption Reservations Details REST API
     href: /rest/api/consumption/reservationsdetails
-    

articles/cost-management-billing/reservations/media/view-purchase-refunds/azure-portal-reservation-transactions.png

@@ -0,0 +1,51 @@
+---
+title: View Azure Reservation purchase and refund transactions 
+description: Learn how view Azure Reservation purchase and refund transactions.
+author: yashesvi
+ms.service: cost-management-billing
+ms.topic: conceptual
+ms.date: 05/14/2020
+ms.author: banders
+---
+
+# View reservation purchase and refund transactions
+
+There are a few different ways to view reservation purchase and refund transactions. You can use the Azure portal, Power BI, and REST APIs.
+
+## View reservation transactions in the Azure portal
+
+An Enterprise enrollment or Microsoft Customer Agreement billing administrator can view reservation transactions in Cost Management and Billing.
+
+1. Sign in to the [Azure portal](https://portal.azure.com).
+1. Search for **Cost Management + Billing**.
+1. Select **Reservation transactions**.
+1. To filter the results, select **Timespan**, **Type**, or **Description**.
+1. Select **Apply**.
+
+[![Screenshot showing reservation transactions in the Azure portal](./media/view-purchase-refunds/azure-portal-reservation-transactions.png)](./media/view-purchase-refunds/azure-portal-reservation-transactions.png#lightbox)
+
+## View reservation transactions in Power BI
+
+An Enterprise enrollment or Microsoft Customer Agreement billing administrator can view reservation transactions with the Cost Management Power BI app.
+
+1. Get the [Cost Management Power BI App](https://appsource.microsoft.com/product/power-bi/costmanagement.azurecostmanagementapp).
+1. Navigate to the RI Purchases report.
+
+[![Example showing reservation transactions](./media/view-purchase-refunds/power-bi-reservation-transactions.png)](./media/view-purchase-refunds/power-bi-reservation-transactions.png#lightbox)
+
+To learn more, see [Azure Cost Management Power BI App for Enterprise Agreements](https://docs.microsoft.com/azure/cost-management-billing/costs/analyze-cost-data-azure-cost-management-power-bi-template-app).
+
+## Use APIs to get reservation transactions
+
+Enterprise Agreement (EA) and Microsoft Customer Agreement users can get reservation transactions data using [Reservation Transactions - List API](https://docs.microsoft.com/rest/api/consumption/reservationtransactions/list).
+
+## Need help? Contact us.
+
+If you have questions or need help, [create a support request](https://portal.azure.com/#blade/Microsoft_Azure_Support/HelpAndSupportBlade/newsupportrequest).
+
+## Next steps
+
+- To learn how to manage a reservation, see [Manage Azure Reservations](manage-reserved-vm-instance.md).
+- To learn more about Azure Reservations, see the following articles:
+  - [What are Azure Reservations?](save-compute-costs-reservations.md)
+  - [Manage Reservations in Azure](manage-reserved-vm-instance.md)