Skip to content

Commit 69bd6dd

Browse files
authored
Merge pull request #222196 from MicrosoftDocs/main
12/21 PM Publish
2 parents 05fd3f5 + 4e103d7 commit 69bd6dd

File tree

154 files changed

+938
-1753
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

154 files changed

+938
-1753
lines changed

.openpublishing.redirection.azure-monitor.json

Lines changed: 35 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5591,6 +5591,41 @@
55915591
"source_path_from_root": "/articles/azure-monitor/logs/collect-sccm.md",
55925592
"redirect_url": "/mem/configmgr/core/plan-design/changes/deprecated/removed-and-deprecated-cmfeatures",
55935593
"redirect_document_id": false
5594+
},
5595+
{
5596+
"source_path_from_root": "/articles/azure-monitor/vm/vminsights-health-overview.md",
5597+
"redirect_url": "/azure/azure-monitor/vm/vminsights-overview",
5598+
"redirect_document_id": false
5599+
},
5600+
{
5601+
"source_path_from_root": "/articles/azure-monitor/vm/vminsights-health-migrate.md",
5602+
"redirect_url": "/azure/azure-monitor/vm/vminsights-overview",
5603+
"redirect_document_id": false
5604+
},
5605+
{
5606+
"source_path_from_root": "/articles/azure-monitor/vm/vminsights-health-enable.md",
5607+
"redirect_url": "/azure/azure-monitor/vm/vminsights-overview",
5608+
"redirect_document_id": false
5609+
},
5610+
{
5611+
"source_path_from_root": "/articles/azure-monitor/vm/vminsights-health-alerts.md",
5612+
"redirect_url": "/azure/azure-monitor/vm/vminsights-overview",
5613+
"redirect_document_id": false
5614+
},
5615+
{
5616+
"source_path_from_root": "/articles/azure-monitor/vm/vminsights-health-configure.md",
5617+
"redirect_url": "/azure/azure-monitor/vm/vminsights-overview",
5618+
"redirect_document_id": false
5619+
},
5620+
{
5621+
"source_path_from_root": "/articles/azure-monitor/vm/vminsights-health-configure-dcr.md",
5622+
"redirect_url": "/azure/azure-monitor/vm/vminsights-overview",
5623+
"redirect_document_id": false
5624+
},
5625+
{
5626+
"source_path_from_root": "/articles/azure-monitor/vm/vminsights-health-troubleshoot.md",
5627+
"redirect_url": "/azure/azure-monitor/vm/vminsights-overview",
5628+
"redirect_document_id": false
55945629
}
55955630
]
55965631
}

articles/active-directory-b2c/azure-ad-b2c-global-identity-funnel-based-design.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ This use case demonstrates how a user from their home country/region performs a
5151

5252
### Existing local user attempts sign up
5353

54-
This use case demonstrates how a user re-registering the same email from their own country, or a different region, is blocked.
54+
This use case demonstrates how a user re-registering the same email from their own country/region, or a different region, is blocked.
5555

5656
![Screenshot shows the existing account sign-up flow.](media/azure-ad-b2c-global-identity-design-considerations/local-existing-account-signup.png)
5757

@@ -108,7 +108,7 @@ This use case demonstrates how a user can travel across regions and maintain the
108108

109109
### Local user forgot password
110110

111-
This use case demonstrates how a user can reset their password when they are within their home country.
111+
This use case demonstrates how a user can reset their password when they are within their home country/region.
112112

113113
![Screenshot shows the local user forgot password flow.](media/azure-ad-b2c-global-identity-design-considerations/local-user-forgot-password.png)
114114

articles/active-directory-b2c/azure-ad-b2c-global-identity-region-based-design.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ This use case demonstrates how a user from their home country/region performs a
4949

5050
### Existing local user attempts sign up
5151

52-
This use case demonstrates how a user re-registering the same email from their own country, or a different region, is blocked.
52+
This use case demonstrates how a user re-registering the same email from their own country/region, or a different region, is blocked.
5353

