Skip to content

Commit 5ebe40a

Browse files
authored
Merge pull request #174732 from MicrosoftDocs/master
Merge Master to Live, 4 AM
2 parents 57b7356 + 50fe812 commit 5ebe40a

File tree

111 files changed

+2064
-582
lines changed

Some content is hidden

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

111 files changed

+2064
-582
lines changed

.openpublishing.publish.config.json

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -845,6 +845,7 @@
845845
"articles/purview/.openpublishing.redirection.purview.json",
846846
"articles/service-bus-messaging/.openpublishing.redirection.service-bus-messaging.json",
847847
"articles/stream-analytics/.openpublishing.redirection.stream-analytics.json",
848-
"articles/virtual-machines/.openpublishing.redirection.virtual-machines.json"
848+
"articles/virtual-machines/.openpublishing.redirection.virtual-machines.json",
849+
"articles/mysql/.openpublishing.redirection.mysql.json"
849850
]
850851
}

articles/active-directory-b2c/configure-tokens.md

Lines changed: 6 additions & 1 deletion
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: how-to
11-
ms.date: 09/15/2021
11+
ms.date: 10/08/2021
1212
ms.custom: project-no-code
1313
ms.author: mimart
1414
ms.subservice: B2C
@@ -58,6 +58,11 @@ To configure your user flow token lifetime:
5858
1. Under **Token lifetime**, adjust the properties to fit the needs of your application.
5959
1. Click **Save**.
6060

61+
62+
63+
:::image type="content" source="./media/configure-tokens/configure-tokens.png" alt-text="configure user flows tokens in Azure portal.":::
64+
65+
6166
::: zone-end
6267

6368
::: zone pivot="b2c-custom-policy"
188 KB
Loading

articles/active-directory/governance/entitlement-management-access-package-assignments.md

