Skip to content

Commit 327c37c

Browse files
authored
Merge pull request #222775 from MicrosoftDocs/main
1/03 AM Publish
2 parents e46d311 + 8f5cb65 commit 327c37c

File tree

120 files changed

+2376
-1059
lines changed

Some content is hidden

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

120 files changed

+2376
-1059
lines changed

.openpublishing.redirection.json

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18333,6 +18333,11 @@
1833318333
"redirect_url": "/azure/sentinel/normalization-schema-dns",
1833418334
"redirect_document_id": true
1833518335
},
18336+
{
18337+
"source_path_from_root": "/articles/sentinel/file-event-normalization-schema.md",
18338+
"redirect_url": "/azure/sentinel/normalization-schema-file-event",
18339+
"redirect_document_id": true
18340+
},
1833618341
{
1833718342
"source_path_from_root": "/articles/service-bus/index.md",
1833818343
"redirect_url": "/azure/service-bus-messaging/index",

articles/active-directory/authentication/howto-authentication-use-email-signin.md

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ services: active-directory
66
ms.service: active-directory
77
ms.subservice: authentication
88
ms.topic: how-to
9-
ms.date: 06/17/2022
9+
ms.date: 01/03/2023
1010

1111
ms.author: justinha
1212
author: calui
@@ -66,7 +66,6 @@ In the current preview state, the following limitations apply to email as an alt
6666
* [Resource Owner Password Credentials (ROPC)](../develop/v2-oauth-ropc.md)
6767
* Legacy authentication such as POP3 and SMTP
6868
* Skype for Business
69-
* Microsoft 365 Admin Portal
7069

7170
* **Unsupported apps** - Some third-party applications may not work as expected if they assume that the `unique_name` or `preferred_username` claims are immutable or will always match a specific user attribute, such as UPN.
7271

articles/active-directory/develop/msal-migration.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ If any of your applications use the Azure Active Directory Authentication Librar
2929
3030
## Why switch to MSAL?
3131

32-
To understand 'Why MSAL?', it's important to first understand the differences between Microsoft identity platform (v2.0) and Azure Active Directory (v1.0) endpoints. The v1.0 endpoint is used by Azure AD Authentication Library (ADAL) while the v2.0 endpoint is used by Microsoft Authentication Library (MSAL). If you've developed apps against the v1.0 endpoint in the past, you're likely using ADAL. Since the v2.0 endpoint has changed significantly enough, the new library (MSAL) was built for the new endpoint entirely.
32+
If you've developed apps against Azure Active Directory (v1.0) endpoint in the past, you're likely using ADAL. Since Microsoft identity platform (v2.0) endpoint has changed significantly enough, the new library (MSAL) was built for the new endpoint entirely.
3333

3434
The following diagram shows the v2.0 vs v1.0 endpoint experience at a high level, including the app registration experience, SDKs, endpoints, and supported identities.
3535

articles/active-directory/external-identities/azure-ad-account.md

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
---
22

3-
title: Azure AD Account identity provider
4-
description: Use Azure Active Directory to enable an external user (guest) to sign in to your Azure AD apps with their Azure AD work account.
3+
title: Add Azure AD Account as an identity provider
4+
description: Use Azure Active Directory to enable an external user (guest) to sign in to your Azure AD apps with their Azure AD work or school account.
55

66
services: active-directory
77
ms.service: active-directory
@@ -19,7 +19,7 @@ ms.custom: engagement-fy23
1919

2020
# Add Azure Active Directory (Azure AD) as an identity provider for External Identities
2121

22-
Azure Active Directory is available as an identity provider option for [B2B collaboration](what-is-b2b.md) by default. If an external guest user has an Azure AD account through work or school, they can redeem your B2B collaboration invitations or complete your sign-up user flows using their Azure AD account.
22+
Azure Active Directory is available as an identity provider option for [B2B collaboration](what-is-b2b.md#integrate-with-identity-providers) by default. If an external guest user has an Azure AD account through work or school, they can redeem your B2B collaboration invitations or complete your sign-up user flows using their Azure AD account.
2323

2424
## Guest sign-in using Azure Active Directory accounts
2525

@@ -29,7 +29,7 @@ Azure Active Directory is available in the list of External Identities identity
2929

3030
### Azure AD account in the invitation flow
3131

32-
When you [invite a guest user](add-users-administrator.md) to B2B collaboration, you can specify their Azure AD account as the email address they'll use to sign in.
32+
When you [invite a guest user](add-users-administrator.md) to B2B collaboration, you can specify their Azure AD account as the **Email address** they'll use to sign in.
3333

3434
:::image type="content" source="media/azure-ad-account/azure-ad-account-invite.png" alt-text="Screenshot of inviting a guest user using the Azure AD account." lightbox="media/azure-ad-account/azure-ad-account-invite.png":::
3535

articles/active-directory/managed-identities-azure-resources/overview.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ While developers can securely store the secrets in [Azure Key Vault](../../key-v
2727

2828
The following video shows how you can use managed identities:</br>
2929

30-
> [!VIDEO https://learn.microsoft.com/Shows/On-NET/Using-Azure-Managed-identities/player?format=ny]
30+
> [!VIDEO https://learn-video.azurefd.net/vod/player?show=on-net&ep=using-azure-managed-identities]
3131
3232
Here are some of the benefits of using managed identities:
3333

articles/aks/azure-blob-csi.md

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -221,6 +221,7 @@ To have a storage volume persist for your workload, you can use a StatefulSet. T
221221
[csi-specification]: https://github.com/container-storage-interface/spec/blob/master/spec.md
222222
[csi-blob-storage-open-source-driver]: https://github.com/kubernetes-sigs/blob-csi-driver
223223
[csi-blob-storage-open-source-driver-uninstall-steps]: https://github.com/kubernetes-sigs/blob-csi-driver/blob/master/docs/install-csi-driver-master.md#clean-up-blob-csi-driver
224+
[kubectl-get]: https://kubernetes.io/docs/reference/generated/kubectl/kubectl-commands#get
224225

225226
<!-- LINKS - internal -->
226227
[compare-access-with-nfs]: ../storage/common/nfs-comparison.md
@@ -233,3 +234,4 @@ To have a storage volume persist for your workload, you can use a StatefulSet. T
233234
[csi-storage-driver-overview]: csi-storage-drivers.md
234235
[azure-disk-csi-driver]: azure-disk-csi.md
235236
[azure-files-csi-driver]: azure-files-csi.md
237+
[install-azure-cli]: /cli/azure/install_azure_cli

articles/aks/azure-files-csi.md

Lines changed: 60 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -3,14 +3,14 @@ title: Use Container Storage Interface (CSI) driver for Azure Files on Azure Kub
33
description: Learn how to use the Container Storage Interface (CSI) driver for Azure Files in an Azure Kubernetes Service (AKS) cluster.
44
services: container-service
55
ms.topic: article
6-
ms.date: 12/06/2022
6+
ms.date: 01/03/2023
77
author: palma21
88

99
---
1010

1111
# Use Azure Files Container Storage Interface (CSI) driver in Azure Kubernetes Service (AKS)
1212

13-
The Azure Files Container Storage Interface (CSI) driver is a [CSI specification][csi-specification]-compliant driver used by Azure Kubernetes Service (AKS) to manage the lifecycle of Azure Files shares. The CSI is a standard for exposing arbitrary block and file storage systems to containerized workloads on Kubernetes.
13+
The Azure Files Container Storage Interface (CSI) driver is a [CSI specification][csi-specification]-compliant driver used by Azure Kubernetes Service (AKS) to manage the lifecycle of Azure file shares. The CSI is a standard for exposing arbitrary block and file storage systems to containerized workloads on Kubernetes.
1414

1515
By adopting and using CSI, AKS now can write, deploy, and iterate plug-ins to expose new or improve existing storage systems in Kubernetes. Using CSI drivers in AKS avoids having to touch the core Kubernetes code and wait for its release cycles.
1616

@@ -31,7 +31,7 @@ In addition to the original in-tree driver features, Azure Files CSI driver supp
3131

3232
|Name | Meaning | Available Value | Mandatory | Default value
3333
|--- | --- | --- | --- | ---
34-
|skuName | Azure Files storage account type (alias: `storageAccountType`)| `Standard_LRS`, `Standard_ZRS`, `Standard_GRS`, `Standard_RAGRS`, `Standard_RAGZRS`,`Premium_LRS`, `Premium_ZRS` | No | `StandardSSD_LRS`<br> Minimum file share size for Premium account type is 100 GB.<br> ZRS account type is supported in limited regions.<br> NFS file share only supports Premium account type.|
34+
|skuName | Azure Files storage account type (alias: `storageAccountType`)| `Standard_LRS`, `Standard_ZRS`, `Standard_GRS`, `Standard_RAGRS`, `Standard_RAGZRS`,`Premium_LRS`, `Premium_ZRS` | No | `StandardSSD_LRS`<br> Minimum file share size for Premium account type is 100 GiB.<br> ZRS account type is supported in limited regions.<br> NFS file share only supports Premium account type.|
3535
|fsType | File System Type | `ext4`, `ext3`, `ext2`, `xfs`| Yes | `ext4` for Linux|
3636
|location | Specify Azure region where Azure storage account will be created. | `eastus`, `westus`, etc. | No | If empty, driver uses the same location name as current AKS cluster.|
3737
|resourceGroup | Specify the resource group where the Azure Disks will be created | Existing resource group name | No | If empty, driver uses the same resource group name as current AKS cluster.|
@@ -56,7 +56,7 @@ In addition to the original in-tree driver features, Azure Files CSI driver supp
5656
|--- | **Following parameters are only for NFS protocol** | --- | --- |
5757
|rootSquashType | Specify root squashing behavior on the share. The default is `NoRootSquash` | `AllSquash`, `NoRootSquash`, `RootSquash` | No |
5858
|mountPermissions | Mounted folder permissions. The default is `0777`. If set to `0`, driver doesn't perform `chmod` after mount | `0777` | No |
59-
|--- | **Following parameters are only for vnet setting, e.g. NFS, private end point** | --- | --- |
59+
|--- | **Following parameters are only for vnet setting, e.g. NFS, private endpoint** | --- | --- |
6060
|vnetResourceGroup | Specify Vnet resource group where virtual network is defined. | Existing resource group name. | No | If empty, driver uses the `vnetResourceGroup` value in Azure cloud config file. |
6161
|vnetName | Virtual network name | Existing virtual network name. | No | If empty, driver uses the `vnetName` value in Azure cloud config file. |
6262
|subnetName | Subnet name | Existing subnet name of the agent node. | No | If empty, driver uses the `subnetName` value in Azure cloud config file. |
@@ -83,7 +83,7 @@ A storage class is used to define how an Azure file share is created. A storage
8383
* **Premium_ZRS**: Premium zone-redundant storage
8484

8585
> [!NOTE]
86-
> Azure Files supports Azure Premium Storage. The minimum premium file share is 100 GB.
86+
> Azure Files supports Azure Premium Storage. The minimum premium file share capacity is 100 GiB.
8787
8888
When you use storage CSI drivers on AKS, there are two more built-in `StorageClasses` that use the Azure Files CSI storage drivers. The other CSI storage classes are created with the cluster alongside the in-tree default storage classes.
8989

@@ -231,7 +231,7 @@ You can request a larger volume for a PVC. Edit the PVC object, and specify a la
231231
> [!NOTE]
232232
> A new PV is never created to satisfy the claim. Instead, an existing volume is resized.
233233
234-
In AKS, the built-in `azurefile-csi` storage class already supports expansion, so use the [PVC created earlier with this storage class](#dynamically-create-azure-files-pvs-by-using-the-built-in-storage-classes). The PVC requested a 100Gi file share. We can confirm that by running:
234+
In AKS, the built-in `azurefile-csi` storage class already supports expansion, so use the [PVC created earlier with this storage class](#dynamically-create-azure-files-pvs-by-using-the-built-in-storage-classes). The PVC requested a 100GiB file share. We can confirm that by running:
235235

236236
```bash
237237
kubectl exec -it nginx-azurefile -- df -h /mnt/azurefile
@@ -276,7 +276,7 @@ If your Azure Files resources are protected with a private endpoint, you must cr
276276
* `storageAccount`: The storage account name.
277277
* `server`: The FQDN of the storage account's private endpoint (for example, `<storage account name>.privatelink.file.core.windows.net`).
278278

279-
Create a file named *private-azure-file-sc.yaml*, and then paste the following example manifest in the file. Replace the values for `<resourceGroup>` and `<storageAccountName>`.
279+
Create a file named `private-azure-file-sc.yaml`, and then paste the following example manifest in the file. Replace the values for `<resourceGroup>` and `<storageAccountName>`.
280280

281281
```yaml
282282
apiVersion: storage.k8s.io/v1
@@ -314,7 +314,7 @@ The output of the command resembles the following example:
314314
storageclass.storage.k8s.io/private-azurefile-csi created
315315
```
316316

317-
Create a file named *private-pvc.yaml*, and then paste the following example manifest in the file:
317+
Create a file named `private-pvc.yaml`, and then paste the following example manifest in the file:
318318

319319
```yaml
320320
apiVersion: v1
@@ -342,10 +342,13 @@ kubectl apply -f private-pvc.yaml
342342

343343
This option is optimized for random access workloads with in-place data updates and provides full POSIX file system support. This section shows you how to use NFS shares with the Azure File CSI driver on an AKS cluster.
344344

345-
### Prerequsites
345+
### Prerequisites
346346

347-
- Your AKS clusters service principal or managed identity must be added to the Contributor role to the storage account.
348347
- Your AKS cluster *Control plane* identity (that is, your AKS cluster name) is added to the [Contributor](../role-based-access-control/built-in-roles.md#contributor) role in the resource group hosting the VNet.
348+
- Your AKS cluster's service principal or managed service identity (MSI) must be added to the Contributor role to the storage account.
349+
350+
> [!NOTE]
351+
> You can use a private endpoint instead of allowing access to the selected VNet.
349352
350353
### Create NFS file share storage class
351354

@@ -376,10 +379,53 @@ storageclass.storage.k8s.io/azurefile-csi-nfs created
376379

377380
### Create a deployment with an NFS-backed file share
378381

379-
You can deploy an example [stateful set](https://github.com/kubernetes-sigs/azurefile-csi-driver/blob/master/deploy/example/nfs/statefulset.yaml) that saves timestamps into a file `data.txt` by deploying the following command with the [kubectl apply][kubectl-apply] command:
382+
You can deploy an example **stateful set** that saves timestamps into a file `data.txt` with the [kubectl apply][kubectl-apply] command:
380383

381384
```bash
382-
kubectl apply -f https://raw.githubusercontent.com/kubernetes-sigs/azurefile-csi-driver/master/deploy/example/nfs/statefulset.yaml
385+
kubectl apply -f
386+
387+
apiVersion: apps/v1
388+
kind: StatefulSet
389+
metadata:
390+
name: statefulset-azurefile
391+
labels:
392+
app: nginx
393+
spec:
394+
podManagementPolicy: Parallel # default is OrderedReady
395+
serviceName: statefulset-azurefile
396+
replicas: 1
397+
template:
398+
metadata:
399+
labels:
400+
app: nginx
401+
spec:
402+
nodeSelector:
403+
"kubernetes.io/os": linux
404+
containers:
405+
- name: statefulset-azurefile
406+
image: mcr.microsoft.com/oss/nginx/nginx:1.19.5
407+
command:
408+
- "/bin/bash"
409+
- "-c"
410+
- set -euo pipefail; while true; do echo $(date) >> /mnt/azurefile/outfile; sleep 1; done
411+
volumeMounts:
412+
- name: persistent-storage
413+
mountPath: /mnt/azurefile
414+
updateStrategy:
415+
type: RollingUpdate
416+
selector:
417+
matchLabels:
418+
app: nginx
419+
volumeClaimTemplates:
420+
- metadata:
421+
name: persistent-storage
422+
annotations:
423+
volume.beta.kubernetes.io/storage-class: azurefile-csi-nfs
424+
spec:
425+
accessModes: ["ReadWriteMany"]
426+
resources:
427+
requests:
428+
storage: 100Gi
383429
```
384430

385431
The output of the command resembles the following example:
@@ -405,7 +451,7 @@ accountname.file.core.windows.net:/accountname/pvc-fa72ec43-ae64-42e4-a8a2-55660
405451
```
406452

407453
> [!NOTE]
408-
> Note that since NFS file share is in Premium account, the minimum file share size is 100GB. If you create a PVC with a small storage size, you might encounter an error similar to the following: *failed to create file share ... size (5)...*.
454+
> Note that because the NFS file share is in a Premium account, the minimum file share size is 100 GiB. If you create a PVC with a small storage size, you might encounter an error similar to the following: *failed to create file share ... size (5)...*.
409455
410456
## Windows containers
411457

@@ -442,7 +488,7 @@ The output of the commands resembles the following example:
442488
## Next steps
443489

444490
- To learn how to use CSI driver for Azure Disks, see [Use Azure Disks with CSI driver][azure-disk-csi].
445-
- To learn how to use CSI driver for Azure Blob storage (preview), see [Use Azure Blob storage with CSI driver][azure-blob-csi] (preview).
491+
- To learn how to use CSI driver for Azure Blob storage, see [Use Azure Blob storage with CSI driver][azure-blob-csi].
446492
- For more about storage best practices, see [Best practices for storage and backups in Azure Kubernetes Service][operator-best-practices-storage].
447493

448494
<!-- LINKS - external -->

articles/aks/use-kms-etcd-encryption.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ The following limitations apply when you integrate KMS etcd encryption with AKS:
3535
* The maximum number of secrets that a cluster enabled with KMS supports is 2,000.
3636
* Bring your own (BYO) Azure Key Vault from another tenant isn't supported.
3737
* With KMS enabled, you can't change associated Azure Key Vault model (public, private). To [change associated key vault mode][changing-associated-key-vault-mode], you need to disable and enable KMS again.
38-
* If a cluster is enabled KMS with private key vault and not using `VNet integration` tunnel, then stop/start cluster is not allowed.
38+
* If a cluster is enabled KMS with private key vault and not using the `API Server VNet integration` tunnel, then stop/start cluster is not allowed.
3939

4040
KMS supports [public key vault][Enable-KMS-with-public-key-vault] and [private key vault][Enable-KMS-with-private-key-vault].
4141

articles/app-service/tutorial-multi-container-app.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -203,7 +203,7 @@ To connect the WordPress app to this new MySQL server, you'll configure a few Wo
203203
To make these changes, use the [az webapp config appsettings set](/cli/azure/webapp/config/appsettings#az-webapp-config-appsettings-set) command in Cloud Shell. App settings are case-sensitive and space-separated.
204204

205205
```azurecli-interactive
206-
az webapp config appsettings set --resource-group myResourceGroup --name <app-name> --settings WORDPRESS_DB_HOST="<mysql-server-name>.mysql.database.azure.com" WORDPRESS_DB_USER="adminuser@<mysql-server-name>" WORDPRESS_DB_PASSWORD="My5up3rStr0ngPaSw0rd!" WORDPRESS_DB_NAME="wordpress" MYSQL_SSL_CA="BaltimoreCyberTrustroot.crt.pem"
206+
az webapp config appsettings set --resource-group myResourceGroup --name <app-name> --settings WORDPRESS_DB_HOST="<mysql-server-name>.mysql.database.azure.com" WORDPRESS_DB_USER="adminuser" WORDPRESS_DB_PASSWORD="My5up3rStr0ngPaSw0rd!" WORDPRESS_DB_NAME="wordpress" MYSQL_SSL_CA="BaltimoreCyberTrustroot.crt.pem"
207207
```
208208

209209
When the app setting has been created, Cloud Shell shows information similar to the following example:
@@ -218,7 +218,7 @@ When the app setting has been created, Cloud Shell shows information similar to
218218
{
219219
"name": "WORDPRESS_DB_USER",
220220
"slotSetting": false,
221-
"value": "adminuser@&lt;mysql-server-name&gt;"
221+
"value": "adminuser"
222222
},
223223
{
224224
"name": "WORDPRESS_DB_NAME",
@@ -424,7 +424,7 @@ When the app setting has been created, Cloud Shell shows information similar to
424424
{
425425
"name": "WORDPRESS_DB_USER",
426426
"slotSetting": false,
427-
"value": "adminuser@&lt;mysql-server-name&gt;"
427+
"value": "adminuser"
428428
},
429429
{
430430
"name": "WP_REDIS_HOST",

articles/azure-functions/functions-reference-powershell.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ At the root of the project, there's a shared [`host.json`](functions-host-json.m
5151

5252
Certain bindings require the presence of an `extensions.csproj` file. Binding extensions, required in [version 2.x and later versions](functions-versions.md) of the Functions runtime, are defined in the `extensions.csproj` file, with the actual library files in the `bin` folder. When developing locally, you must [register binding extensions](functions-bindings-register.md#extension-bundles). When developing functions in the Azure portal, this registration is done for you.
5353

54-
In PowerShell Function Apps, you may optionally have a `profile.ps1` which runs when a function app starts to run (otherwise know as a *[cold start](#cold-start)*. For more information, see [PowerShell profile](#powershell-profile).
54+
In PowerShell Function Apps, you may optionally have a `profile.ps1` which runs when a function app starts to run (otherwise know as a *[cold start](#cold-start)*). For more information, see [PowerShell profile](#powershell-profile).
5555

5656
## Defining a PowerShell script as a function
5757

0 commit comments

Comments
 (0)