5454
![Screenshot shows the existing local user sign up attempt flow.](media/azure-ad-b2c-global-identity-regional-design/existing-local-user-sign-up.png)
5555

articles/active-directory/fundamentals/active-directory-data-storage-eu.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -79,7 +79,7 @@ Administrators can choose to enable or disable certain Azure AD features. If the
7979

8080
* **Azure Active Directory Multi Tenant Collaboration** - With multi tenant collaboration scenarios enabled, customers can configure their tenant to collaborate with users from a different tenant. For example, a customer can invite users to their tenant in a B2B context. A customer can create a multi-tenant SaaS application that allows other third party tenants to provision the application in the third party tenant. Or, the customer can make two or more tenants affiliated with one another and act as a single tenant in certain scenarios, such as multi-tenant organization (MTO) formation, tenant to tenant sync, and shared e-mail domain sharing. Customer configuration and use of multi tenant collaboration may occur with tenants outside of the EU Data Residency and EU Data Boundary resulting in some customer data, such as user and device account data, usage data, and service configuration (application, policy, and group) stored and processed in the location of the collaborating tenant.
8181
* **Application Proxy** - Allows customers to access their on-premises web applications externally. Customers may choose advanced routing configurations that allow customer data to egress outside of the EU Data Residency and EU Data Boundary, including user account data, usage data, and application configuration data.
82-
* **Microsoft 365 Multi Geo** - Microsoft 365 Multi-Geo provides customers with the ability to expand their Microsoft 365 presence to multiple geographic regions or countries within a single existing Microsoft 365 tenant. Azure Active Directory will egress customer data to perform backup authentication to the locations configured by the customer. Types of customer data include user and device account data, branding data, and service configuration data (application, policy, and group).
82+
* **Microsoft 365 Multi Geo** - Microsoft 365 Multi-Geo provides customers with the ability to expand their Microsoft 365 presence to multiple geographic regions/countries within a single existing Microsoft 365 tenant. Azure Active Directory will egress customer data to perform backup authentication to the locations configured by the customer. Types of customer data include user and device account data, branding data, and service configuration data (application, policy, and group).
8383

8484
### Other EU Data Boundary online services
8585

articles/active-directory/fundamentals/azure-ad-data-residency.md

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -40,18 +40,18 @@ Azure AD replicates each tenant through its scale unit, across data centers, bas
4040

4141
* Directory data stored in data centers closest to the tenant-residency location, to reduce latency and provide fast user sign-in times
4242
* Directory data stored in geographically isolated data centers to assure availability during unforeseen single-datacenter, catastrophic events
43-
* Compliance with data residency, or other requirements, for specific customers and countries or geographies
43+
* Compliance with data residency, or other requirements, for specific customers and countries/regions or geographies
4444

45-
During tenant creation (for example, signing up for Office 365 or Azure, or creating more Azure AD instances through the Azure portal) you select a country as the primary location. Azure AD maps the selection to a logical region and a single scale unit in it. Tenant location can’t be changed after it’s set.
45+
During tenant creation (for example, signing up for Office 365 or Azure, or creating more Azure AD instances through the Azure portal) you select a country/region as the primary location. Azure AD maps the selection to a logical region and a single scale unit in it. Tenant location can’t be changed after it’s set.
4646

4747
## Azure AD cloud solution models
4848

4949
Use the following table to see Azure AD cloud solution models based on infrastructure, data location, and operation sovereignty.
5050

