Skip to content

Commit d0f0871

Browse files
authored
Merge pull request #239104 from MicrosoftDocs/main
Publish to live, Wednesday 4 AM PST, 5/24
2 parents ba36d80 + 4374a10 commit d0f0871

File tree

303 files changed

+5051
-1637
lines changed

Some content is hidden

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

303 files changed

+5051
-1637
lines changed

.openpublishing.publish.config.json

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -997,7 +997,13 @@
997997
"url": "https://github.com/MicrosoftGraph/microsoft-graph-docs",
998998
"branch": "main",
999999
"branch_mapping": {}
1000-
}
1000+
},
1001+
{
1002+
"path_to_root": "azure-actions-workflow-samples",
1003+
"url": "https://github.com/Azure/actions-workflow-samples",
1004+
"branch": "main",
1005+
"branch_mapping": {}
1006+
}
10011007
],
10021008
"branch_target_mapping": {
10031009
"live": ["Publish", "PDF"],

articles/active-directory/develop/tutorial-v2-android.md

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,6 @@ In this tutorial:
3535

3636
- [Android Studio](https://developer.android.com/studio)
3737
- [Android documentation on generating a key](https://developer.android.com/studio/publish/app-signing#generate-key)
38-
- [Layout resource](https://developer.android.com/guide/topics/resources/layout-resource)
3938

4039
## How this tutorial works
4140

articles/active-directory/external-identities/customers/quickstart-trial-setup.md

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ title: Quickstart - Set up a customer tenant free trial
33
description: Use our quickstart to set up the customer tenant free trial.
44
services: active-directory
55
author: csmulligan
6-
manager: celestedg
6+
manager: CelesteDG
77
ms.service: active-directory
88
ms.workload: identity
99
ms.subservice: ciam
@@ -12,7 +12,7 @@ ms.date: 05/10/2023
1212
ms.author: cmulligan
1313
ms.custom: it-pro
1414

15-
#Customer intent: As a dev, devops, or it admin, I want to set up the customer tenant free trial.
15+
#Customer intent: As a dev, devops, or IT admin, I want to set up the customer tenant free trial.
1616
---
1717
# Quickstart: Get started with Azure AD for customers (Preview)
1818

@@ -26,7 +26,7 @@ Your free trial of a customer tenant provides you with the opportunity to try ne
2626
During the free trial period, you'll have access to all product features with few exceptions. See the following table for comparison:
2727

2828
| Features | Azure AD for customers Trial (without credit card) | Azure Active Directory account includes Partners (needs credit card) |
29-
|----------|-----------|------------|
29+
|----------|:-----------:|:------------:|
3030
| **Self-service account experiences** (Sign-up, sign-in, and password recovery.) | :heavy_check_mark: | :heavy_check_mark: |
3131
| **MFA** (With email OTP.) | :heavy_check_mark: | :heavy_check_mark: |
3232
| **Custom token augmentation** (From external sources.) | :heavy_check_mark: | :heavy_check_mark: |
@@ -43,7 +43,7 @@ During the free trial period, you'll have access to all product features with fe
4343
4444
## Sign up to your customer tenant free trial
4545

46-
1. Open your browser and visit [https://aka.ms/ciam-free-trial](https://aka.ms/ciam-free-trial?wt.mc_id=ciamcustomertenantfreetrial_linkclick_content_cnl).
46+
1. Open your browser and visit <a href="https://aka.ms/ciam-free-trial?wt.mc_id=ciamcustomertenantfreetrial_linkclick_content_cnl" target="_blank">https://aka.ms/ciam-free-trial</a>.
4747
1. You can sign in to the customer trial tenant using your personal account, and your Microsoft account (MSA) or GitHub account.
4848
1. You'll notice that a domain name and location have been set for you. The domain name and the data location can't be changed later in the free trial. Select **Change settings** if you would like to adjust them.
4949
1. Select **Continue** and hang on while we set up your trial. It will take a few minutes for the trial to become ready for the next step.

articles/active-directory/governance/lifecycle-workflow-templates.md

Lines changed: 27 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ ms.custom: template-concept
1515
# Lifecycle Workflows templates (Preview)
1616

1717

18-
Lifecycle Workflows allows you to automate the lifecycle management process for your organization by creating workflows that contain both built-in tasks, and custom task extensions. These workflows, and the tasks within them, all fall into categories based on the Joiner-Mover-Leaver(JML) model of lifecycle management. To make this process even more efficient, Lifecycle Workflows also provide you templates, which you can use to accelerate the set up, creation, and configuration of common lifecycle management processes. You can create workflows based on these templates as is, or you can customize them even further to match the requirements for users within your organization. In this article you'll get the complete list of workflow templates, common template parameters, default template parameters for specific templates, and the list of compatible tasks for each template. For full task definitions, see [Lifecycle Workflow tasks and definitions](lifecycle-workflow-tasks.md).
18+
Lifecycle Workflows allows you to automate the lifecycle management process for your organization by creating workflows that contain both built-in tasks, and custom task extensions. These workflows, and the tasks within them, all fall into categories based on the Joiner-Mover-Leaver(JML) model of lifecycle management. To make this process even more efficient, Lifecycle Workflows also provide you with templates, which you can use to accelerate the setup, creation, and configuration of common lifecycle management processes. You can create workflows based on these templates as is, or you can customize them even further to match the requirements for users within your organization. In this article you get the complete list of workflow templates, common template parameters, default template parameters for specific templates, and the list of compatible tasks for each template. For full task definitions, see [Lifecycle Workflow tasks and definitions](lifecycle-workflow-tasks.md).
1919

2020

2121
## Lifecycle Workflow Templates
@@ -28,6 +28,7 @@ The list of templates are as follows:
2828

2929
- [Onboard pre-hire employee](lifecycle-workflow-templates.md#onboard-pre-hire-employee)
3030
- [Onboard new hire employee](lifecycle-workflow-templates.md#onboard-new-hire-employee)
31+
- [Post-Onboarding of an employee](lifecycle-workflow-templates.md#post-onboarding-of-an-employee)
3132
- [Real-time employee termination](lifecycle-workflow-templates.md#real-time-employee-termination)
3233
- [Pre-Offboarding of an employee](lifecycle-workflow-templates.md#pre-offboarding-of-an-employee)
3334
- [Offboard an employee](lifecycle-workflow-templates.md#offboard-an-employee)
@@ -59,7 +60,7 @@ The default specific parameters and properties for the **Onboard pre-hire employ
5960

6061
### Onboard new hire employee
6162

62-
The **Onboard new-hire employee** template is designed to configure tasks that will be completed on an employee's start date.
63+
The **Onboard new-hire employee** template is designed to configure tasks that are completed on an employee's start date.
6364

6465
:::image type="content" source="media/lifecycle-workflow-templates/onboard-new-hire-template.png" alt-text="Screenshot of a Lifecycle Workflow onboard new hire template.":::
6566

@@ -72,16 +73,36 @@ The default specific parameters for the **Onboard new hire employee** template a
7273
|Trigger Type | Trigger and Scope Based ||
7374
|Days from event | 0 ||
7475
|Event timing | On ||
75-
|Event User attribute | EmployeeHireDate | |
76+
|Event User attribute | EmployeeHireDate, createdDateTime | ✔️ |
7677
|Scope type | Rule based ||
7778
|Execution conditions | (department eq 'Marketing') | ✔️ |
7879
|Tasks | **Add User To Group**, **Enable User Account**, **Send Welcome Email** | ✔️ |
7980

8081

82+
### Post-Onboarding of an employee
83+
84+
The **Post-Onboarding of an employee** template is designed to configure tasks that will be completed after an employee's start, or creation, date.
85+
86+
:::image type="content" source="media/lifecycle-workflow-templates/onboard-post-employee-template.png" alt-text="Screenshot of a Lifecycle Workflow post-onboard new hire template.":::
87+
88+
The default specific parameters for the **Post-Onboarding of an employee** template are as follows:
89+
90+
91+
|parameter |description |Customizable |
92+
|---------|---------|---------|
93+
|Category | Joiner ||
94+
|Trigger Type | Trigger and Scope Based ||
95+
|Days from event | 7 | ✔️ |
96+
|Event timing | After ||
97+
|Event User attribute | EmployeeHireDate, createdDateTime | ✔️ |
98+
|Scope type | Rule based ||
99+
|Execution conditions | (department eq 'Marketing') | ✔️ |
100+
|Tasks | **Add User To Group**, **Add user to selected teams** | ✔️ |
101+
81102

82103
### Real-time employee termination
83104

84-
The **Real-time employee termination** template is designed to configure tasks that will be completed immediately when an employee is terminated.
105+
The **Real-time employee termination** template is designed to configure tasks that are completed immediately when an employee is terminated.
85106

86107
:::image type="content" source="media/lifecycle-workflow-templates/on-demand-termination-template.png" alt-text="Screenshot of a Lifecycle Workflow real time employee termination template.":::
87108

@@ -101,7 +122,7 @@ The default specific parameters for the **Real-time employee termination** templ
101122

102123
### Pre-Offboarding of an employee
103124

104-
The **Pre-Offboarding of an employee** template is designed to configure tasks that will be completed before an employee's last day of work.
125+
The **Pre-Offboarding of an employee** template is designed to configure tasks that are completed before an employee's last day of work.
105126

106127
:::image type="content" source="media/lifecycle-workflow-templates/offboard-pre-employee-template.png" alt-text="Screenshot of a pre offboarding employee template.":::
107128

@@ -124,7 +145,7 @@ The default specific parameters for the **Pre-Offboarding of an employee** templ
124145

125146
### Offboard an employee
126147

127-
The **Offboard an employee** template is designed to configure tasks that will be completed on an employee's last day of work.
148+
The **Offboard an employee** template is designed to configure tasks that are completed on an employee's last day of work.
128149

129150
:::image type="content" source="media/lifecycle-workflow-templates/offboard-employee-template.png" alt-text="Screenshot of an offboard employee template lifecycle workflow.":::
130151

7.36 KB
Loading
157 KB
Loading

articles/active-directory/governance/understanding-lifecycle-workflows.md

Lines changed: 15 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -56,12 +56,12 @@ A workflow can be broken down into the following three main parts:
5656
|Workflow part|Description|
5757
|-----|-----|
5858
|General information|This portion of a workflow covers basic information such as display name, and a description of what the workflow does.|
59-
|Tasks|Tasks are the actions that will be taken when a workflow is executed.|
60-
|Execution conditions| Defines when(trigger), and for who(scope), a scheduled workflow will run. For more information on these two parameters, see [Trigger details](understanding-lifecycle-workflows.md#trigger-details) and [Configure Scope](understanding-lifecycle-workflows.md#configure-scope).|
59+
|Tasks|Tasks are the actions that are taken when a workflow is executed.|
60+
|Execution conditions| Defines when(trigger), and for who(scope), a scheduled workflow runs. For more information on these two parameters, see [Trigger details](understanding-lifecycle-workflows.md#trigger-details) and [Configure Scope](understanding-lifecycle-workflows.md#configure-scope).|
6161

6262
## Templates
6363

64-
Creating a workflow via the Azure portal requires the use of a template. A Lifecycle Workflow template is a framework that is used for pre-defined tasks, and helps automate the creation of a workflow.
64+
Creating a workflow via the Azure portal requires the use of a template. A Lifecycle Workflow template is a framework that is used for predefined tasks, and helps automate the creation of a workflow.
6565

6666
[![Understanding workflow template diagram.](media/understanding-lifecycle-workflows/workflow-3.png)](media/understanding-lifecycle-workflows/workflow-3.png#lightbox)
6767

@@ -80,11 +80,11 @@ Every workflow has its own overview section, where you can either take quick act
8080
- My Feed
8181
- Quick Action
8282

83-
In this section you'll learn what each section tells you, and what actions you'll be able to take from this information.
83+
In this section you learn what each section tells you, and what actions you're able to take from this information.
8484

8585
### Basic Information
8686

87-
When selecting a workflow, the overview provides you a list of basic details in the **Basic Information** section. These basic details provide you information such as the workflow category, its ID, when it was modified, and when it's scheduled to run again. This information is important in providing quick details surrounding its current usage for administrative purposes. Basic information is also live data, meaning any quick change action that you take place on the overview page, is shown immediately within this section.
87+
When selecting a workflow, the overview provides you with a list of basic details in the **Basic Information** section. These basic details provide you with information such as the workflow category, its ID, when it was modified, and when it's scheduled to run again. This information is important in providing quick details surrounding its current usage for administrative purposes. Basic information is also live data, meaning any quick change action that you take place on the overview page, is shown immediately within this section.
8888

8989
Within the **Basic Information** you can view the following information:
9090

@@ -126,21 +126,22 @@ Actions taken from the overview of a workflow allow you to quickly complete task
126126
## Workflow basics
127127

128128
After selecting a template, on the basics screen:
129-
- Provide the information that will be used in the description portion of the workflow.
129+
- Provide the information that is used in the description portion of the workflow.
130130
- The trigger, defines when of the execution condition.
131131

132132
[![Basics of a workflow.](media/understanding-lifecycle-workflows/workflow-4.png)](media/understanding-lifecycle-workflows/workflow-4.png#lightbox)
133133

134134
## Trigger details
135135

136-
The trigger of a workflow defines when a scheduled workflow will run for users in scope for the workflow. The trigger is a combination of a time-based attribute, and an offset value. For example, if the attribute is employeeHireDate and offsetInDays is -1, then the workflow should trigger one day before the employee hire date. The value can range between -180 and 180 days.
136+
The trigger of a workflow defines when a scheduled workflow runs for users in scope for the workflow. The trigger is a combination of a time-based attribute, and an offset value. For example, if the attribute is employeeHireDate and offsetInDays is -1, then the workflow should trigger one day before the employee hire date. The value can range between -180 and 180 days.
137137

138-
The time-based attribute can be either one of two values, which are automatically chosen based on the template in which you select during the creation of your workflow. The two values can be:
138+
The time-based attribute can be either one of two values, which are automatically chosen based on the template in which you select during the creation of your workflow. The three values can be:
139139

140-
- employeeHireDate: If the template is a joiner workflow.
141-
- employeeLeaveDateTime: If the template is a leaver workflow.
140+
- employeeHireDate: If the template is a joiner workflow
141+
- createdDateTime: if the template is a joiner workflow designed to run either on hire or post onboarding
142+
- employeeLeaveDateTime: If the template is a leaver workflow
142143

143-
These two values must be set within Azure AD for users. For more information on this process, see [How to synchronize attributes for Lifecycle workflows](how-to-lifecycle-workflow-sync-attributes.md)
144+
The values employeeHireDate and employeeLeaveDateTime must be set within Azure AD for users. For more information on this process, see [How to synchronize attributes for Lifecycle workflows](how-to-lifecycle-workflow-sync-attributes.md)
144145

145146
The offset determines how many days before or after the time-based attribute the workflow should be triggered. For example, if the attribute is employeeHireDate and offsetInDays is 7, then the workflow should trigger one week(7 days) before the employee hire date. The offsetInDays value can be as far ahead, or behind, as 60.
146147

@@ -149,12 +150,12 @@ The offset determines how many days before or after the time-based attribute the
149150

150151
[![Screenshot showing the rule section.](media/understanding-lifecycle-workflows/workflow-5.png)](media/understanding-lifecycle-workflows/workflow-5.png#lightbox)
151152

152-
The scope defines for who the scheduled workflow will run. Configuring this parameter allows you to further narrow down the users for whom the workflow is to be executed.
153+
The scope defines for who the scheduled workflow runs. Configuring this parameter allows you to further narrow down the users for whom the workflow is to be executed.
153154

154155
The scope is made up of the following two parts:
155156

156157
- Scope type: Always preset as Rule based.
157-
- Rule: Where you can set expressions on user properties that define for whom the scheduled workflow will run. You can add extra expressions using **And, And not, Or, Or not** to create complex conditionals, and apply the workflow more granularly across your organization. Lifecycle Workflows supports a [rich set of user properties](/graph/api/resources/identitygovernance-rulebasedsubjectset#supported-user-properties-and-query-parameters) for configuring the scope.
158+
- Rule: Where you can set expressions on user properties that define for whom the scheduled workflow runs. You can add extra expressions using **And, And not, Or, Or not** to create complex conditionals, and apply the workflow more granularly across your organization. Lifecycle Workflows supports a [rich set of user properties](/graph/api/resources/identitygovernance-rulebasedsubjectset#supported-user-properties-and-query-parameters) for configuring the scope.
158159

159160
[![Extra expressions.](media/understanding-lifecycle-workflows/workflow-8.png)](media/understanding-lifecycle-workflows/workflow-8.png#lightbox)
160161

@@ -164,7 +165,7 @@ For a detailed guide on setting the execution conditions for a workflow, see: [C
164165

165166
While newly created workflows are enabled by default, scheduling is an option that must be enabled manually. To verify whether the workflow is scheduled, you can view the **Scheduled** column.
166167

167-
Once scheduling is enabled, the workflow will be evaluated every three hours to determine whether or not it should run based on the execution conditions.
168+
Once scheduling is enabled, the workflow is evaluated every three hours to determine whether or not it should run based on the execution conditions.
168169

169170
[![Workflow template schedule.](media/understanding-lifecycle-workflows/workflow-10.png)](media/understanding-lifecycle-workflows/workflow-10.png#lightbox)
170171

0 commit comments

Comments
 (0)