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

Owen Duncan · Owen Duncan · commit c90ff8e986bf · 2020-04-14T10:43:40.000-07:00
diff --git a/articles/active-directory/users-groups-roles/directory-assign-admin-roles.md b/articles/active-directory/users-groups-roles/directory-assign-admin-roles.md
@@ -9,7 +9,7 @@ ms.service: active-directory
 ms.workload: identity
 ms.subservice: users-groups-roles
 ms.topic: reference
-ms.date: 04/07/2020
+ms.date: 04/14/2020
 ms.author: curtand
 ms.reviewer: vincesm
 ms.custom: it-pro, fasttrack-edit
@@ -223,12 +223,11 @@ Users with this role have access to all administrative features in Azure Active
 
 ### [Global Reader](#global-reader-permissions)
 
-Users in this role can read settings and administrative information across Microsoft 365 services but can't take management actions. Global reader is the read-only counterpart to Global administrator. Assign Global reader instead of Global administrator for planning, audits, or investigations. Use Global reader in combination with other limited admin roles like Exchange Administrator to make it easier to get work done without the assigning the Global Administrator role. Global reader works with Microsoft 365 admin center, Exchange admin center, Teams admin center, Security center, Compliance center, Azure AD admin center, and Device Management admin center.
+Users in this role can read settings and administrative information across Microsoft 365 services but can't take management actions. Global reader is the read-only counterpart to Global administrator. Assign Global reader instead of Global administrator for planning, audits, or investigations. Use Global reader in combination with other limited admin roles like Exchange Administrator to make it easier to get work done without the assigning the Global Administrator role. Global reader works with Microsoft 365 admin center, Exchange admin center, SharePoint admin center, Teams admin center, Security center, Compliance center, Azure AD admin center, and Device Management admin center.
 
 > [!NOTE]
 > Global reader role has a few limitations right now -
 >