5151
|Model|Model regions|Data location|Operations personnel|Customer support|Put a tenant in this model|
5252
|---|---|---|---|---|---|
53-
|Regional (2)|North America, EMEA, Japan|At rest, in the target region. Exceptions by service or feature|Operated by Microsoft. Microsoft datacenter personnel must pass a background check.|Microsoft, globally|Create the tenant in the sign-up experience. Choose the country in the residency.|
54-
|Worldwide|Worldwide||Operated by Microsoft. Microsoft datacenter personnel must pass a background check.|Microsoft, globally|Create the tenant in the sign-up experience. Choose a country without a regional model.|
53+
|Regional (2)|North America, EMEA, Japan|At rest, in the target region. Exceptions by service or feature|Operated by Microsoft. Microsoft datacenter personnel must pass a background check.|Microsoft, globally|Create the tenant in the sign-up experience. Choose the country/region in the residency.|
54+
|Worldwide|Worldwide||Operated by Microsoft. Microsoft datacenter personnel must pass a background check.|Microsoft, globally|Create the tenant in the sign-up experience. Choose a country/region without a regional model.|
5555
|Sovereign or national clouds|US government, China|At rest, in the target country or region. No exceptions.|Operated by a data custodian (1). Personnel are screened according to requirements.|Microsoft, country or region|Each national cloud instance has a sign-up experience.
5656

5757
**Table references**:

articles/aks/node-access.md

Lines changed: 53 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -80,6 +80,10 @@ To connect to another node in the cluster, use the `kubectl debug` command. For
8080

8181
To create the SSH connection to the Windows Server node from another node, use the SSH keys provided when you created the AKS cluster and the internal IP address of the Windows Server node.
8282

