Merge pull request #183352 from MicrosoftDocs/repo_sync_working_branch

v-alje · web-flow · commit 7a24a15c5174 · 2021-12-21T09:58:18.000-08:00
Confirm merge from repo_sync_working_branch to master to sync with https://github.com/MicrosoftDocs/azure-docs (branch master)
diff --git a/articles/active-directory/governance/entitlement-management-process.md b/articles/active-directory/governance/entitlement-management-process.md
@@ -49,6 +49,9 @@ If you're an approver, you're sent email notifications when you need to approve
 
 The following diagrams show when these email notifications are sent to either the approvers or the requestor. Reference the [email notifications table](entitlement-management-process.md#email-notifications-table) to find the corresponding number to the email notifications displayed in the diagrams.
 
+> [!NOTE]
+> If the admin directly assigns a user to an access package, you won't receive an email notification when an access request has been completed or denied. Email notifications are sent only when a user makes a request for access.
+
 ### First approvers and alternate approvers
 The following diagram shows the experience of first approvers and alternate approvers, and the email notifications they receive during the request process:
 
diff --git a/articles/aks/command-invoke.md b/articles/aks/command-invoke.md
@@ -25,7 +25,7 @@ The pod created by the `run` command provides the following binaries:
 
 In addition, `command invoke` runs the commands from your cluster so any commands run in this manner are subject to networking and other restrictions you have configured on your cluster.
 
-## Use `invoke commnad` to run a single command
+## Use `command invoke` to run a single command
 
 Use `az aks command invoke --command` to run a command on your cluster. For example:
 
@@ -75,4 +75,4 @@ az aks command invoke \
   --file .
 ```
 
-The above runs `kubectl apply -f deployment.yaml configmap.yaml -n default` on the *myAKSCluster* cluster in *myResourceGroup*. The `deployment.yaml` and `configmap.yaml` files used by that command are part of the current directory on the development computer where `az aks command invoke` was run.
+The above runs `kubectl apply -f deployment.yaml configmap.yaml -n default` on the *myAKSCluster* cluster in *myResourceGroup*. The `deployment.yaml` and `configmap.yaml` files used by that command are part of the current directory on the development computer where `az aks command invoke` was run.
diff --git a/articles/aks/support-policies.md b/articles/aks/support-policies.md
@@ -51,7 +51,7 @@ Microsoft provides technical support for the following examples:
 
 * Connectivity to all Kubernetes components that the Kubernetes service provides and supports, such as the API server.
 * Management, uptime, QoS, and operations of Kubernetes control plane services (Kubernetes control plane, API server, etcd, and coreDNS, for example).
-* Etcd data store. Support includes automated, transparent backups of all etcd data every 30 minutes for disaster planning and cluster state restoration. These backups aren't directly available to you or any users. They ensure data reliability and consistency. Etcd. on-demand rollback or restore is not supported as a feature.
+* Etcd data store. Support includes automated, transparent backups of all etcd data every 30 minutes for disaster planning and cluster state restoration. These backups aren't directly available to you or any users. They ensure data reliability and consistency. On-demand rollback or restore is not supported as a feature.
 * Any integration points in the Azure cloud provider driver for Kubernetes. These include integrations into other Azure services such as load balancers, persistent volumes, or networking (Kubernetes and Azure CNI).
 * Questions or issues about customization of control plane components such as the Kubernetes API server, etcd, and coreDNS.
 * Issues about networking, such as Azure CNI, kubenet, or other network access and functionality issues. Issues could include DNS resolution, packet loss, routing, and so on. Microsoft supports various networking scenarios:
diff --git a/articles/azure-arc/kubernetes/troubleshooting.md b/articles/azure-arc/kubernetes/troubleshooting.md
@@ -311,7 +311,7 @@ The above warning is observed when you have used a service principal to log into
 1. Fetch the Object ID of the Azure AD application used by Azure Arc service:
 
     ```console
-    az ad sp show --id 'bc313c14-388c-4e7d-a58e-70017303ee3b' --query objectId -o tsv
+    az ad sp show --id bc313c14-388c-4e7d-a58e-70017303ee3b --query objectId -o tsv
     ```
 
 1. Use the `<objectId>` value from above step to enable custom locations feature on the cluster:
diff --git a/articles/azure-cache-for-redis/cache-how-to-multi-replicas.md b/articles/azure-cache-for-redis/cache-how-to-multi-replicas.md
@@ -42,6 +42,8 @@ To create a cache, follow these steps:
 
     :::image type="content" source="media/cache-how-to-multi-replicas/create-multi-replicas.png" alt-text="Replica count.":::
 
+1. Configure your settings for clustering or relational database persistence.  
+
     > [!NOTE]
     > Currently, you can't use Append-only File (AOF) persistence or geo-replication with multiple replicas (more than one replica).
     >
diff --git a/articles/azure-monitor/app/javascript-angular-plugin.md b/articles/azure-monitor/app/javascript-angular-plugin.md
@@ -81,4 +81,4 @@ export class AppModule { }
 ## Next steps
 
 - To learn more about the JavaScript SDK, see the [Application Insights JavaScript SDK documentation](javascript.md)
-- [Angular plugin on GitHub](https://github.com/microsoft/ApplicationInsights-JS/tree/master/extensions/applicationinsights-angularplugin-js)
+- [Angular plugin on GitHub](https://github.com/microsoft/applicationinsights-angularplugin-js)
diff --git a/articles/azure-monitor/app/usage-troubleshoot.md b/articles/azure-monitor/app/usage-troubleshoot.md
@@ -12,7 +12,7 @@ Have questions about the [user behavior analytics tools in Application Insights]
 ## Counting Users
 **The user behavior analytics tools show that my app has one user/session, but I know my app has many users/sessions. How can I fix these incorrect counts?**
 
-All telemetry events in Application Insights have an [anonymous user ID](./data-model-context.md) and a [session ID](./data-model-context.md) as two of their standard properties. By default, all of the usage analytics tools count users and sessions based on these IDs. If these standard properties aren't being populated with unique IDs for each user and session of your app, you'll see an incorrect count of users and sessions in the usage analytics tools.
+All telemetry events in Application Insights have an [anonymous user ID](./data-model-context.md#anonymous-user-id) and a [session ID](./data-model-context.md#session-id) as two of their standard properties. By default, all of the usage analytics tools count users and sessions based on these IDs. If these standard properties aren't being populated with unique IDs for each user and session of your app, you'll see an incorrect count of users and sessions in the usage analytics tools.
 
 If you're monitoring a web app, the easiest solution is to add the [Application Insights JavaScript SDK](./javascript.md) to your app, and make sure the script snippet is loaded on each page you want to monitor. The JavaScript SDK automatically generates anonymous user and session IDs, then populates telemetry events with these IDs as they're sent from your app.
 
@@ -42,4 +42,4 @@ If your app is sending too many custom event names, change the name in the code
 * [User behavior analytics tools overview](usage-overview.md)
 
 ## Get help
-* [Stack Overflow](https://stackoverflow.com/questions/tagged/ms-application-insights)
+* [Stack Overflow](https://stackoverflow.com/questions/tagged/ms-application-insights)
diff --git a/articles/azure-resource-manager/templates/deploy-what-if.md b/articles/azure-resource-manager/templates/deploy-what-if.md
@@ -383,8 +383,7 @@ You see the expected changes and can confirm that you want the deployment to run
 You can use the what-if operation through the Azure SDKs.
 
 * For Python, use [what-if](/python/api/azure-mgmt-resource/azure.mgmt.resource.resources.v2019_10_01.operations.deploymentsoperations#what-if-resource-group-name--deployment-name--properties--location-none--custom-headers-none--raw-false--polling-true----operation-config-).
-
-* For Java, use [DeploymentWhatIf Class](/java/api/com.microsoft.azure.management.resources.deploymentwhatif).
+* For Java, use [DeploymentWhatIf Class](/java/api/com.azure.resourcemanager.resources.models.deploymentwhatif).
 
 * For .NET, use [DeploymentWhatIf Class](/dotnet/api/microsoft.azure.management.resourcemanager.models.deploymentwhatif).
 
diff --git a/articles/data-factory/data-flow-troubleshoot-errors.md b/articles/data-factory/data-flow-troubleshoot-errors.md
@@ -222,7 +222,7 @@ This article lists common error codes and messages reported by mapping data flow
 - **Recommendation**: In the Cosmos DB linked service, specify the account name or account endpoint.
 
 ## Error code: DF-Github-WriteNotSupported
-- **Message**: Github store does not allow writes.
+- **Message**: GitHub store does not allow writes.
 - **Cause**: The GitHub store is read only.
 - **Recommendation**: The store entity definition is in some other place.
   
diff --git a/articles/event-grid/edge/event-schemas.md b/articles/event-grid/edge/event-schemas.md
@@ -54,7 +54,7 @@ All events have the following top-level data:
 | subject | string | Yes | Publisher-defined path to the event subject. |
 | eventType | string | Yes | Event type for this event source, for example, BlobCreated. |
 | eventTime | string | Yes | The time the event is generated based on the provider's UTC time. |
-| ID | string | No | Unique identifier for the event. |
+| id | string | No | Unique identifier for the event. |
 | data | object | No | Used to capture event data that's specific to the publishing entity. |
 | dataVersion | string | Yes | The schema version of the data object. The publisher defines the schema version. |
 | metadataVersion | string | No | The schema version of the event metadata. Event Grid defines the schema of the top-level properties. Event Grid provides this value. |
diff --git a/articles/governance/policy/concepts/guest-configuration-custom.md b/articles/governance/policy/concepts/guest-configuration-custom.md
@@ -55,9 +55,9 @@ extracted.
 
 Multiple benefits result from this change.
 
-- It's possible to use difference module versions for each configuration, on
+- It's possible to use different module versions for each configuration, on
   the same machine.
-- When a configuration is no longer deleted on a machine, the entire folder
+- When a configuration is no longer needed on a machine, the entire folder
   where it was extracted is safely deleted by the agent without the need to
   manage shared dependencies across configurations.
 - It's not required to manage multiple versions of any module in a central
diff --git a/articles/governance/policy/concepts/policy-for-kubernetes.md b/articles/governance/policy/concepts/policy-for-kubernetes.md
@@ -195,7 +195,7 @@ kubectl get pods -n gatekeeper-system
 
 Lastly, verify that the latest add-on is installed by running this Azure CLI command, replacing
 `<rg>` with your resource group name and `<cluster-name>` with the name of your AKS cluster:
-`az aks show --query addonProfiles.azurePolicy -g <rg> -n <cluster-name>`. The result should look
+`az aks show --query addonProfiles.azurepolicy -g <rg> -n <cluster-name>`. The result should look
 similar to the following output:
 
 ```output
diff --git a/articles/postgresql/flexible-server/concepts-networking.md b/articles/postgresql/flexible-server/concepts-networking.md
@@ -77,12 +77,9 @@ Here are some concepts to be familiar with when you're using virtual networks wi
 
 If you use the Azure portal or the Azure CLI to create flexible servers with a virtual network, a new private DNS zone is automatically provisioned for each server in your subscription by using the server name that you provided. 
 
-If you use an Azure API, an Azure Resource Manager template (ARM template), or Terraform, create private DNS zones that end with `postgres.database.azure.com`. Use those zones while configuring flexible servers with private access. For more information, see the [private DNS zones overview](../../dns/private-dns-overview.md).
-
-
- When using private network access with Azure virtual network, providing the private DNS zone information is  mandatory across various interfaces, including API, ARM, and Terraform.  Therefore, for new Azure Database for PostgreSQL Flexible Server creation using private network access with API, ARM, or Terraform, create private DNS zones and use them while configuring flexible servers with private access. See more information on [REST API specifications for Microsoft Azure](https://github.com/Azure/azure-rest-api-specs/blob/master/specification/postgresql/resource-manager/Microsoft.DBforPostgreSQL/stable/2021-06-01/postgresql.json). If you use the [Azure portal](./how-to-manage-virtual-network-portal.md) or [Azure CLI](./how-to-manage-virtual-network-cli.md) for creating flexible servers, you can either provide a private DNS zone name that you had previously created in the same or a different subscription or a default private DNS zone is automatically created in your subscription.
-
+If you use an Azure API, an Azure Resource Manager template (ARM template), or Terraform, create private DNS zones that end with `.postgres.database.azure.com`. Use those zones while configuring flexible servers with private access. For example, use the form `[name1].[name2].postgres.database.azure.com` or `[name].postgres.database.azure.com`. If you choose to use the form `[name].postgres.database.azure.com`, the name can't be the name you use for one of your flexible servers or an error message will be shown during provisioning. For more information, see the [private DNS zones overview](../../dns/private-dns-overview.md).
 
+When using private network access with Azure virtual network, providing the private DNS zone information is  mandatory across various interfaces, including API, ARM, and Terraform.  Therefore, for new Azure Database for PostgreSQL Flexible Server creation using private network access with API, ARM, or Terraform, create private DNS zones and use them while configuring flexible servers with private access. See more information on [REST API specifications for Microsoft Azure](https://github.com/Azure/azure-rest-api-specs/blob/master/specification/postgresql/resource-manager/Microsoft.DBforPostgreSQL/stable/2021-06-01/postgresql.json). If you use the [Azure portal](./how-to-manage-virtual-network-portal.md) or [Azure CLI](./how-to-manage-virtual-network-cli.md) for creating flexible servers, you can either provide a private DNS zone name that you had previously created in the same or a different subscription or a default private DNS zone is automatically created in your subscription.
 
 ### Integration with a custom DNS server
 
@@ -171,4 +168,4 @@ All incoming connections that use earlier versions of the TLS protocol, such as
 ## Next steps
 
 * Learn how to create a flexible server by using the **Private access (VNet integration)** option in [the Azure portal](how-to-manage-virtual-network-portal.md) or [the Azure CLI](how-to-manage-virtual-network-cli.md).
-* Learn how to create a flexible server by using the **Public access (allowed IP addresses)** option in [the Azure portal](how-to-manage-firewall-portal.md) or [the Azure CLI](how-to-manage-firewall-cli.md).
+* Learn how to create a flexible server by using the **Public access (allowed IP addresses)** option in [the Azure portal](how-to-manage-firewall-portal.md) or [the Azure CLI](how-to-manage-firewall-cli.md).
diff --git a/articles/sentinel/sentinel-soar-content.md b/articles/sentinel/sentinel-soar-content.md
@@ -128,6 +128,7 @@ You can find SOAR integrations and their components in the following places:
 | **Azure Data Explorer** | [Managed Logic Apps connector](/connectors/kusto/) | Microsoft | Query and investigate |
 | **Azure Log Analytics Data Collector** | [Managed Logic Apps connector](/connectors/azureloganalyticsdatacollector/) | Microsoft<br><br>Community | Query and investigate |
 | **Microsoft Defender for Endpoint** | [Managed Logic Apps connector](/connectors/wdatp/)<br><br>Playbooks | Microsoft<br><br>Community | Endpoints enrichment, <br>isolate endpoints |
+| **Microsoft Defender for IoT** | Playbooks | Microsoft | Orchestration and notification |
 | **Microsoft Teams** | [Managed Logic Apps connector](/connectors/teams/)<br><br>Playbooks | Microsoft<br><br>Community | Notifications, <br>Collaboration, <br>create human-involved responses |
 |
 
diff --git a/articles/virtual-machines/extensions/network-watcher-linux.md b/articles/virtual-machines/extensions/network-watcher-linux.md
@@ -38,7 +38,7 @@ The Network Watcher Agent extension can be configured for the following Linux di
 
 ### Internet connectivity
 
-Some of the Network Watcher Agent functionality requires that a VM is connected to the Internet. Without the ability to establish outgoing connections, some of the Network Watcher Agent features may malfunction, or become unavailable. For more information about Network Watcher functionality that requires the agent, see the[Network Watcher documentation](../../network-watcher/index.yml).
+Some of the Network Watcher Agent functionality requires that a VM is connected to the Internet. Without the ability to establish outgoing connections, some of the Network Watcher Agent features may malfunction, or become unavailable. For more information about Network Watcher functionality that requires the agent, see the [Network Watcher documentation](../../network-watcher/index.yml).
 
 ## Extension schema
 

Original file line number	Diff line number	Diff line change
`@@ -42,6 +42,8 @@ To create a cache, follow these steps:`
`42`	`42`
`43`	`43`	`:::image type="content" source="media/cache-how-to-multi-replicas/create-multi-replicas.png" alt-text="Replica count.":::`
`44`	`44`
	`45`	`+1. Configure your settings for clustering or relational database persistence.`
	`46`	`+`
`45`	`47`	`> [!NOTE]`
`46`	`48`	`> Currently, you can't use Append-only File (AOF) persistence or geo-replication with multiple replicas (more than one replica).`
`47`	`49`	`>`