Skip to content

Commit a051ad3

Browse files
authored
Merge branch 'main' into repo_sync_working_branch
2 parents c8dbde2 + 017b39b commit a051ad3

File tree

147 files changed

+3293
-364
lines changed

Some content is hidden

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

147 files changed

+3293
-364
lines changed

articles/active-directory/enterprise-users/licensing-service-plan-reference.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ ms.service: active-directory
1313
ms.subservice: enterprise-users
1414
ms.topic: reference
1515
ms.workload: identity
16-
ms.date: 09/19/2022
16+
ms.date: 09/21/2022
1717
ms.author: nicholak
1818
ms.reviewer: Nicholak-MS
1919
ms.custom: "it-pro;seo-update-azuread-jan"
@@ -32,7 +32,7 @@ When managing licenses in [the Azure portal](https://portal.azure.com/#blade/Mic
3232
- **Service plans included (friendly names)**: A list of service plans (friendly names) in the product that correspond to the string ID and GUID
3333

3434
>[!NOTE]
35-
>This information last updated on September 19th, 2022.<br/>You can also download a CSV version of this table [here](https://download.microsoft.com/download/e/3/e/e3e9faf2-f28b-490a-9ada-c6089a1fc5b0/Product%20names%20and%20service%20plan%20identifiers%20for%20licensing.csv).
35+
>This information last updated on September 21st, 2022.<br/>You can also download a CSV version of this table [here](https://download.microsoft.com/download/e/3/e/e3e9faf2-f28b-490a-9ada-c6089a1fc5b0/Product%20names%20and%20service%20plan%20identifiers%20for%20licensing.csv).
3636
><br/>
3737
3838
| Product name | String ID | GUID | Service plans included | Service plans included (friendly names) |

articles/active-directory/governance/TOC.yml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -245,6 +245,8 @@
245245
href: workflows-faqs.md
246246
- name: Developer API reference Lifecycle Workflows- Azure Active Directory
247247
href: lifecycle-workflows-developer-reference.md
248+
- name: Set employeeLeaveDateTime for leaver workflows
249+
href: set-employee-leave-date-time.md
248250
- name: Preparing user accounts for Lifecycle workflows tutorials (Preview)
249251
href: tutorial-prepare-azure-ad-user-accounts.md
250252
- name: Configure a Logic App for Lifecycle Workflow use (Preview)

articles/active-directory/governance/how-to-lifecycle-workflow-sync-attributes.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,10 +23,10 @@ The following table shows the scheduling (trigger) relevant attributes and the m
2323
|Attribute|Type|Supported in HR Inbound Provisioning|Support in Azure AD Connect Cloud Sync|Support in Azure AD Connect Sync|
2424
|-----|-----|-----|-----|-----|
2525
|employeeHireDate|DateTimeOffset|Yes|Yes|Yes|
26-
|employeeLeaveDateTime|DateTimeOffset|Not currently(manually setting supported)|Not currently(manually setting supported)|Not currently(manually setting supported)|
26+
|employeeLeaveDateTime|DateTimeOffset|Yes|Not currently|Not currently|
2727

2828
> [!NOTE]
29-
> Currently, automatic synchronization of the employeeLeaveDateTime attribute for HR Inbound scenarios is not available. To take advantaged of leaver scenarios, you can set the employeeLeaveDateTime manually. Manually setting the attribute can be done in the portal or with Graph. For more information see [User profile in Azure](../fundamentals/active-directory-users-profile-azure-portal.md) and [Update user](/graph/api/user-update?view=graph-rest-beta&tabs=http).
29+
> To take advantaged of leaver scenarios, you can set the employeeLeaveDateTime manually for cloud-only users. For more information, see: [Set employeeLeaveDateTime](set-employee-leave-date-time.md)
3030
3131
This document explains how to set up synchronization from on-premises Azure AD Connect cloud sync and Azure AD Connect for the required attributes.
3232

Lines changed: 70 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,70 @@
1+
---
2+
title: Set employeeLeaveDateTime
3+
description: Explains how to manually set employeeLeaveDateTime.
4+
author: owinfreyATL
5+
ms.author: owinfrey
6+
ms.service: active-directory
7+
ms.topic: how-to
8+
ms.date: 09/07/2022
9+
ms.custom: template-how-to
10+
---
11+
12+
# Set employeeLeaveDateTime
13+
14+
This article describes how to manually set the employeeLeaveDateTime attribute for a user. This attribute can be set as a trigger for leaver workflows created using Lifecycle Workflows.
15+
16+
## Required permission and roles
17+
18+
To set the employeeLeaveDateTime attribute, you must make sure the correct delegated roles and application permissions are set. They are as follows:
19+
20+
### Delegated
21+
22+
In delegated scenarios, the signed-in user needs the Global Administrator role to update the employeeLeaveDateTime attribute. One of the following delegated permissions is also required:
23+
- User-LifeCycleInfo.ReadWrite.All
24+
- Directory.AccessAsUser.All
25+
26+
### Application
27+
28+
Updating the employeeLeaveDateTime requires the User-LifeCycleInfo.ReadWrite.All application permission.
29+
30+
>[!NOTE]
31+
> The User-LifeCycleInfo.ReadWrite.All permissions is currently hidden and cannot be configured in Graph Explorer or the API permission blade of app registrations.
32+
33+
## Set employeeLeaveDateTime via PowerShell
34+
To set the employeeLeaveDateTime for a user using PowerShell enter the following information:
35+
36+
```powershell
37+
Connect-MgGraph -Scopes "User-LifeCycleInfo.ReadWrite.All"
38+
Select-MgProfile -Name "beta"
39+
40+
$UserId = "<Object ID of the user>"
41+
$employeeLeaveDateTime = "<Leave date>"
42+
43+
$Body = '{"employeeLeaveDateTime": "' + $employeeLeaveDateTime + '"}'
44+
Update-MgUser -UserId $UserId -BodyParameter $Body
45+
46+
$User = Get-MgUser -UserId $UserId -Property employeeLeaveDateTime
47+
$User.AdditionalProperties
48+
```
49+
50+
This script is an example of a user who will leave on September 30, 2022 at 23:59.
51+
52+
```powershell
53+
Connect-MgGraph -Scopes "User-LifeCycleInfo.ReadWrite.All"
54+
Select-MgProfile -Name "beta"
55+
56+
$UserId = "528492ea-779a-4b59-b9a3-b3773ef6da6d"
57+
$employeeLeaveDateTime = "2022-09-30T23:59:59Z"
58+
59+
$Body = '{"employeeLeaveDateTime": "' + $employeeLeaveDateTime + '"}'
60+
Update-MgUser -UserId $UserId -BodyParameter $Body
61+
62+
$User = Get-MgUser -UserId $UserId -Property employeeLeaveDateTime
63+
$User.AdditionalProperties
64+
```
65+
66+
67+
## Next steps
68+
69+
- [How to synchronize attributes for Lifecycle workflows](how-to-lifecycle-workflow-sync-attributes.md)
70+
- [Lifecycle Workflows templates](lifecycle-workflow-templates.md)

articles/active-directory/hybrid/reference-connect-sync-attributes-synchronized.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -461,6 +461,7 @@ Device objects are created in Active Directory. These objects can be devices joi
461461

462462
## Notes
463463
* When using an Alternate ID, the on-premises attribute userPrincipalName is synchronized with the Azure AD attribute onPremisesUserPrincipalName. The Alternate ID attribute, for example mail, is synchronized with the Azure AD attribute userPrincipalName.
464+
* Although there is no enforcement of uniqueness on the Azure AD onPremisesUserPrincipalName attribute, it is not supported to sync the same UserPrincipalName value to the Azure AD onPremisesUserPrincipalName attribute for multiple different Azure AD users.
464465
* In the lists above, the object type **User** also applies to the object type **iNetOrgPerson**.
465466

466467
## Next steps
155 KB
Loading
-121 KB
Loading

articles/active-directory/saas-apps/panorama9-tutorial.md

Lines changed: 12 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ ms.service: active-directory
99
ms.subservice: saas-app-tutorial
1010
ms.workload: identity
1111
ms.topic: tutorial
12-
ms.date: 06/07/2021
12+
ms.date: 09/19/2022
1313
ms.author: jeedes
1414
---
1515
# Tutorial: Azure Active Directory integration with Panorama9
@@ -120,23 +120,19 @@ In this section, you'll enable B.Simon to use Azure single sign-on by granting a
120120

121121
1. In a different web browser window, sign in to your Panorama9 company site as an administrator.
122122

123-
2. In the toolbar on the top, click **Manage**, and then click **Extensions**.
124-
125-
![Extensions](./media/panorama9-tutorial/toolbar.png "Extensions")
126-
127-
3. On the **Extensions** dialog, click **Single Sign-On**.
128-
129-
![Single Sign-On](./media/panorama9-tutorial/extension.png "Single Sign-On")
123+
2. Navigate to **Manage** -> **Extensions** -> **Single Sign-On**.
130124

131125
4. In the **Settings** section, perform the following steps:
132126

133127
![Settings](./media/panorama9-tutorial/configuration.png "Settings")
134128

135-
a. In **Identity provider URL** textbox, paste the value of **Login URL**, which you have copied from Azure portal.
129+
a. Enable the Single Sign-On.
130+
131+
b. In **Identity URL** textbox, paste the value of **Identifier(Entity ID)**, which you have copied from Azure portal.
136132

137-
b. In **Certificate fingerprint** textbox, paste the **Thumbprint** value of certificate, which you have copied from Azure portal.
133+
c. In **Certificate fingerprint** textbox, paste the **Thumbprint** value of certificate, which you have copied from Azure portal.
138134
139-
5. Click **Save**.
135+
5. Click **Save Changes**.
140136

141137
### Create Panorama9 test user
142138

@@ -148,30 +144,21 @@ In the case of Panorama9, provisioning is a manual task.
148144

149145
1. Sign in to your **Panorama9** company site as an administrator.
150146

151-
2. In the menu on the top, click **Manage**, and then click **Users**.
152-
153-
![Screenshot that shows the "Manage" and "Users" tabs selected.](./media/panorama9-tutorial/user.png "Users")
154-
155-
3. In the Users section, Click **+** to add new user.
147+
1. In the Users section, type the email address of a valid Azure Active Directory user you want to provision into the **Email** textbox and give a valid **Name**.
156148

157149
![Users](./media/panorama9-tutorial/new-user.png "Users")
158150

159-
4. Go to the User data section, type the email address of a valid Azure Active Directory user you want to provision into the **Email** textbox.
160-
161-
5. Come to the Users section, Click **Save**.
162-
163-
> [!NOTE]
164-
> The Azure Active Directory account holder receives an email and follows a link to confirm their account before it becomes active.
151+
5. Click **Create user**.
165152

166153
## Test SSO
167154

168155
In this section, you test your Azure AD single sign-on configuration with following options.
169156

170-
* Click on **Test this application** in Azure portal. This will redirect to Panorama9 Sign-on URL where you can initiate the login flow.
157+
* Click on **Test this application** in Azure portal. This will redirect to Panorama9 Sign on URL where you can initiate the login flow.
171158

172-
* Go to Panorama9 Sign-on URL directly and initiate the login flow from there.
159+
* Go to Panorama9 Sign on URL directly and initiate the login flow from there.
173160

174-
* You can use Microsoft My Apps. When you click the Panorama9 tile in the My Apps, this will redirect to Panorama9 Sign-on URL. For more information about the My Apps, see [Introduction to the My Apps](https://support.microsoft.com/account-billing/sign-in-and-start-apps-from-the-my-apps-portal-2f3b1bae-0e5a-4a86-a33e-876fbd2a4510).
161+
* You can use Microsoft My Apps. When you click the Panorama9 tile in the My Apps, this will redirect to Panorama9 Sign on URL. For more information about the My Apps, see [Introduction to the My Apps](https://support.microsoft.com/account-billing/sign-in-and-start-apps-from-the-my-apps-portal-2f3b1bae-0e5a-4a86-a33e-876fbd2a4510).
175162

176163
## Next steps
177164

articles/app-service/configure-custom-container.md

Lines changed: 15 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -202,6 +202,18 @@ When persistent storage is disabled, then writes to the `C:\home` directory are
202202

203203
The only exception is the `C:\home\LogFiles` directory, which is used to store the container and application logs. This folder will always persist upon app restarts if [application logging is enabled](troubleshoot-diagnostic-logs.md?#enable-application-logging-windows) with the **File System** option, independently of the persistent storage being enabled or disabled. In other words, enabling or disabling the persistent storage will not affect the application logging behavior.
204204

205+
By default, persistent storage is *disabled* on Windows custom containers. To enable it, set the `WEBSITES_ENABLE_APP_SERVICE_STORAGE` app setting value to `true` via the [Cloud Shell](https://shell.azure.com). In Bash:
206+
207+
```azurecli-interactive
208+
az webapp config appsettings set --resource-group <group-name> --name <app-name> --settings WEBSITES_ENABLE_APP_SERVICE_STORAGE=true
209+
```
210+
211+
In PowerShell:
212+
213+
```azurepowershell-interactive
214+
Set-AzWebApp -ResourceGroupName <group-name> -Name <app-name> -AppSettings @{"WEBSITES_ENABLE_APP_SERVICE_STORAGE"=true}
215+
```
216+
205217
::: zone-end
206218

207219
::: zone pivot="container-linux"
@@ -214,9 +226,7 @@ The only exception is the `/home/LogFiles` directory, which is used to store the
214226

215227
It is recommended to write data to `/home` or a [mounted azure storage path](configure-connect-to-azure-storage.md?tabs=portal&pivots=container-linux). Data written outside these paths will not be persistent during restarts and will be saved to platform-managed host disk space separate from the App Service Plans file storage quota.
216228

217-
::: zone-end
218-
219-
By default, persistent storage is **enabled** on custom containers, you can disable this through app settings. To disable it, set the `WEBSITES_ENABLE_APP_SERVICE_STORAGE` app setting value to `false` via the [Cloud Shell](https://shell.azure.com). In Bash:
229+
By default, persistent storage is *enabled* on Linux custom containers. To disable it, set the `WEBSITES_ENABLE_APP_SERVICE_STORAGE` app setting value to `false` via the [Cloud Shell](https://shell.azure.com). In Bash:
220230

221231
```azurecli-interactive
222232
az webapp config appsettings set --resource-group <group-name> --name <app-name> --settings WEBSITES_ENABLE_APP_SERVICE_STORAGE=false
@@ -228,6 +238,8 @@ In PowerShell:
228238
Set-AzWebApp -ResourceGroupName <group-name> -Name <app-name> -AppSettings @{"WEBSITES_ENABLE_APP_SERVICE_STORAGE"=false}
229239
```
230240

241+
::: zone-end
242+
231243
> [!NOTE]
232244
> You can also [configure your own persistent storage](configure-connect-to-azure-storage.md).
233245

articles/azure-app-configuration/howto-best-practices.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ editor: ''
99
ms.assetid:
1010
ms.service: azure-app-configuration
1111
ms.topic: conceptual
12-
ms.date: 05/02/2019
12+
ms.date: 09/21/2022
1313
ms.author: malev
1414
ms.custom: "devx-track-csharp, mvc"
1515
---
@@ -55,7 +55,7 @@ configBuilder.AddAzureAppConfiguration(options => {
5555

5656
## References to external data
5757

58-
App Configuration is designed to store any configuration data that you would normally save in configuration files or environment variables. However, some types of data may better suited to reside in other sources. For example, store secrets in Key Vault, files in Azure Storage, membership information in Azure AD groups, or customer lists in a database.
58+
App Configuration is designed to store any configuration data that you would normally save in configuration files or environment variables. However, some types of data may be better suited to reside in other sources. For example, store secrets in Key Vault, files in Azure Storage, membership information in Azure AD groups, or customer lists in a database.
5959

6060
You can still take advantage of App Configuration by saving a reference to external data in a key-value. You can [use content type](./concept-key-value.md#use-content-type) to differentiate each data source. When your application reads a reference, it loads the actual data from the referenced source, assuming it has the necessary permission to the source. If you change the location of your external data, you only need to update the reference in App Configuration instead of updating and redeploying your entire application.
6161

0 commit comments

Comments
 (0)