83+
> [!IMPORTANT]
84+
>
85+
> The following steps for creating the SSH connection to the Windows Server node from another node can only be used if you created your AKS cluster using the Azure CLI and the `--generate-ssh-keys` parameter. If you didn't use this method to create your cluster, you'll use a password instead of an SSH key. To do this, see [Create the SSH connection to a Windows node using a password](#create-the-ssh-connection-to-a-windows-node-using-a-password)
86+
8387
Open a new terminal window and use the `kubectl get pods` command to get the name of the pod started by `kubectl debug`.
8488

8589
```bash
@@ -155,6 +159,54 @@ azureuser@aksnpwin000000 C:\Users\azureuser>
155159
> ssh -o 'ProxyCommand ssh -p 2022 -W %h:%p [email protected]' -o PreferredAuthentications=password [email protected]
156160
> ```
157161
162+
### Create the SSH connection to a Windows node using a password
163+
164+
If you didn't create your AKS cluster using the Azure CLI and the `--generate-ssh-keys` parameter, you'll use a password instead of an SSH key to create the SSH connection. To do this with Azure CLI, use the following steps:
165+
166+
1. Create a root user called `azureuser`.
167+
168+
```azurecli
169+
az vmss update -g <nodeRG> -n <vmssName> --set virtualMachineProfile.osProfile.adminUsername=azureuser
170+
```
171+
172+
2. Create a password for the new root user.
173+
174+
```azurecli
175+
az vmss update -g <nodeRG> -n <vmssName> --set virtualMachineProfile.osProfile.adminPassword=<new password>
176+
```
177+
178+
3. Update the instances to use the above changes.
179+
180+
```azurecli
181+
az vmss update-instances -g <nodeRG> -n <vmssName> --instance-ids '*'
182+
```
183+
184+
4. Reimage the affected nodes so you can connect using your new credentials.
185+
186+
```azurecli
187+
az vmss reimage -g <nodeRG> -n <vmssName> --instance-id <affectedNodeInstanceId>
188+
```
189+
190+
5. Use `kubectl debug` to connect to another node.
191+
192+
```azurecli
193+
kubectl debug node/<nodeName> -it --image=mcr.microsoft.com/dotnet/runtime-deps:6.0
194+
```
195+
196+
6. Open a second terminal to use port forwarding to connect the debug pod to your local computer.
197+
198+
```azurecli
199+
kubectl port-forward <debugPodName> 2022:22
200+
```
201+
202+
7. Open a third terminal to get the `INTERNAL-IP` of the affected node to initiate the SSH connection. You can get this with `kubectl get nodes -o wide`. Once you have it, use the following command to connect.
203+
204+
```azurecli
205+
ssh -o 'ProxyCommand ssh -p 2022 -W %h:%p [email protected]' azureuser@<affectedNodeIp>
206+
```
207+
208+
8. Enter your password.
209+
158210
### Remove SSH access
159211
160212
When done, `exit` the SSH session, stop any port forwarding, and then `exit` the interactive container session. After the interactive container session closes, delete the pod used for SSH access using the `kubectl delete pod` command.
@@ -166,6 +218,7 @@ kubectl delete pod node-debugger-aks-nodepool1-12345678-vmss000000-bkmmx
166218
## Update SSH key on an existing AKS cluster (preview)
167219

168220
### Prerequisites
221+
169222
* Before you start, ensure the Azure CLI is installed and configured. If you need to install or upgrade, see [Install Azure CLI][install-azure-cli].
170223
* The aks-preview extension version 0.5.111 or later. To learn how to install an Azure extension, see [How to install extensions][how-to-install-azure-extensions].
171224

articles/aks/supported-kubernetes-versions.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ The Kubernetes community releases minor versions roughly every three months. Rec
1515
Minor version releases include new features and improvements. Patch releases are more frequent (sometimes weekly) and are intended for critical bug fixes within a minor version. Patch releases include fixes for security vulnerabilities or major bugs.
1616

1717
>[!WARNING]
18-
> AKS clusters with Calico enabled should not upgrade to Kubernetes v1.25 preview.
18+
> Due to an issue with Calico and AKS. It is highly reccomended that customers using Calico do not upgrade or create new clusters on v1.25.
1919
2020
## Kubernetes versions
2121

articles/app-service/index.yml

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ metadata:
77
title: Azure App Service documentation
88
description: Host websites, web apps, RESTful APIs, and mobile back ends in Azure App Service. Find quickstarts, tutorials, and samples to help you succeed with App Service.
99
ms.topic: landing-page
10-
ms.author: cephalin
10+
ms.author: msangapu
1111
ms.service: app-service
1212
ms.date: 01/14/2022
1313

@@ -39,6 +39,8 @@ landingContent:
3939
url: quickstart-nodejs.md
4040
- text: Deploy a PHP web app
4141
url: quickstart-php.md
42+
- text: Deploy a Go app (experimental)
43+
url: quickstart-golang.md
4244
- text: Deploy a Java app
4345
url: quickstart-java.md
4446
- text: Create a WordPress site
@@ -227,4 +229,4 @@ landingContent:
227229
- linkListType: tutorial
228230
links:
229231
- text: Set up an Azure Arc-enabled Kubernetes cluster to run App Service, Functions, and Logic Apps (Preview)
230-
url: manage-create-arc-environment.md
232+
url: manage-create-arc-environment.md

articles/automation/how-to/private-link-security.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ For more information, see [Key Benefits of Private Link](../../private-link/pri
4242
- In the current implementation of Private Link, Automation account cloud jobs cannot access Azure resources that are secured using private endpoint. For example, Azure Key Vault, Azure SQL, Azure Storage account, etc. To workaround this, use a [Hybrid Runbook Worker](../automation-hybrid-runbook-worker.md) instead. Hence, on-premises VMs are supported to run Hybrid Runbook Workers against an Automation Account with Private Link enabled.
4343
- You need to use the latest version of the [Log Analytics agent](../../azure-monitor/agents/log-analytics-agent.md) for Windows or Linux.
4444
- The [Log Analytics Gateway](../../azure-monitor/agents/gateway.md) does not support Private Link.
45-
- Azure alert (metric, log, and activity log) can't to be used to trigger an Automation webhook when the Automation account is configured with **Public access** set to **Disable**.
45+
- Azure alert (metric, log, and activity log) can't be used to trigger an Automation webhook when the Automation account is configured with **Public access** set to **Disable**.
4646

4747
## How it works
4848

articles/azure-app-configuration/TOC.yml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -117,6 +117,8 @@
117117
items:
118118
- name: Azure CLI
119119
href: cli-samples.md
120+
- name: Azure PowerShell
121+
href: powershell-samples.md
120122
- name: Python SDK
121123
href: quickstart-python.md
122124
- name: Samples on GitHub

0 commit comments

Comments
 (0)