Skip to content

Commit 2314e47

Browse files
committed
Merging changes synced from https://github.com/MicrosoftDocs/azure-docs-pr (branch live)
2 parents 0fbb2aa + 13ae58d commit 2314e47

File tree

66 files changed

+1213
-249
lines changed

Some content is hidden

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

66 files changed

+1213
-249
lines changed

.openpublishing.redirection.json

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2385,9 +2385,14 @@
23852385
},
23862386
{
23872387
"source_path_from_root": "/articles/aks/aks-ssh.md",
2388-
"redirect_url": "/azure/aks/ssh",
2388+
"redirect_url": "/azure/aks/node-access",
23892389
"redirect_document_id": true
23902390
},
2391+
{
2392+
"source_path_from_root": "/articles/aks/ssh.md",
2393+
"redirect_url": "/azure/aks/node-access",
2394+
"redirect_document_id": false
2395+
},
23912396
{
23922397
"source_path_from_root": "/articles/aks/windows-node-limitations.md",
23932398
"redirect_url": "/azure/aks/windows-faq",

articles/active-directory-b2c/tutorial-create-user-flows.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ manager: CelesteDG
88
ms.service: active-directory
99
ms.workload: identity
1010
ms.topic: tutorial
11-
ms.date: 10/18/2021
11+
ms.date: 03/01/2022
1212
ms.author: kengaderdus
1313
ms.subservice: B2C
1414
zone_pivot_groups: b2c-policy-type
@@ -274,7 +274,7 @@ Add the application IDs to the extensions file *TrustFrameworkExtensions.xml*.
274274

275275
## Add Facebook as an identity provider
276276

277-
The **SocialAndLocalAccounts** starter pack includes Facebook social sign in. Facebook is *not* required for using custom policies, but we use it here to demonstrate how you can enable federated social login in a custom policy.
277+
The **SocialAndLocalAccounts** starter pack includes Facebook social sign in. Facebook is *not* required for using custom policies, but we use it here to demonstrate how you can enable federated social login in a custom policy. If you don't need to enable federated social login, use the **LocalAccounts** starter pack instead, and skip [Add Facebook as an identity provider](tutorial-create-user-flows.md?pivots=b2c-custom-policy#add-facebook-as-an-identity-provider) section.
278278

279279
### Create Facebook application
280280

articles/active-directory/cloud-sync/how-to-install.md

Lines changed: 24 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ manager: karenhoran
77
ms.service: active-directory
88
ms.workload: identity
99
ms.topic: how-to
10-
ms.date: 01/31/2021
10+
ms.date: 03/01/2022
1111
ms.subservice: hybrid
1212
ms.author: billmath
1313
ms.collection: M365-identity-device-management
@@ -108,6 +108,29 @@ By default, the Azure Active Directory (Azure AD) Connect provisioning agent ins
108108
- In step #7 above, instead of click **Open file**, go to start run and navigate to the **AADConnectProvisioningAgentSetup.exe** file. In the run box, after the executable, enter **ENVIRONMENTNAME=AzureUSGovernment** and click **Ok**.
109109
[![Screenshot showing US govt cloud install](media/how-to-install/new-install-12.png)](media/how-to-install/new-install-12.png#lightbox)</br>
110110

111+
## Password hash synchronization and FIPS with cloud sync
112+
If your server has been locked down according to Federal Information Processing Standard (FIPS), then MD5 is disabled.
113+
114+
**To enable MD5 for password hash synchronization, perform the following steps:**
115+
116+
1. Go to %programfiles%\Microsoft Azure AD Connect Provisioning Agent.
117+
2. Open AADConnectProvisioningAgent.exe.config.
118+
3. Go to the configuration/runtime node at the top of the file.
119+
4. Add the following node: `<enforceFIPSPolicy enabled="false"/>`
120+
5. Save your changes.
121+
122+
For reference, this snippet is what it should look like:
123+
124+
```
125+
<configuration>
126+
<runtime>
127+
<enforceFIPSPolicy enabled="false"/>
128+
</runtime>
129+
</configuration>
130+
```
131+
132+
For information about security and FIPS, see [Azure AD password hash sync, encryption, and FIPS compliance](https://blogs.technet.microsoft.com/enterprisemobility/2014/06/28/aad-password-sync-encryption-and-fips-compliance/).
133+
111134

112135
## Next steps
113136

articles/active-directory/devices/enterprise-state-roaming-windows-settings-reference.md

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ services: active-directory
66
ms.service: active-directory
77
ms.subservice: devices
88
ms.topic: reference
9-
ms.date: 02/25/2022
9+
ms.date: 03/01/2022
1010

1111
ms.author: joflore
1212
author: MicrosoftGuyJFlo
@@ -30,6 +30,10 @@ List of settings that can be configured to sync in recent Windows versions. Thes
3030
| Date, Time, and Region: region format (locale) | sync |
3131
| Language: language profile | sync |
3232
| Language: list of keyboards | sync |
33+
| Mouse: Primary Mouse Button | sync |
34+
| Passwords: Web Credentials | sync |
35+
| Pen: Pen Handedness | sync |
36+
| Touchpad: Scrolling Direction | sync |
3337
| Wi-Fi: Wi-Fi profiles (only WPA) | sync |
3438

3539
## Browser settings

articles/active-directory/fundamentals/whats-new.md

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -154,11 +154,11 @@ Identity Protection has added two new detections from Microsoft Defender for Clo
154154

155155
You can now automate creating, updating, and deleting user accounts for these newly integrated apps:
156156

157-
[BullseyeTDP](../saas-apps/bullseyetdp-provisioning-tutorial.md)
158-
[GitHub Enterprise Managed User (OIDC)](../saas-apps/github-enterprise-managed-user-oidc-provisioning-tutorial.md)
159-
[Gong](../saas-apps/gong-provisioning-tutorial.md)
160-
[LanSchool Air](../saas-apps/lanschool-air-provisioning-tutorial.md)
161-
[ProdPad](../saas-apps/prodpad-provisioning-tutorial.md)
157+
- [BullseyeTDP](../saas-apps/bullseyetdp-provisioning-tutorial.md)
158+
- [GitHub Enterprise Managed User (OIDC)](../saas-apps/github-enterprise-managed-user-oidc-provisioning-tutorial.md)
159+
- [Gong](../saas-apps/gong-provisioning-tutorial.md)
160+
- [LanSchool Air](../saas-apps/lanschool-air-provisioning-tutorial.md)
161+
- [ProdPad](../saas-apps/prodpad-provisioning-tutorial.md)
162162
For more information about how to better secure your organization by using automated user account provisioning, see [Automate user provisioning to SaaS applications with Azure AD](../app-provisioning/user-provisioning.md).
163163

164164

articles/aks/TOC.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -473,8 +473,8 @@
473473
items:
474474
- name: Common issues
475475
href: troubleshooting.md
476-
- name: SSH node access
477-
href: ssh.md
476+
- name: Node access
477+
href: node-access.md
478478
- name: Linux performance tools
479479
href: troubleshoot-linux.md
480480
- name: Check for Resource Health events (preview)

articles/aks/ssh.md renamed to articles/aks/node-access.md

Lines changed: 29 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,20 @@
11
---
2-
title: SSH into Azure Kubernetes Service (AKS) cluster nodes
3-
description: Learn how to create an SSH connection with Azure Kubernetes Service (AKS) cluster nodes for troubleshooting and maintenance tasks.
2+
title: Connect to Azure Kubernetes Service (AKS) cluster nodes
3+
description: Learn how to connect to Azure Kubernetes Service (AKS) cluster nodes for troubleshooting and maintenance tasks.
44
services: container-service
55
ms.topic: article
6-
ms.date: 05/17/2021
6+
ms.date: 02/25/2022
77

88
ms.custom: contperf-fy21q4
99

10-
#Customer intent: As a cluster operator, I want to learn how to use SSH to connect to virtual machines in an AKS cluster to perform maintenance or troubleshoot a problem.
10+
#Customer intent: As a cluster operator, I want to learn how to connect to virtual machines in an AKS cluster to perform maintenance or troubleshoot a problem.
1111
---
1212

13-
# Connect with SSH to Azure Kubernetes Service (AKS) cluster nodes for maintenance or troubleshooting
13+
# Connect to Azure Kubernetes Service (AKS) cluster nodes for maintenance or troubleshooting
1414

15-
Throughout the lifecycle of your Azure Kubernetes Service (AKS) cluster, you may need to access an AKS node. This access could be for maintenance, log collection, or other troubleshooting operations. You can access AKS nodes using SSH, including Windows Server nodes. You can also [connect to Windows Server nodes using remote desktop protocol (RDP) connections][aks-windows-rdp]. For security purposes, the AKS nodes aren't exposed to the internet. To SSH to the AKS nodes, you use `kubectl debug` or the private IP address.
15+
Throughout the lifecycle of your Azure Kubernetes Service (AKS) cluster, you may need to access an AKS node. This access could be for maintenance, log collection, or other troubleshooting operations. You can access AKS nodes using SSH, including Windows Server nodes. You can also [connect to Windows Server nodes using remote desktop protocol (RDP) connections][aks-windows-rdp]. For security purposes, the AKS nodes aren't exposed to the internet. To connect to the AKS nodes, you use `kubectl debug` or the private IP address.
1616

17-
This article shows you how to create an SSH connection with an AKS node.
17+
This article shows you how to create a connection to an AKS node.
1818

1919
## Before you begin
2020

@@ -24,9 +24,9 @@ This article also assumes you have an SSH key. You can create an SSH key using [
2424

2525
You also need the Azure CLI version 2.0.64 or later installed and configured. Run `az --version` to find the version. If you need to install or upgrade, see [Install Azure CLI][install-azure-cli].
2626

27-
## Create the SSH connection to a Linux node
27+
## Create an interactive shell connection to a Linux node
2828

29-
To create an SSH connection to an AKS node, use `kubectl debug` to run a privileged container on your node. To list your nodes, use `kubectl get nodes`:
29+
To create an interactive shell connection to a Linux node, use `kubectl debug` to run a privileged container on your node. To list your nodes, use `kubectl get nodes`:
3030

3131
```output
3232
$ kubectl get nodes -o wide
@@ -40,13 +40,13 @@ aksnpwin000000 Ready agent 87s v1.19.9 10.240.0.
4040
Use `kubectl debug` to run a container image on the node to connect to it.
4141

4242
```azurecli-interactive
43-
kubectl debug node/aks-nodepool1-12345678-vmss000000 -it --image=mcr.microsoft.com/aks/fundamental/base-ubuntu:v0.0.11
43+
kubectl debug node/aks-nodepool1-12345678-vmss000000 -it --image=mcr.microsoft.com/dotnet/runtime-deps:6.0
4444
```
4545

46-
This command starts a privileged container on your node and connects to it over SSH.
46+
This command starts a privileged container on your node and connects to it.
4747

4848
```output
49-
$ kubectl debug node/aks-nodepool1-12345678-vmss000000 -it --image=mcr.microsoft.com/aks/fundamental/base-ubuntu:v0.0.11
49+
$ kubectl debug node/aks-nodepool1-12345678-vmss000000 -it --image=mcr.microsoft.com/dotnet/runtime-deps:6.0
5050
Creating debugging pod node-debugger-aks-nodepool1-12345678-vmss000000-bkmmx with container debugger on node aks-nodepool1-12345678-vmss000000.
5151
If you don't see a command prompt, try pressing enter.
5252
root@aks-nodepool1-12345678-vmss000000:/#
@@ -57,11 +57,19 @@ This privileged container gives access to the node.
5757
> [!NOTE]
5858
> You can interact with the node session by running `chroot /host` from the privileged container.
5959
60+
### Remove Linux node access
61+
62+
When done, `exit` the interactive shell session. After the interactive container session closes, delete the pod used for access with `kubectl delete pod`.
63+
64+
```output
65+
kubectl delete pod node-debugger-aks-nodepool1-12345678-vmss000000-bkmmx
66+
```
67+
6068
## Create the SSH connection to a Windows node
6169

62-
At this time, you can't connect to a Windows Server node using SSH directly by using `kubectl debug`. Instead, you need to first connect to another node in the cluster, then connect to the Windows Server node from that node using SSH. Alternatively, you can [connect to Windows Server nodes using remote desktop protocol (RDP) connections][aks-windows-rdp] instead of using SSH.
70+
At this time, you can't connect to a Windows Server node directly by using `kubectl debug`. Instead, you need to first connect to another node in the cluster, then connect to the Windows Server node from that node using SSH. Alternatively, you can [connect to Windows Server nodes using remote desktop protocol (RDP) connections][aks-windows-rdp] instead of using SSH.
6371

64-
To connect to another node in the cluster, use `kubectl debug`. For more information, see [Create the SSH connection to a Linux node][ssh-linux-kubectl-debug].
72+
To connect to another node in the cluster, use `kubectl debug`. For more information, see [Create an interactive shell connection to a Linux node][ssh-linux-kubectl-debug].
6573

6674
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.
6775

@@ -125,9 +133,13 @@ The above example connects to port 22 on the Windows Server node through port 20
125133
> ssh -o 'ProxyCommand ssh -p 2022 -W %h:%p [email protected]' -o PreferredAuthentications=password [email protected]
126134
> ```
127135
128-
## Remove SSH access
136+
### Remove SSH access
137+
138+
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 with `kubectl delete pod`.
129139
130-
When done, `exit` the SSH session, stop any port forwarding, and then `exit` the interactive container session. After the interactive container session closes, the pod used for SSH access from the AKS cluster is deleted.
140+
```output
141+
kubectl delete pod node-debugger-aks-nodepool1-12345678-vmss000000-bkmmx
142+
```
131143
132144
## Next steps
133145

@@ -143,4 +155,4 @@ If you need more troubleshooting data, you can [view the kubelet logs][view-kube
143155
[aks-windows-rdp]: rdp.md
144156
[ssh-nix]: ../virtual-machines/linux/mac-create-ssh-keys.md
145157
[ssh-windows]: ../virtual-machines/linux/ssh-from-windows.md
146-
[ssh-linux-kubectl-debug]: #create-the-ssh-connection-to-a-linux-node
158+
[ssh-linux-kubectl-debug]: #create-an-interactive-shell-connection-to-a-linux-node

articles/api-management/soft-delete.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ Currently, depending on how you delete an API Management instance, the instance
2323
Recovery and other operations on a soft-deleted instance are enabled through [REST API](/rest/api/apimanagement/current-ga/api-management-service/restore) version `2020-06-01-preview` or later, or the Azure SDK for .NET, Go, or Python.
2424

2525
> [!TIP]
26-
> Refer to [Azure REST API Reference](/rest/api/azure/) for tips and tools for calling Azure REST APIs.
26+
> Refer to [Azure REST API Reference](/rest/api/azure/) for tips and tools for calling Azure REST APIs and [API Management REST](/rest/api/apimanagement/) for additional information specific to API Management.
2727
2828
| Operation | Description | API Management namespace | Minimum API version |
2929
|--|--|--|--|

articles/app-service/tutorial-python-postgresql-app.md

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -333,6 +333,9 @@ In your Python code, you access these settings as environment variables with sta
333333

334334
Having issues? Refer first to the [Troubleshooting guide](configure-language-python.md#troubleshooting), otherwise, [let us know](https://aka.ms/DjangoCLITutorialHelp).
335335

336+
> [!NOTE]
337+
> If you want to try an alternative approach to connect your app to the Postgres database in Azure, see the [Service Connector version](../service-connector/tutorial-django-webapp-postgres-cli.md) of this tutorial. Service Connector is a new Azure service that is currently in public preview. [Section 4.2](../service-connector/tutorial-django-webapp-postgres-cli.md#42-configure-environment-variables-to-connect-the-database) of that tutorial introduces a simplified process for creating the connection.
338+
336339
### 4.3 Run Django database migrations
337340

338341
Django database migrations ensure that the schema in the PostgreSQL on Azure database match those described in your code.

articles/azure-functions/functions-app-settings.md

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -360,6 +360,16 @@ Only used when deploying to a Premium plan or to a Consumption plan running on W
360360

361361
When using an Azure Resource Manager template to create a function app during deployment, don't include WEBSITE_CONTENTSHARE in the template. This slot setting is generated during deployment. To learn more, see [Automate resource deployment for your function app](functions-infrastructure-as-code.md?tabs=windows#create-a-function-app).
362362

363+
## WEBSITE\_SKIP\_CONTENTSHARE\_VALIDATION
364+
365+
The WEBSITE_CONTENTAZUREFILECONNECTIONSTRING and WEBSITE_CONTENTSHARE settings have additional validation checks to ensure that the app can be properly started. Creation of application settings will fail if the Function App cannot properly call out to the downstream Storage Account or Key Vault due to networking constraints or other limiting factors. When WEBSITE_SKIP_CONTENTSHARE_VALIDATION is set to `1`, the validation check is skipped; otherwise the value defaults to `0` and the validation will take place.
366+
367+
|Key|Sample value|
368+
|---|------------|
369+
|WEBSITE_SKIP_CONTENTSHARE_VALIDATION|`1`|
370+
371+
If validation is skipped and either the connection string or content share are not valid, the app will be unable to start properly and will only serve HTTP 500 errors.
372+
363373
## WEBSITE\_DNS\_SERVER
364374

365375
Sets the DNS server used by an app when resolving IP addresses. This setting is often required when using certain networking functionality, such as [Azure DNS private zones](functions-networking-options.md#azure-dns-private-zones) and [private endpoints](functions-networking-options.md#restrict-your-storage-account-to-a-virtual-network).

0 commit comments

Comments
 (0)