Skip to content

Commit 4d76752

Browse files
authored
Merge pull request #206497 from MicrosoftDocs/main
Merge default branch to live Sunday 4:00 PM
2 parents 0802972 + 9610f62 commit 4d76752

File tree

16 files changed

+183
-125
lines changed

16 files changed

+183
-125
lines changed

articles/active-directory/governance/entitlement-management-access-reviews-create.md

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ ms.workload: identity
1111
ms.tgt_pltfrm: na
1212
ms.topic: how-to
1313
ms.subservice: compliance
14-
ms.date: 10/26/2021
14+
ms.date: 08/01/2022
1515
ms.author: owinfrey
1616
ms.reviewer:
1717
ms.collection: M365-identity-device-management
@@ -37,6 +37,12 @@ For more information, see [License requirements](entitlement-management-overview
3737

3838
You can enable access reviews when [creating a new access package](entitlement-management-access-package-create.md) or [editing an existing access package assignment policy](entitlement-management-access-package-lifecycle-policy.md) policy. If you have multiple policies, for different communities of users to request access, you can have independent access review schedules for each policy. Follow these steps to enable access reviews of an access package's assignments:
3939

40+
1. In the Azure portal, select **Azure Active Directory** and then select **Identity Governance**.
41+
42+
1. To create a new access policy, in the left menu, select **Access packages**, then select **New access** package.
43+
44+
1. To edit an existing access policy, in the left menu, select **Access packages** and open the access package you want to edit. Then, in the left menu, select **Policies** and select the policy that has the lifecycle settings you want to edit.
45+
4046
1. Open the **Lifecycle** tab for an access package assignment policy to specify when a user's assignment to the access package expires. You can also specify whether users can extend their assignments.
4147

4248
1. In the **Expiration** section, set Access package assignments expires to **On date**, **Number of days**, **Number of hours**, or **Never**.

articles/active-directory/governance/entitlement-management-process.md

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ ms.workload: identity
1111
ms.tgt_pltfrm: na
1212
ms.topic: conceptual
1313
ms.subservice: compliance
14-
ms.date: 5/17/2021
14+
ms.date: 08/01/2022
1515
ms.author: owinfrey
1616
ms.reviewer: mamkumar
1717
ms.collection: M365-identity-device-management
@@ -54,17 +54,17 @@ The following diagrams show when these email notifications are sent to either th
5454
### First approvers and alternate approvers
5555
The following diagram shows the experience of first approvers and alternate approvers, and the email notifications they receive during the request process:
5656

57-
![First and alternate approvers process flow](./media/entitlement-management-process/first-approvers-and-alternate-with-escalation-flow.png)
57+
:::image type="content" source="./media/entitlement-management-process/first-approvers-and-alternate-with-escalation-flow.png" alt-text="First and alternate approvers process flow" lightbox="./media/entitlement-management-process/first-approvers-and-alternate-with-escalation-flow.png":::
5858

5959
### Requestors
6060
The following diagram shows the experience of requestors and the email notifications they receive during the request process:
6161

62-
![Requestor process flow](./media/entitlement-management-process/requestor-approval-request-flow.png)
62+
:::image type="content" source="./media/entitlement-management-process/requestor-approval-request-flow.png" alt-text="Requestor process flow" lightbox="./media/entitlement-management-process/requestor-approval-request-flow.png":::
6363

6464
### Multi-stage approval
6565
The following diagram shows the experience of stage-1 and stage-2 approvers and the email notifications they receive during the request process:
6666

67-
![2-stage approval process flow](./media/entitlement-management-process/2stage-approval-with-request-timeout-flow.png)
67+
:::image type="content" source="./media/entitlement-management-process/2stage-approval-with-request-timeout-flow.png" alt-text="2-stage approval process flow" lightbox="./media/entitlement-management-process/2stage-approval-with-request-timeout-flow.png":::
6868

6969
### Email notifications table
7070
The following table provides more detail about each of these email notifications. To manage these emails, you can use rules. For example, in Outlook, you can create rules to move the emails to a folder if the subject contains words from this table. Note that the words will be based on the default language settings of the tenant where the user is requesting access.
@@ -143,7 +143,7 @@ When the request reaches its configured expiration date and expires, it can no l
143143

144144
An email notification is sent to the requestor, notifying them that their access request has expired, and that they need to resubmit the access request. The following diagram shows the experience of the requestor and the email notifications they receive when they request to extend access:
145145

146-
![Requestor extend access process flow](./media/entitlement-management-process/requestor-expiration-request-flow.png)
146+
:::image type="content" source="./media/entitlement-management-process/requestor-expiration-request-flow.png" alt-text="Requestor extend access process flow" lightbox="./media/entitlement-management-process/requestor-expiration-request-flow.png":::
147147

148148
Here is a sample email notification that is sent to a requestor when their access request has expired:
149149

articles/azure-monitor/agents/diagnostics-extension-stream-event-hubs.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,7 @@ The data collected from the guest operating system that can be sent to Event Hub
2424

2525
* Windows diagnostics extension 1.6 or higher. See [Azure Diagnostics extension configuration schema versions and history](diagnostics-extension-versions.md) for a version history and [Azure Diagnostics extension overview](diagnostics-extension-overview.md) for supported resources.
2626
* Event Hubs namespace must always be provisioned. See [Get started with Event Hubs](../../event-hubs/event-hubs-dotnet-standard-getstarted-send.md) for details.
27+
* Event hub must be at least Standard tier. Basic tier is not supported.
2728

2829

2930
## Configuration schema

articles/azure-monitor/containers/container-insights-enable-new-cluster.md

Lines changed: 1 addition & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -23,21 +23,7 @@ To enable monitoring of a new AKS cluster created with Azure CLI, follow the ste
2323
2424
## Enable using Terraform
2525

26-
If you are [deploying a new AKS cluster using Terraform](/azure/developer/terraform/create-k8s-cluster-with-tf-and-aks), you specify the arguments required in the profile [to create a Log Analytics workspace](https://registry.terraform.io/providers/hashicorp/azurerm/latest/docs/resources/log_analytics_workspace) if you do not choose to specify an existing one.
27-
28-
>[!NOTE]
29-
>If you choose to use Terraform, you must be running the Terraform Azure RM Provider version 1.17.0 or above.
30-
31-
To add Container insights to the workspace, see [azurerm_log_analytics_solution](https://registry.terraform.io/providers/hashicorp/azurerm/latest/docs/resources/log_analytics_solution) and complete the profile by including the [**addon_profile**](https://registry.terraform.io/providers/hashicorp/azurerm/latest/docs/resources/kubernetes_cluster) and specify **oms_agent**.
32-
33-
After you've enabled monitoring and all configuration tasks are completed successfully, you can monitor the performance of your cluster in either of two ways:
34-
35-
* Directly in the AKS cluster by selecting **Health** in the left pane.
36-
* By selecting the **Monitor Container insights** tile in the AKS cluster page for the selected cluster. In Azure Monitor, in the left pane, select **Health**.
37-
38-
![Options for selecting Container insights in AKS](./media/container-insights-onboard/kubernetes-select-monitoring-01.png)
39-
40-
After you've enabled monitoring, it might take about 15 minutes before you can view health metrics for the cluster.
26+
If you are [deploying a new AKS cluster using Terraform](/azure/developer/terraform/create-k8s-cluster-with-tf-and-aks), you specify the arguments required in the profile [to create a Log Analytics workspace](https://registry.terraform.io/providers/hashicorp/azurerm/latest/docs/resources/log_analytics_workspace) if you do not choose to specify an existing one. To add Container insights to the workspace, see [azurerm_log_analytics_solution](https://registry.terraform.io/providers/hashicorp/azurerm/latest/docs/resources/log_analytics_solution) and complete the profile by including the [**addon_profile**](https://registry.terraform.io/providers/hashicorp/azurerm/latest/docs/resources/kubernetes_cluster) and specify **oms_agent**.
4127

4228
## Verify agent and solution deployment
4329
With agent version *06072018* or later, you can verify that both the agent and the solution were deployed successfully. With earlier versions of the agent, you can verify only agent deployment.

articles/azure-video-indexer/toc.yml

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -43,8 +43,8 @@
4343
href: manage-multiple-tenants.md
4444
- name: Live stream analysis
4545
href: live-stream-analysis.md
46-
- name: Add contributor role to Media Services
47-
href: add-contributor-role-on-the-media-service.md
46+
- name: Considerations when using at scale
47+
href: considerations-when-use-at-scale.md
4848
- name: Insights
4949
items:
5050
- name: Language identification model
@@ -101,12 +101,16 @@
101101
href: connect-classic-account-to-arm.md
102102
- name: Manage account connected to Azure
103103
href: manage-account-connected-to-azure.md
104+
- name: Add contributor role to Media Services
105+
href: add-contributor-role-on-the-media-service.md
104106
- name: Use Azure Video Indexer API
105107
href: video-indexer-use-apis.md
106108
- name: Upload and index videos
107-
href: upload-index-videos.md
109+
href: upload-index-videos.md
108110
- name: Index Video from OneDrive
109111
href: odrv-download.md
112+
- name: View and edit insights
113+
href: video-indexer-view-edit.md
110114
- name: Examine Azure Video Indexer output
111115
href: video-indexer-output-json-v2.md
112116
- name: Find exact moments within videos
@@ -116,14 +120,10 @@
116120
href: scenes-shots-keyframes.md
117121
- name: Identify and transcribe multi-language content
118122
href: multi-language-identification-transcription.md
119-
- name: View and edit insights
120-
href: video-indexer-view-edit.md
121123
- name: Use editor to create projects
122124
href: use-editor-create-project.md
123125
- name: Embed widgets into your application
124126
href: video-indexer-embed-widgets.md
125-
- name: Considerations when using Azure Video Indexer at scale
126-
href: considerations-when-use-at-scale.md
127127
- name: Network Security
128128
href: network-security.md
129129
- name: Disaster recovery

0 commit comments

Comments
 (0)