Skip to content

Commit 431d1e1

Browse files
authored
Merge pull request #134818 from MicrosoftDocs/repo_sync_working_branch
Confirm merge from repo_sync_working_branch to master to sync with https://github.com/MicrosoftDocs/azure-docs (branch master)
2 parents 711f4d4 + ac41fdd commit 431d1e1

16 files changed

+257
-167
lines changed

articles/aks/faq.md

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -195,6 +195,13 @@ No, AKS is a managed service, and manipulation of the IaaS resources is not supp
195195

196196
The feature to enable storing customer data in a single region is currently only available in the Southeast Asia Region (Singapore) of the Asia Pacific Geo. For all other regions, customer data is stored in Geo.
197197

198+
## Are AKS images required to run as root?
199+
200+
Except for the following two images, AKS images are not required to run as root:
201+
202+
- *mcr.microsoft.com/oss/kubernetes/coredns*
203+
- *mcr.microsoft.com/azuremonitor/containerinsights/ciprod*
204+
198205
<!-- LINKS - internal -->
199206

200207
[aks-upgrade]: ./upgrade-cluster.md

articles/aks/view-master-logs.md

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -33,9 +33,11 @@ Azure Monitor logs are enabled and managed in the Azure portal. To enable log co
3333

3434
In addition to entries written by Kubernetes, your project's audit logs also have entries from AKS.
3535

36-
Audit logs are recorded into two categories, *kube-audit-admin* and *kube-audit*. The *kube-audit* category contains all audit log data for every audit event, including *get*, *list*, *create*, *update*, *delete*, *patch*, and *post*.
36+
Audit logs are recorded into three categories: *kube-audit*, *kube-audit-admin*, and *guard*.
3737

38-
The *kube-audit-admin* category is a subset of the *kube-audit* log category. *kube-audit-admin* reduces the number of logs significantly by excluding the *get* and *list* audit events from the log.
38+
- The *kube-audit* category contains all audit log data for every audit event, including *get*, *list*, *create*, *update*, *delete*, *patch*, and *post*.
39+
- The *kube-audit-admin* category is a subset of the *kube-audit* log category. *kube-audit-admin* reduces the number of logs significantly by excluding the *get* and *list* audit events from the log.
40+
- The *guard* category is managed Azure AD and Azure RBAC audits. For managed Azure AD: token in, user info out. For Azure RBAC: access reviews in and out.
3941

4042
## Schedule a test pod on the AKS cluster
4143

@@ -71,7 +73,7 @@ pod/nginx created
7173

7274
## View collected logs
7375

74-
It may take a few minutes for the diagnostics logs to be enabled and appear.
76+
It may take up to 10 minutes for the diagnostics logs to be enabled and appear.
7577

7678
> [!NOTE]
7779
> If you need all audit log data for compliance or other purposes, collect and store it in inexpensive storage such as blob storage. Use the *kube-audit-admin* log category to collect and save a meaningful set of audit log data for monitoring and alerting purposes.

articles/azure-functions/functions-bindings-event-hubs-trigger.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ ms.date: 02/21/2020
88
ms.author: cshoe
99
---
1010

11-
# Azure Event Hubs bindings for Azure Functions
11+
# Azure Event Hubs trigger for Azure Functions
1212

1313
This article explains how to work with [Azure Event Hubs](../event-hubs/event-hubs-about.md) trigger for Azure Functions. Azure Functions supports trigger and [output bindings](functions-bindings-event-hubs-output.md) for Event Hubs.
1414

articles/azure-monitor/platform/move-workspace.md

Lines changed: 13 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -36,11 +36,20 @@ Solutions that must be removed before you can unlink your automation account:
3636