Lines changed: 31 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ ms.tgt_pltfrm: na
1212
ms.devlang: na
1313
ms.topic: how-to
1414
ms.subservice: compliance
15-
ms.date: 04/12/2021
15+
ms.date: 10/05/2021
1616
ms.author: ajburnle
1717
ms.reviewer:
1818
ms.collection: M365-identity-device-management
@@ -70,7 +70,7 @@ $assignments = Get-MgEntitlementManagementAccessPackageAssignment -AccessPackage
7070
$assignments | ft Id,AssignmentState,TargetId,{$_.Target.DisplayName}
7171
```
7272

73-
## Directly assign a user
73+
## Directly assign a user
7474

7575
In some cases, you might want to directly assign specific users to an access package so that users don't have to go through the process of requesting the access package. To directly assign users, the access package must have a policy that allows administrator direct assignments.
7676

@@ -110,6 +110,35 @@ In some cases, you might want to directly assign specific users to an access pac
110110
> [!NOTE]
111111
> When assigning users to an access package, administrators will need to verify that the users are eligible for that access package based on the existing policy requirements. Otherwise, the users won't successfully be assigned to the access package. If the access package contains a policy that requires user requests to be approved, users can't be directly assigned to the package without necessary approval(s) from the designated approver(s).
112112
113+
## Directly assign any user (Preview)
114+
Azure AD Entitlement Management also allows you to directly assign external users to an access package to make collaborating with partners easier. To do this, the access package must have a policy that allows users not yet in your directory to request access.
115+
116+
**Prerequisite role:** Global administrator, User administrator, Catalog owner, Access package manager or Access package assignment manager
117+
118+
1. In the Azure portal, select **Azure Active Directory** and then select **Identity Governance**.
119+
120+
1. In the left menu, click **Access packages** and then open the access package in which you want to add a user.
121+
122+
1. In the left menu, click **Assignments**.
123+
124+
1. Select **New assignment** to open **Add user to access package**.
125+
126+
1. In the **Select policy** list, select a policy that allows that is set to **For users not in your directory**
127+
128+
1. Select **Any user**. You’ll be able to specify which users you want to assign to this access package.
129+
![Assignments - Add any user to access package](./media/entitlement-management-access-package-assignments/assignments-add-any-user.png)
130+
131+
1. Enter the user’s **Name** (optional) and the user’s **Email address** (required).
132+
133+
> [!NOTE]
134+
> - The user you want to add must be within the scope of the policy. For example, if your policy is set to **Specific connected organizations**, the user’s email address must be from the domain(s) of the selected organization(s). If the user you are trying to add has an email address of jen@*foo.com* but the selected organization’s domain is *bar.com*, you won't be able to add that user to the access package.
135+
> - Similarly, if you set your policy to include **All configured connected organizations**, the user’s email address must be from one of your configured connected organizations. Otherwise, the user won't be added to the access package.
136+
> - If you wish to add any user to the access package, you'll need to ensure that you select **All users (All connected organizations + any external user)** when configuring your policy.
137+
138+
1. Set the date and time you want the selected users' assignment to start and end. If an end date is not provided, the policy's lifecycle settings will be used.
139+
1. Click **Add** to directly assign the selected users to the access package.
140+
1. After a few moments, click **Refresh** to see the users in the Assignments list.
141+
113142
## Directly assigning users programmatically
114143
### Assign a user to an access package with Microsoft Graph
115144
You can also directly assign a user to an access package using Microsoft Graph. A user in an appropriate role with an application that has the delegated `EntitlementManagement.ReadWrite.All` permission, or an application with that application permission, can call the API to [create an accessPackageAssignmentRequest](/graph/api/accesspackageassignmentrequest-post?view=graph-rest-beta&preserve-view=true). In this request, the value of the `requestType` property should be `AdminAdd`, and the `accessPackageAssignment` property is a structure that contains the `targetId` of the user being assigned.
Loading

articles/aks/azure-netapp-files.md

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -3,21 +3,21 @@ title: Integrate Azure NetApp Files with Azure Kubernetes Service | Microsoft Do
33
description: Learn how to provision Azure NetApp Files with Azure Kubernetes Service.
44
services: container-service
55
ms.topic: article
6-
ms.date: 10/04/2021
6+
ms.date: 10/05/2021
77

88
#Customer intent: As a cluster operator or developer, I want to learn how to use Azure NetApp Files to provision volumes for Kubernetes environments.
99
---
1010

1111
# Integrate Azure NetApp Files with Azure Kubernetes Service
1212

13-
A persistent volume represents a piece of storage that has been provisioned for use with Kubernetes pods. A persistent volume can be used by one or many pods, and can be dynamically or statically provisioned. This article shows you how to create [Azure NetApp Files][anf] volumes to be used by pods in an Azure Kubernetes Service (AKS) cluster.
13+
A persistent volume represents a piece of storage that has been provisioned for use with Kubernetes pods. A persistent volume can be used by one or many pods and can be dynamically or statically provisioned. This article shows you how to create [Azure NetApp Files][anf] volumes to be used by pods in an Azure Kubernetes Service (AKS) cluster.
1414

1515
[Azure NetApp Files][anf] is an enterprise-class, high-performance, metered file storage service running on Azure. Kubernetes users have two options when it comes to using Azure NetApp Files volumes for Kubernetes workloads:
1616

17-
* Create Azure NetApp Files volumes **statically**: In this scenario, the creation of volumes is achieved external to AKS; volumes are created using `az`/Azure UI and are then exposed to Kubernetes by the creation of a `PersistentVolume`.
18-
* Create Azure NetApp Files volumes **on-demand**, orchestrating through Kubernetes: This method is the **preferred** mode of operation for creating multiple volumes directly through Kubernetes, and is achieved using [Astra Trident](https://netapp-trident.readthedocs.io/).
17+
* Create Azure NetApp Files volumes **statically**: In this scenario, the creation of volumes is achieved external to AKS; volumes are created using `az`/Azure UI and are then exposed to Kubernetes by the creation of a `PersistentVolume`. Statically created ANF volumes have lots of limitations (for example, inability to be expanded, over-provisioning, and so on) and are not recommended for most use cases.
18+
* Create Azure NetApp Files volumes **on-demand**, orchestrating through Kubernetes: This method is the **preferred** mode of operation for creating multiple volumes directly through Kubernetes and is achieved using [Astra Trident](https://docs.netapp.com/us-en/trident/index.html). Astra Trident is a CSI-compliant dynamic storage orchestrator that helps provision volumes natively through Kubernetes.
1919

20-
A production-ready CSI driver for Kubernetes users to directly consume Azure NetApp Files volumes through AKS is **highly recommended**. This requirement is fulfilled using Astra Trident, an open-source dynamic storage orchestrator for Kubernetes. It is an enterprise-grade storage orchestrator purpose-built for Kubernetes, fully supported by NetApp. It simplifies access to storage across Kubernetes environments by automating storage provisioning. Consumers can take advantage of Astra Trident's CSI driver for Azure NetApp Files to abstract underlying details and create/expand/snapshot volumes on-demand.
20+
Using a CSI driver to directly consume Azure NetApp Files volumes from AKS workloads is **highly recommended** for most use cases. This requirement is fulfilled using Astra Trident, an open-source dynamic storage orchestrator for Kubernetes. Astra Trident is an enterprise-grade storage orchestrator purpose-built for Kubernetes, fully supported by NetApp. It simplifies access to storage across Kubernetes environments by automating storage provisioning. Consumers can take advantage of Astra Trident's CSI driver for Azure NetApp Files to abstract underlying details and create/expand/snapshot volumes on-demand.
2121

2222
## Before you begin
2323

articles/azure-cache-for-redis/cache-aspnet-output-cache-provider.md

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ ms.date: 04/22/2018
1010
---
1111
# ASP.NET Output Cache Provider for Azure Cache for Redis
1212

13-
The Redis Output Cache Provider is an out-of-process storage mechanism for output cache data. This data is specifically for full HTTP responses (page output caching). The provider plugs into the new output cache provider extensibility point that was introduced in ASP.NET 4. For ASP.NET Core applications, read [Response caching in ASP.NET Core](/aspnet/core/performance/caching/response).
13+
The Redis Output Cache Provider is an out-of-process storage mechanism for output cache data. This data is specifically for full HTTP responses (page output caching). The provider plugs into the new output cache provider extensibility point that was introduced in ASP.NET 4. For ASP.NET Core applications, read [Response caching in ASP.NET Core](/aspnet/core/performance/caching/response).
1414

1515
To use the Redis Output Cache Provider, first configure your cache, and then configure your ASP.NET application using the Redis Output Cache Provider NuGet package. This article provides guidance on configuring your application to use the Redis Output Cache Provider. For more information about creating and configuring an Azure Cache for Redis instance, see [Create a cache](cache-dotnet-how-to-use-azure-redis-cache.md#create-a-cache).
1616

@@ -24,10 +24,7 @@ Run the following command from the `Package Manager Console` window.
2424
Install-Package Microsoft.Web.RedisOutputCacheProvider
2525
```
2626