->- SharePoint admin center - SharePoint admin center does not support the Global reader role. You won't see 'SharePoint' in left pane under Admin Centers in [Microsoft 365 admin center](https://admin.microsoft.com/Adminportal/Home#/homepage).
 >- [OneDrive admin center](https://admin.onedrive.com/) - OneDrive admin center does not support the Global reader role.
 >- [Azure AD portal](https://portal.azure.com/#blade/Microsoft_AAD_IAM/StartboardApplicationsMenuBlade/AllApps/menuId/) - Global reader can't read the provisioning mode of an enterprise app.
 >- [M365 admin center](https://admin.microsoft.com/Adminportal/Home#/homepage) - Global reader can't read customer lockbox requests. You won't find the **Customer lockbox requests** tab under **Support** in the left pane of M365 Admin Center.
diff --git a/articles/azure-functions/functions-create-function-linux-custom-image.md b/articles/azure-functions/functions-create-function-linux-custom-image.md
@@ -9,7 +9,7 @@ zone_pivot_groups: programming-languages-set-functions
 
 # Create a function on Linux using a custom container
 
-In this tutorial, you create and deploy Python code to Azure Functions as a custom Docker container using a Linux base image. You typically use a custom image when your functions require a specific language version or have a specific dependency or configuration that isn't provided by the built-in image.
+In this tutorial, you create and deploy your code to Azure Functions as a custom Docker container using a Linux base image. You typically use a custom image when your functions require a specific language version or have a specific dependency or configuration that isn't provided by the built-in image.
 
 You can also use a default Azure App Service container as described on [Create your first function hosted on Linux](functions-create-first-azure-function-azure-cli-linux.md). Supported base images for Azure Functions are found in the [Azure Functions base images repo](https://hub.docker.com/_/microsoft-azure-functions-base).
 
diff --git a/articles/cognitive-services/Speech-Service/speech-container-faq.md b/articles/cognitive-services/Speech-Service/speech-container-faq.md
@@ -377,7 +377,7 @@ The doc says to expose a different port, which I do, but the LUIS container is s
 <b>How can I get non-batch APIs to handle audio &lt;15 seconds long?</b>
 </summary>
 
-**Answer:** This is in interactive mode. If you use dictation or conversation that is not a problem.
+**Answer:** This is in interactive mode with RecognizeOnce().  The 15 second limitiation is there because this mode is intended for Speech Commanding where the utterances are supposed to be short) . If you use dictation or conversation with StartContinuousRecognition() that is not a problem and there is no 15 second limitiation.
 
 
 <br>
diff --git a/articles/cost-management-billing/manage/enterprise-api.md b/articles/cost-management-billing/manage/enterprise-api.md
@@ -5,7 +5,7 @@ author: mumami
 tags: billing
 ms.service: cost-management-billing
 ms.topic: reference
-ms.date: 02/14/2020
+ms.date: 04/14/2020
 ms.author: banders
 
 ---
@@ -36,7 +36,7 @@ A Swagger endpoint is available [here](https://consumption.azure.com/swagger/ui/
 * **Reserved Instance Details** - The [Reserved Instance usage API](/rest/api/billing/enterprise/billing-enterprise-api-reserved-instance-usage) returns the usage of the Reserved Instance purchases. The [Reserved Instance charges API](/rest/api/billing/enterprise/billing-enterprise-api-reserved-instance-usage) shows the billing transactions made.
 
 ## Data Freshness
-Etags will be returned in the response of all the above API. A change in Etag indicates the data has been refreshed.  In subsequent calls to the same API using the same parameters, pass the captured Etag with the key “If-None-Match” in the header of http request. The response status code would be "NotModified" if the data has not been refreshed any further and no data will be returned. API will return the full dataset for the required period whenever there is an etag change.
+Etags will be returned in the response of all the above API. A change in Etag indicates the data has been refreshed.  In subsequent calls to the same API using the same parameters, pass the captured Etag with the key "If-None-Match" in the header of http request. The response status code would be "NotModified" if the data has not been refreshed any further and no data will be returned. API will return the full dataset for the required period whenever there is an etag change.
 
 ## Helper APIs
  **List Billing Periods** - The [Billing Periods API](/rest/api/billing/enterprise/billing-enterprise-api-billing-periods) returns a list of billing periods that have consumption data for the specified Enrollment in reverse chronological order. Each Period contains a property pointing to the API route for the four sets of data - BalanceSummary, UsageDetails, Marketplace Charges, and Price Sheet.
@@ -46,7 +46,9 @@ Etags will be returned in the response of all the above API. A change in Etag in
 |Response Status Code|Message|Description|
 |-|-|-|
 |200| OK|No error|
+|400| Bad Request| Invalid params – Date ranges, EA numbers etc.|
 |401| Unauthorized| API Key not found, Invalid, Expired etc.|
 |404| Unavailable| Report endpoint not found|
-|400| Bad Request| Invalid params – Date ranges, EA numbers etc.|
+|429 | TooManyRequests | The request was throttled. Retry after waiting for the time specified in the <code>x-ms-ratelimit-microsoft.consumption-retry-after</code> header.|
 |500| Server Error| Unexpected error processing request|
+| 503 | ServiceUnavailable | The service is temporarily unavailable. Retry after waiting for the time specified in the <code>Retry-After</code> header.|
diff --git a/articles/machine-learning/how-to-set-up-training-targets.md b/articles/machine-learning/how-to-set-up-training-targets.md
@@ -146,32 +146,19 @@ Use the Azure Data Science Virtual Machine (DSVM)  as the Azure VM of choice for
     > [!WARNING]
     > Azure Machine Learning only supports virtual machines that run Ubuntu. When you create a VM or choose an existing VM, you must select a VM that uses Ubuntu.
 
-1. **Attach**: To attach an existing virtual machine as a compute target, you must provide the fully qualified domain name (FQDN), user name, and password for the virtual machine. In the example, replace \<fqdn> with the public FQDN of the VM, or the public IP address. Replace \<username> and \<password> with the SSH user name and password for the VM.
-
-    > [!IMPORTANT]
-    > The following Azure regions do not support attaching a virtual machine using the public IP address of the VM. Instead, use the Azure Resource Manager ID of the VM with the `resource_id` parameter:
-    >
-    > * US East
-    > * US West 2
-    > * US South Central
-    >
-    > The resource ID of the VM can be constructed using the subscription ID, resource group name, and VM name using the following string format: `/subscriptions/<subscription_id>/resourceGroups/<resource_group>/providers/Microsoft.Compute/virtualMachines/<vm_name>`.
-
+1. **Attach**: To attach an existing virtual machine as a compute target, you must provide the resource ID, user name, and password for the virtual machine. The resource ID of the VM can be constructed using the subscription ID, resource group name, and VM name using the following string format: `/subscriptions/<subscription_id>/resourceGroups/<resource_group>/providers/Microsoft.Compute/virtualMachines/<vm_name>`
 
+ 
    ```python
    from azureml.core.compute import RemoteCompute, ComputeTarget
 
    # Create the compute config 
    compute_target_name = "attach-dsvm"
-   attach_config = RemoteCompute.attach_configuration(address='<fqdn>',
-                                                    ssh_port=22,
-                                                    username='<username>',
-                                                    password="<password>")
-   # If in US East, US West 2, or US South Central, use the following instead:
-   # attach_config = RemoteCompute.attach_configuration(resource_id='<resource_id>',
-   #                                                 ssh_port=22,
-   #                                                 username='<username>',
-   #                                                 password="<password>")
+   
+   attach_config = RemoteCompute.attach_configuration(resource_id='<resource_id>',
+                                                   ssh_port=22,
+                                                   username='<username>',
+                                                   password="<password>")
 
    # If you authenticate with SSH keys instead, use this code:
    #                                                  ssh_port=22,
@@ -205,28 +192,15 @@ Azure HDInsight is a popular platform for big-data analytics. The platform provi
     
     After the cluster is created, connect to it with the hostname \<clustername>-ssh.azurehdinsight.net, where \<clustername> is the name that you provided for the cluster. 
 
-1. **Attach**: To attach an HDInsight cluster as a compute target, you must provide the hostname, user name, and password for the HDInsight cluster. The following example uses the SDK to attach a cluster to your workspace. In the example, replace \<clustername> with the name of your cluster. Replace \<username> and \<password> with the SSH user name and password for the cluster.
-
-    > [!IMPORTANT]
-    > The following Azure regions do not support attaching an HDInsight cluster using the public IP address of the cluster. Instead, use the Azure Resource Manager ID of the cluster with the `resource_id` parameter:
-    >
-    > * US East
-    > * US West 2
-    > * US South Central
-    >
-    > The resource ID of the cluster can be constructed using the subscription ID, resource group name, and cluster name using the following string format: `/subscriptions/<subscription_id>/resourceGroups/<resource_group>/providers/Microsoft.HDInsight/clusters/<cluster_name>`.
+1. **Attach**: To attach an HDInsight cluster as a compute target, you must provide the resource ID, user name, and password for the HDInsight cluster. The resource ID of the HDInsight cluster can be constructed using the subscription ID, resource group name, and HDInsight cluster name using the following string format: `/subscriptions/<subscription_id>/resourceGroups/<resource_group>/providers/Microsoft.HDInsight/clusters/<cluster_name>`
 
    ```python
    from azureml.core.compute import ComputeTarget, HDInsightCompute
    from azureml.exceptions import ComputeTargetException
 
    try:
     # if you want to connect using SSH key instead of username/password you can provide parameters private_key_file and private_key_passphrase
-    attach_config = HDInsightCompute.attach_configuration(address='<clustername>-ssh.azurehdinsight.net', 
-                                                          ssh_port=22, 
-                                                          username='<ssh-username>', 
-                                                          password='<ssh-pwd>')
-    # If you are in US East, US West 2, or US South Central, use the following instead:
+
     # attach_config = HDInsightCompute.attach_configuration(resource_id='<resource_id>',
     #                                                      ssh_port=22, 
     #                                                      username='<ssh-username>', 
diff --git a/articles/mariadb/TOC.yml b/articles/mariadb/TOC.yml
@@ -156,6 +156,8 @@
       items: 
       - name: Azure portal
         href: howto-configure-audit-logs-portal.md
+      - name: Azure CLI
+        href: howto-configure-audit-logs-cli.md
   - name: Monitor
     items:
     - name: Create alerts on metrics
diff --git a/articles/mariadb/howto-configure-audit-logs-cli.md b/articles/mariadb/howto-configure-audit-logs-cli.md
@@ -0,0 +1,56 @@
+---
+title: Access audit logs - Azure CLI - Azure Database for MariaDB
+description: This article describes how to configure and access the audit logs in Azure Database for MariaDB from the Azure CLI.
+author: ajlam
+ms.author: andrela
+ms.service: mariadb
+ms.topic: conceptual
+ms.date: 4/13/2020
+---
+
+# Configure and access audit logs in the Azure CLI
+
+You can configure the [Azure Database for MariaDB audit logs](concepts-audit-logs.md) from the Azure CLI.
+
+> [!IMPORTANT]
+> Audit log functionality is currently in preview.
+
+## Prerequisites
+
+To step through this how-to guide, you need:
+
+- [Azure Database for MariaDB server](quickstart-create-mariadb-server-database-using-azure-portal.md)
+
+[!INCLUDE [cloud-shell-try-it.md](../../includes/cloud-shell-try-it.md)]
+
+> [!IMPORTANT]
+> This how-to guide requires that you use Azure CLI version 2.0 or later. To confirm the version, at the Azure CLI command prompt, enter `az --version`. To install or upgrade, see [Install Azure CLI]( /cli/azure/install-azure-cli).
+
+## Configure audit logging
+
+Enable and configure audit logging using the following steps: 
+
+1. Turn on audit logs by setting the **audit_logs_enabled** parameter to "ON". 
+    ```azurecli-interactive
+    az mariadb server configuration set --name audit_log_enabled --resource-group myresourcegroup --server mydemoserver --value ON
+    ```
+
+1. Select the [event types](concepts-audit-logs.md#configure-audit-logging) to be logged by updating the **audit_log_egitvents** parameter.
+    ```azurecli-interactive
+    az mariadb server configuration set --name audit_log_events --resource-group myresourcegroup --server mydemoserver --value "ADMIN,CONNECTION"
+    ```
+
+1. Add any MariaDB users to be excluded from logging by updating the **audit_log_exclude_users** parameter. Specify users by providing their MariaDB user name.
+    ```azurecli-interactive
+    az mariadb server configuration set --name audit_log_exclude_users --resource-group myresourcegroup --server mydemoserver --value "azure_superuser"
+    ```
+
+1. Add any specific MariaDB users to be included for logging by updating the **audit_log_include_users** parameter. Specify users by providing their MariaDB user name.
+    ```azurecli-interactive
+    az mariadb server configuration set --name audit_log_include_users --resource-group myresourcegroup --server mydemoserver --value "sampleuser"
+    ```
+
+## Next steps
+
+- Learn more about [audit logs](concepts-audit-logs.md) in Azure Database for MariaDB
+- Learn how to configure audit logs in the [Azure portal](howto-configure-audit-logs-portal.md)
diff --git a/articles/mariadb/howto-configure-audit-logs-portal.md b/articles/mariadb/howto-configure-audit-logs-portal.md
@@ -5,7 +5,7 @@ author: ajlam
 ms.author: andrela
 ms.service: mariadb
 ms.topic: conceptual
-ms.date: 3/18/2020
+ms.date: 4/13/2020
 ---
 
 # Configure and access audit logs in the Azure portal
@@ -65,4 +65,5 @@ Enable and configure audit logging.
 
 ## Next steps
 
-- Learn more about [audit logs](concepts-audit-logs.md) in Azure Database for MariaDB.
+- Learn more about [audit logs](concepts-audit-logs.md) in Azure Database for MariaDB
+- Learn how to configure audit logs in the [Azure CLI](howto-configure-audit-logs-cli.md)
diff --git a/articles/marketplace/partner-center-portal/azure-vm-create-offer.md b/articles/marketplace/partner-center-portal/azure-vm-create-offer.md
@@ -111,9 +111,9 @@ Select **Save draft** before continuing.
 
 This page lets you define the categories and industries used to group your offer on the marketplace, your app version, and the legal contracts that support your offer.
 
-### Category
+### Categories
 
-Select a minimum of one and a maximum of three categories. These categories are used to place your offer in the appropriate marketplace search areas. In the offer description, explain how your offer supports these categories. Virtual machine offers appear under the **Compute** category in Azure Marketplace.
+Select a minimum of one and a maximum of five categories. These categories are used to place your offer in the appropriate marketplace search areas. In the offer description, explain how your offer supports these categories. Virtual machine offers appear under the **Compute** category in Azure Marketplace.
 
 ### Legal
 
@@ -229,7 +229,6 @@ Provide the support website where customers can reach your support team.
 
 - Azure Global support website
 - Azure Government support website
-- and so on
 
 ### Partner support contact
 
@@ -416,16 +415,16 @@ You can design each plan to be visible to everyone or to only a preselected audi
 
 #### Hide plan
 
-If your virtual machine is meant to be used only indirectly when referenced through another solution template or managed application, select this box to publish your virtual machine or offer but hide it from customers searching and browsing for it directly.
+If your virtual machine is meant to be used only indirectly when referenced through another solution template or managed application, select this box to publish your virtual machine but hide it from customers searching and browsing for it directly.
 
 > [!NOTE]
-> Hidden plans do not support preview links.
+> Hidden plans don't support preview links.
 
 Select **Save draft** before continuing.
 
 ### Technical configuration
 
-Provide the images and other technical properties associated with this plan.
+Provide the images and other technical properties associated with this plan. For details, see [Create an Azure VM technical asset](https://docs.microsoft.com/azure/marketplace/partner-center-portal/create-azure-container-technical-assets).
 
 > [!NOTE]
 > This tab isn't shown if you configured this plan to reuse packages from another plan on the **Plan setup** tab.
@@ -454,7 +453,7 @@ Open public or private ports on a deployed virtual machine.
 
 #### VM Images
 
-Provide a disk version and the SAS URI for the virtual machine images. Add up to 16 data disks for each VM image. Provide only one new image version per plan in a given submission. After an image has been published you can't edit it, but you can delete it. Deleting a version will prevent your users from deploying a new instance of the deleted version.
+Provide a disk version and the SAS URI for the virtual machine images. Add up to 16 data disks for each VM image. Provide only one new image version per plan in a given submission. After an image has been published you can't edit it, but you can delete it. Deleting a version will prevent both new and existing users from deploying a new instance of the deleted version.
 
 - **Disc version** is the version of the image you are providing.
 - **SAS URI** is the location in Azure Storage where you have stored the operating system VHD.
diff --git a/articles/marketplace/partner-center-portal/create-azure-container-technical-assets.md b/articles/marketplace/partner-center-portal/create-azure-container-technical-assets.md
@@ -1,5 +1,5 @@
 ---
-title: Prepare your Azure Container technical assets
+title: Create an Azure VM technical asset
 description: This article describes the steps and requirements for configuring a container offer on Azure Marketplace.
 author: anbene
 ms.author: mingshen
@@ -9,7 +9,7 @@ ms.topic: conceptual
 ms.date: 04/09/2020
 ---
 
-# Prepare your Azure Container technical assets
+# Create an Azure VM technical asset
 
 > [!IMPORTANT]
 > We're moving the management of your Azure Container offers from Cloud Partner Portal to Partner Center. Until your offers are migrated, please follow the instructions in [Prepare your Container technical assets](https://docs.microsoft.com/azure/marketplace/cloud-partner-portal/containers/cpp-create-technical-assets) for Cloud Partner Portal to manage your offers.
diff --git a/articles/mysql/TOC.yml b/articles/mysql/TOC.yml
diff --git a/articles/mysql/howto-configure-audit-logs-cli.md b/articles/mysql/howto-configure-audit-logs-cli.md
diff --git a/articles/mysql/howto-configure-audit-logs-portal.md b/articles/mysql/howto-configure-audit-logs-portal.md
diff --git a/articles/openshift/howto-aad-app-configuration.md b/articles/openshift/howto-aad-app-configuration.md