3737
>[!IMPORTANT]
3838
> **Azure Sentinel customers**
39-
> - Once deployed on a workspace, Azure Sentinel **does not currently support** the moving of that workspace to other resource groups or subscriptions.
40-
> - If you have already moved the workspace, disable all active rules under **Analytics** and re-enable them after five minutes. This should be effective in most cases, though, to reiterate, it is unsupported and undertaken at your own risk.
39+
> - Currently, after Azure Sentinel is deployed on a workspace, moving the workspace to another resource group or subscription isn't supported.
40+
> - If you have already moved the workspace, disable all active rules under **Analytics** and re-enable them after five minutes. This should be an effective solution in most cases, though, to reiterate, it is unsupported and undertaken at your own risk.
4141
>
42-
> **Alerts**
43-
> - All alerts needs to re-create after the move, since the permissions are based on the Azure Resource ID of the workspace and it's changes with the workspace move.
42+
> **Re-create alerts**
43+
> - All alerts must be re-created after a move because the permissions are based on the Azure Resource ID of the workspace, which changes during a workspace move.
44+
>
45+
> **Update resource paths**
46+
> - After a workspace move, any Azure or external resources that point to the workspace must be reviewed and updated to point to the new resource target path.
47+
>
48+
> *Examples:*
49+
> - [Azure Monitor alert rules](alerts-resource-move.md)
50+
> - Third-party applications
51+
> - Custom scripting
52+
>
4453
4554
### Delete solutions in Azure portal
4655
Use the following procedure to remove the solutions using the Azure portal:

articles/azure-monitor/samples/resource-manager-alerts-log.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ The following sample creates a [number of results alert rule](../platform/alerts
3232
"type": "string",
3333
"defaultValue": "",
3434
"metadata": {
35-
"description": "Resource ID of the Log Analytisc workspace."
35+
"description": "Resource ID of the Log Analytics workspace."
3636
}
3737
},
3838
"location": {

articles/azure-vmware/tutorial-deploy-vmware-hcx.md

Lines changed: 18 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,9 @@ Infrastructure components must be running the required minimum version.
6060

6161
* Configure [Azure ExpressRoute Global Reach](tutorial-expressroute-global-reach-private-cloud.md) between on-premises and Azure VMware Solution SDDC ExpressRoute circuits.
6262

63-
* All required ports should be open for communication between on-premises components and Azure VMware Solution SDDC. For more information, see [VMware HCX documentation](https://docs.vmware.com/en/VMware-HCX/services/user-guide/GUID-E456F078-22BE-494B-8E4B-076EF33A9CF4.html).
63+
* [All required ports](https://ports.vmware.com/home/VMware-HCX) should be open for communication between on-premises components and Azure VMware Solution SDDC.
64+
65+
For more information, see the [VMware HCX documentation](https://docs.vmware.com/en/VMware-HCX/services/user-guide/GUID-E456F078-22BE-494B-8E4B-076EF33A9CF4.html).
6466

6567

6668
### IP addresses
@@ -69,13 +71,13 @@ Infrastructure components must be running the required minimum version.
6971

7072
## Deploy the VMware HCX Connector OVA on-premises
7173

72-
>[!NOTE]
73-
>Before you deploy the virtual appliance to your on-premises vCenter, you'll need to download the VMware HCX Connector OVA.
74+
> [!NOTE]
75+
> Before you deploy the virtual appliance to your on-premises vCenter, you must download the VMware HCX Connector OVA.
7476
7577
1. Open a browser window, sign in to the Azure VMware Solution HCX Manager on `https://x.x.x.9` port 443 with the **cloudadmin** user credentials, and then go to **Support**.
7678

77-
>[!TIP]
78-
>Note the IP address of the HCX Cloud Manager in Azure VMware Solution. To identify the IP address, on the Azure VMware Solution pane, go to **Manage** > **Connectivity** and then select the **HCX** tab.
79+
> [!TIP]
80+
> Note the IP address of the HCX Cloud Manager in Azure VMware Solution. To identify the IP address, on the Azure VMware Solution pane, go to **Manage** > **Connectivity** and then select the **HCX** tab.
7981
>
8082
>The vCenter password was defined when you set up the private cloud.
8183
@@ -98,8 +100,8 @@ Infrastructure components must be running the required minimum version.
98100

99101
1. Select **Next**, verify the configuration, and then select **Finish** to deploy the HCX Connector OVA.
100102

101-
>[!NOTE]
102-
>Generally, the VMware HCX Connector that you're deploying now is deployed onto the cluster's management network.
103+
> [!NOTE]
104+
> Generally, the VMware HCX Connector that you're deploying now is deployed onto the cluster's management network.
103105
104106
> [!IMPORTANT]
105107
> You might need to turn on the virtual appliance manually. If that's the case, wait 10-15 minutes before proceeding to the next step.
@@ -167,7 +169,7 @@ You can connect (pair) the VMware HCX Cloud Manager in Azure VMware Solution wit
167169
1. Enter the Remote HCX URL or IP address that you noted earlier, the Azure VMware Solution [email protected] username, and the password. Then select **Connect**.
168170

169171
> [!NOTE]
170-
> The remote HCX URL is your Azure VMware Solution private cloud's HCX Cloud Manager IP address, which is the ".9" address of the management network. For example, if your vCenter is 192.168.4.2, then your HCX URL will be 192.168.4.9.
172+
> To establish a site pair successfully, your HCX connector must be able to route to your HCX Cloud Manager IP over port 443.
171173
>
172174
> The password is the same password that you used to sign in to vCenter. You defined this password on the initial deployment screen.
173175
@@ -268,6 +270,13 @@ For an end-to-end overview of this procedure, view the [Azure VMware Solution: C
268270

269271
Now it's time to configure a service mesh between on-premises and Azure VMware Solution SDDC.
270272

273+
> [!NOTE]
274+
> To successfully establish a service mesh with Azure VMware Solution:
275+
>
276+
> Ports UDP 500/4500 are open between your on-premises HCX connector-defined 'uplink' network profile addresses and the Azure VMware Solution HCX Cloud 'uplink' network profile addresses.
277+
>
278+
> Be sure to review [HCX required ports](https://ports.vmware.com/home/VMware-HCX).
279+
271280
1. Under **Infrastructure**, select **Interconnect** > **Service Mesh** > **Create Service Mesh**.
272281

273282
:::image type="content" source="media/tutorial-vmware-hcx/create-service-mesh.png" alt-text="Screenshot of selections to start creating a service mesh." lightbox="media/tutorial-vmware-hcx/create-service-mesh.png":::
@@ -347,3 +356,4 @@ For more information on using HCX, go to the VMware technical documentation:
347356

348357
* [VMware HCX Documentation](https://docs.vmware.com/en/VMware-HCX/index.html)
349358
* [Migrating Virtual Machines with VMware HCX](https://docs.vmware.com/en/VMware-HCX/services/user-guide/GUID-D0CD0CC6-3802-42C9-9718-6DA5FEC246C6.html?hWord=N4IghgNiBcIBIGEAaACAtgSwOYCcwBcMB7AOxAF8g).
359+
* [HCX required ports](https://ports.vmware.com/home/VMware-HCX)

articles/cosmos-db/performance-tips-java-sdk-v4-sql.md

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -159,13 +159,13 @@ Please see the [Windows](https://docs.microsoft.com/azure/virtual-network/create
159159

160160
As a first step, use the following recommended configuration settings below. These *DirectConnectionConfig* options are advanced configuration settings which can affect SDK performance in unexpected ways; we recommend users avoid modifying them unless they feel very comfortable in understanding the tradeoffs and it is absolutely necessary. Please contact the [Azure Cosmos DB team](mailto:[email protected]) if you run into issues on this particular topic.
161161

162-
| Configuration option | Default |
163-
| :------------------: | :-----: |
164-
| idleConnectionTimeout | "PT1M" |
165-
| maxConnectionsPerEndpoint | "PT0S" |
166-
| connectTimeout | "PT1M10S" |
167-
| idleEndpointTimeout | 8388608 |
168-
| maxRequestsPerConnection | 10 |
162+
| Configuration option | Default |
163+
| :------------------: | :-----: |
164+
| idleConnectionTimeout | "PT0" |
165+
| maxConnectionsPerEndpoint | "130" |
166+
| connectTimeout | "PT5S" |
167+
| idleEndpointTimeout | "PT1H" |
168+
| maxRequestsPerConnection | "30" |
169169

170170
* **Tuning parallel queries for partitioned collections**
171171

articles/databox-online/azure-stack-edge-gpu-activation-key-vault.md

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ Azure Key Vault is integrated with Azure Stack Edge resource for secret manageme
1818

1919
## About Key vault and Azure Stack Edge
2020

21-
Azure Key Vault cloud service is used to securely store and control access to tokens, passwords, certificates, API keys, and other secrets. Key Vault also makes it easy to create and control the encryption keys used to encrypt your data.
21+
Azure Key Vault cloud service is used to securely store and control access to tokens, passwords, certificates, API keys, and other secrets. Key Vault also makes it easy to create and control the encryption keys used to encrypt your data. For more information about allowed transactions and corresponding charges, see [Pricing for Azure Key Vault](https://azure.microsoft.com/pricing/details/key-vault/).
2222

2323
For Azure Stack Edge service, one of the secrets used is Channel Integrity Key (CIK). This key allows you to encrypt your secrets. With the integration of key vault, the CIK is securely stored in the key vault. For more information, see [Securely store secrets and keys](../key-vault/general/overview.md#securely-store-secrets-and-keys).
2424

@@ -41,6 +41,8 @@ A key vault is created for Azure Stack Edge resource during the process of activ
4141

4242
![MSI created during Azure Stack Edge resource creation](media/azure-stack-edge-gpu-deploy-prep/create-resource-8.png)
4343

44+
- To browse to the Azure key vault, go to the **Properties** in your Azure Stack Edge resource and select the key vault name.
45+
4446
- To prevent accidental deletion, a resource lock is enabled on the key vault. A soft-delete is also enabled on the key vault that allows the key vault to be restored within 90 days if there is an accidental deletion. For more information, see [Azure Key Vault soft-delete overview](../key-vault/general/soft-delete-overview.md)
4547

4648
If the key vault is accidentally deleted and the purge protection duration of 90 days hasn't elapsed, follow these steps to [Recover your key vault](../key-vault/general/soft-delete-powershell.md#recovering-a-key-vault).

articles/event-hubs/authenticate-managed-identity.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ To authorize a request to Event Hubs service from a managed identity in your app
2525
For more information about assigning Azure roles, see [Authenticate with Azure Active Directory for access to Event Hubs resources](authorize-access-azure-active-directory.md).
2626

2727
## Use Event Hubs with managed identities
28-
To use Event Hubs with managed identities, you need to assign the identity the role and the appropriate scope. The procedure in this section uses a simple application that runs under a managed identity and accesses Event Hubs resources.
28+
To use Event Hubs with managed identities, you need to assign the role and the appropriate scope to the identity. The procedure in this section uses a simple application that runs under a managed identity and accesses Event Hubs resources.
2929

3030
Here we're using a sample web application hosted in [Azure App Service](https://azure.microsoft.com/services/app-service/). For step-by-step instructions for creating a web application, see [Create an ASP.NET Core web app in Azure](../app-service/quickstart-dotnetcore.md)
3131

articles/expressroute/expressroute-howto-set-global-reach.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -102,17 +102,17 @@ When the previous operation completes, you will have connectivity between your o
102102

103103
Use the following command to verify the configuration on the circuit where the configuration was made (for example, circuit 1 in the previous example).
104104
```azurepowershell-interactive
105-
$ckt1 = Get-AzExpressRouteCircuit -Name "Your_circuit_1_name" -ResourceGroupName "Your_resource_group"
105+
$ckt_1 = Get-AzExpressRouteCircuit -Name "Your_circuit_1_name" -ResourceGroupName "Your_resource_group"
106106
```
107107

108-
If you simply run *$ckt1* in PowerShell, you see *CircuitConnectionStatus* in the output. It tells you whether the connectivity is established, "Connected", or "Disconnected".
108+
If you simply run *$ckt_1* in PowerShell, you see *CircuitConnectionStatus* in the output. It tells you whether the connectivity is established, "Connected", or "Disconnected".
109109

110110
## Disable connectivity
111111

112112
To disable connectivity between your on-premises networks, run the commands against the circuit where the configuration was made (for example, circuit 1 in the previous example).
113113

114114
```azurepowershell-interactive
115-
$ckt1 = Get-AzExpressRouteCircuit -Name "Your_circuit_1_name" -ResourceGroupName "Your_resource_group"
115+
$ckt_1 = Get-AzExpressRouteCircuit -Name "Your_circuit_1_name" -ResourceGroupName "Your_resource_group"
116116
Remove-AzExpressRouteCircuitConnectionConfig -Name "Your_connection_name" -ExpressRouteCircuit $ckt_1
117117
Set-AzExpressRouteCircuit -ExpressRouteCircuit $ckt_1
118118
```

0 commit comments

Comments
 (0)