27-
The Redis Output Cache Provider NuGet package has a dependency on the StackExchange.Redis.StrongName package. If the StackExchange.Redis.StrongName package isn't present in your project, it's installed. For more information about the Redis Output Cache Provider NuGet package, see the [RedisOutputCacheProvider](https://www.nuget.org/packages/Microsoft.Web.RedisOutputCacheProvider/) NuGet page.
28-
29-
>[!NOTE]
30-
>In addition to the strong-named StackExchange.Redis.StrongName package, there is also the StackExchange.Redis non-strong-named version. If your project is using the non-strong-named StackExchange.Redis version you must uninstall it; otherwise, you will experience naming conflicts in your project. For more information about these packages, see [Configure .NET cache clients](cache-dotnet-how-to-use-azure-redis-cache.md#configure-the-cache-clients).
27+
The Redis Output Cache Provider NuGet package has a dependency on the StackExchange.Redis package. If the StackExchange.Redis package isn't present in your project, it's installed. For more information about the Redis Output Cache Provider NuGet package, see the [RedisOutputCacheProvider](https://www.nuget.org/packages/Microsoft.Web.RedisOutputCacheProvider/) NuGet page.
3128

3229
The NuGet package downloads and adds the required assembly references and adds the following section into your web.config file. This section contains the required configuration for your ASP.NET application to use the Redis Output Cache Provider.
3330

@@ -50,7 +47,7 @@ Configure the attributes on the left with the values from your cache in the Micr
5047
| --------- | ---- | ------- | ----------- |
5148
| *host* | string | "localhost" | The Redis server IP address or host name |
5249
| *port* | positive integer | 6379 (non-TLS/SSL)<br/>6380 (TLS/SSL) | Redis server port |
53-
| *accessKey* | string | "" | Redis server password when Redis authorization is enabled. The value is an empty string by default, which means the session state provider won’t use any password when connecting to Redis server. **If your Redis server is in a publicly accessible network like Azure Cache for Redis, be sure to enable Redis authorization to improve security, and provide a secure password.** |
50+
| *accessKey* | string | "" | Redis server password when Redis authorization is enabled. The value is an empty string by default, which means the session state provider won’t use any password when it connects to Redis server. **If your Redis server is in a publicly accessible network like Azure Cache for Redis, be sure to enable Redis authorization to improve security, and provide a secure password.** |
5451
| *ssl* | boolean | **false** | Whether to connect to Redis server via TLS. This value is **false** by default because Redis doesn’t support TLS by default. **If you're using Azure Cache for Redis, which supports SSL by default, be sure to set this value to true to improve security.**<br/><br/>The non-TLS port is disabled by default for new caches. Specify **true** for this setting to use the non-TLS port. For more information about enabling the non-TLS port, see the [Access Ports](cache-configure.md#access-ports) section in the [Configure a cache](cache-configure.md) article. |
5552
| *databaseIdNumber* | positive integer | 0 | *This attribute can be specified only through either web.config or AppSettings.*<br/><br/>Specify which Redis database to use. |
5653
| *connectionTimeoutInMilliseconds* | positive integer | Provided by StackExchange.Redis | Used to set *ConnectTimeout* when creating StackExchange.Redis.ConnectionMultiplexer. |

articles/azure-functions/functions-bindings-storage-table-output.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ ms.custom: "devx-track-csharp, devx-track-python"
1313
Use an Azure Table storage output binding to write entities to a table in an Azure Storage account.
1414

1515
> [!NOTE]
16-
> This output binding does not support updating existing entities. Use the `TableOperation.Replace` operation [from the Azure Storage SDK](../cosmos-db/tutorial-develop-table-dotnet.md#delete-an-entity) to update an existing entity.
16+
> This output binding does not support updating existing entities. Use the `TableOperation.Replace` operation [from the Azure Storage SDK](../cosmos-db/table/table-support.md) to update an existing entity.
1717
1818
## Example
1919

articles/azure-monitor/alerts/alerts-troubleshoot-metric.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -135,7 +135,7 @@ To avoid having the deployment fail when trying to validate the custom metric’
135135
}
136136
```
137137
> [!NOTE]
138-
> Using the *skipMetricValidation* parameter is also required when defining an alert rule on an existing custom metric that hasn't been emitted in more than three days.
138+
> Using the *skipMetricValidation* parameter might also be required when defining an alert rule on an existing custom metric that hasn't been emitted in several days.
139139
140140
## Export the Azure Resource Manager template of a metric alert rule via the Azure portal
141141

0 commit comments

Comments
 (0)