Skip to content

Commit 924bb50

Browse files
authored
Merge pull request #213334 from MicrosoftDocs/main
merge main to Live, Sunday 4 PM
2 parents 3d63b92 + 2a0ab1d commit 924bb50

24 files changed

+796
-118
lines changed

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

Lines changed: 1 addition & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -20,27 +20,7 @@ Lifecycle Workflows come with many pre-configured tasks that are designed to aut
2020
Lifecycle Workflow's built-in tasks each include an identifier, known as **taskDefinitionID**, and can be used to create either new workflows from scratch, or inserted into workflow templates so that they fit the needs of your organization. For more information on templates available for use with Lifecycle Workflows, see: [Lifecycle Workflow Templates](lifecycle-workflow-templates.md).
2121

2222

23-
24-
Lifecycle Workflows currently support the following tasks:
25-
26-
|Task |taskdefinitionID |Category |
27-
|---------|---------|---------|
28-
|[Send welcome email to new hire](lifecycle-workflow-tasks.md#send-welcome-email-to-new-hire) | 70b29d51-b59a-4773-9280-8841dfd3f2ea | Joiner |
29-
|[Generate Temporary Access Pass and send via email to user's manager](lifecycle-workflow-tasks.md#generate-temporary-access-pass-and-send-via-email-to-users-manager) | 1b555e50-7f65-41d5-b514-5894a026d10d | Joiner |
30-
|[Add user to groups](lifecycle-workflow-tasks.md#add-user-to-groups) | 22085229-5809-45e8-97fd-270d28d66910 | Joiner, Leaver
31-
|[Add user to teams](lifecycle-workflow-tasks.md#add-user-to-teams) | e440ed8d-25a1-4618-84ce-091ed5be5594 | Joiner, Leaver
32-
|[Enable user account](lifecycle-workflow-tasks.md#enable-user-account) | 6fc52c9d-398b-4305-9763-15f42c1676fc | Joiner, Leaver
33-
|[Run a custom task extension](lifecycle-workflow-tasks.md#run-a-custom-task-extension) | 4262b724-8dba-4fad-afc3-43fcbb497a0e | Joiner, Leaver
34-
|[Disable user account](lifecycle-workflow-tasks.md#disable-user-account) | 1dfdfcc7-52fa-4c2e-bf3a-e3919cc12950 | Leaver
35-
|[Remove user from selected group](lifecycle-workflow-tasks.md#remove-user-from-selected-groups) | 1953a66c-751c-45e5-8bfe-01462c70da3c | Leaver
36-
|[Remove users from all groups](lifecycle-workflow-tasks.md#remove-users-from-all-groups) | b3a31406-2a15-4c9a-b25b-a658fa5f07fc | Leaver
37-
|[Remove user from teams](lifecycle-workflow-tasks.md#remove-user-from-teams) | 06aa7acb-01af-4824-8899-b14e5ed788d6 | Leaver |
38-
|[Remove user from all teams](lifecycle-workflow-tasks.md#remove-users-from-all-teams) | 81f7b200-2816-4b3b-8c5d-dc556f07b024 | Leaver |
39-
|[Remove all license assignments from user](lifecycle-workflow-tasks.md#remove-all-license-assignments-from-user) | 8fa97d28-3e52-4985-b3a9-a1126f9b8b4e | Leaver
40-
|[Delete user](lifecycle-workflow-tasks.md#delete-user) | 8d18588d-9ad3-4c0f-99d0-ec215f0e3dff | Leaver |
41-
|[Send email to manager before user last day](lifecycle-workflow-tasks.md#send-email-to-manager-before-user-last-day) | 52853a3e-f4e5-4eb8-bb24-1ac09a1da935 | Leaver |
42-
|[Send email on users last day](lifecycle-workflow-tasks.md#send-email-on-users-last-day) | 9c0a1eaf-5bda-4392-9d9e-6e155bb57411 | Leaver |
43-
|[Send offboarding email to users manager after their last day](lifecycle-workflow-tasks.md#send-offboarding-email-to-users-manager-after-their-last-day) | 6f22ddd4-b3a5-47a4-a846-0d7c201a49ce | Leaver |
23+
[!INCLUDE [Lifecylce Workflows tasks table](../../../includes/lifecycle-workflows-tasks-table.md)]
4424

4525
## Common task parameters (preview)
4626

articles/azure-monitor/agents/azure-monitor-agent-windows-client.md

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -259,6 +259,8 @@ Invoke-RestMethod -Uri $request -Headers $AuthenticationHeader -Method PUT -Body
259259
260260
#2. Create Monitored Object
261261
262+
# "location" property value under the "body" section should be the Azure region where the MO object would be stored. It should be the "same region" where you created the Data Collection Rule. This is the location of the region from where agent communications would happen.
263+
262264
$request = "https://management.azure.com/providers/Microsoft.Insights/monitoredObjects/$TenantID`?api-version=2021-09-01-preview"
263265
$body = @'
264266
{
@@ -271,7 +273,7 @@ $body = @'
271273
$Respond = Invoke-RestMethod -Uri $request -Headers $AuthenticationHeader -Method PUT -Body $body -Verbose
272274
$RespondID = $Respond.id
273275
274-
#########
276+
##########################
275277
276278
#3. Associate DCR to Monitored Object
277279

articles/azure-resource-manager/bicep/scenarios-rbac.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ If you don't explicitly specify the scope, Bicep uses the file's `targetScope`.
2929
::: code language="bicep" source="~/azure-docs-bicep-samples/samples/scenarios-rbac/scope-default.bicep" highlight="4" :::
3030

3131
> [!TIP]
32-
> Ensure you use the smallest scope required for your requirements.
32+
> Use the smallest scope that you need to meet your requirements.
3333
>
3434
> For example, if you need to grant a managed identity access to a single storage account, it's good security practice to create the role assignment at the scope of the storage account, not at the resource group or subscription scope.
3535

articles/cognitive-services/Speech-Service/includes/quickstarts/call-center/azure-prerequisites.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,4 +15,4 @@ ms.author: eur
1515
> [!IMPORTANT]
1616
> This quickstart requires access to [conversation summarization](/azure/cognitive-services/language-service/summarization/how-to/conversation-summarization). To get access, you must submit an [online request](https://aka.ms/applyforconversationsummarization/) and have it approved.
1717
>
18-
> The `--languageKey` and `--languageEndpoint` values in this quickstart must correspond to a resource that's in one of the regions supported by the [conversation summarization API](https://aka.ms/convsumregions).
18+
> The `--languageKey` and `--languageEndpoint` values in this quickstart must correspond to a resource that's in one of the regions supported by the [conversation summarization API](https://aka.ms/convsumregions): `eastus`, `northeurope`, and `uksouth`.

articles/cognitive-services/Speech-Service/includes/quickstarts/call-center/example-output.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ The `transcription` property contains a JSON object with the results of sentimen
4040
}
4141
```
4242

43-
The `conversationAnalyticsResults` property contains a JSON object with the results of the conversation summarization analysis. Here's an example, with redactions for brevity:
43+
The `conversationAnalyticsResults` property contains a JSON object with the results of the conversation PII and conversation summarization analysis. Here's an example, with redactions for brevity:
4444
```json
4545
{
4646
"conversationAnalyticsResults": {

articles/cognitive-services/Speech-Service/includes/quickstarts/call-center/usage-arguments.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ ms.author: eur
77
---
88

99
> [!IMPORTANT]
10-
> You can use a <a href="https://portal.azure.com/#create/Microsoft.CognitiveServicesAllInOne" title="Create a Cognitive Services resource" target="_blank">Cognitive Services multi-service</a> resource or separate <a href="https://portal.azure.com/#create/Microsoft.CognitiveServicesTextAnalytics" title="Create a Language resource" target="_blank">Language</a> and <a href="https://portal.azure.com/#create/Microsoft.CognitiveServicesSpeechServices" title="Create a Speech resource" target="_blank">Speech</a> resources. In either case, the `--languageKey` and `--languageEndpoint` values must correspond to a resource that's in one of the regions supported by the [conversation summarization API](https://aka.ms/convsumregions).
10+
> You can use a <a href="https://portal.azure.com/#create/Microsoft.CognitiveServicesAllInOne" title="Create a Cognitive Services resource" target="_blank">Cognitive Services multi-service</a> resource or separate <a href="https://portal.azure.com/#create/Microsoft.CognitiveServicesTextAnalytics" title="Create a Language resource" target="_blank">Language</a> and <a href="https://portal.azure.com/#create/Microsoft.CognitiveServicesSpeechServices" title="Create a Speech resource" target="_blank">Speech</a> resources. In either case, the `--languageKey` and `--languageEndpoint` values must correspond to a resource that's in one of the regions supported by the [conversation summarization API](https://aka.ms/convsumregions): `eastus`, `northeurope`, and `uksouth`.
1111
1212
Connection options include:
1313

@@ -21,7 +21,7 @@ Input options include:
2121

2222
- `--input URL`: Input audio from URL. You must set either the `--input` or `--jsonInput` option.
2323
- `--jsonInput FILE`: Input an existing batch transcription JSON result from FILE. With this option, you only need a Language resource to process a transcription that you already have. With this option, you don't need an audio file or a Speech resource. Overrides `--input`. You must set either the `--input` or `--jsonInput` option.
24-
- `--stereo`: Use stereo audio format. If stereo isn't specified, then mono 16khz 16 bit PCM wav files are assumed. Diarization of mono files is used to separate multiple speakers. Diarization of stereo files isn't supported, since 2-channel stereo files should already have one speaker per channel.
24+
- `--stereo`: Indicates that the audio via ```input URL` should be in stereo format. If stereo isn't specified, then mono 16khz 16 bit PCM wav files are assumed. Diarization of mono files is used to separate multiple speakers. Diarization of stereo files isn't supported, since 2-channel stereo files should already have one speaker per channel.
2525
- `--certificate`: The PEM certificate file. Required for C++.
2626

2727
Language options include:
@@ -32,4 +32,4 @@ Language options include:
3232
Output options include:
3333

3434
- `--help`: Show the usage help and stop
35-
- `--output FILE`: Output the transcription, sentiment, and conversation summaries in JSON format to a text file. For more information, see [output examples](/azure/cognitive-services/speech-service/call-center-quickstart#check-results).
35+
- `--output FILE`: Output the transcription, sentiment, conversation PII, and conversation summaries in JSON format to a text file. For more information, see [output examples](/azure/cognitive-services/speech-service/call-center-quickstart#check-results).

articles/load-testing/how-to-create-and-run-load-test-with-jmeter-script.md

Lines changed: 18 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ ms.service: load-testing
77
ms.topic: how-to
88
author: ntrogh
99
ms.author: nicktrog
10-
ms.date: 06/10/2022
10+
ms.date: 10/02/2022
1111
adobe-target: true
1212
---
1313

@@ -34,9 +34,11 @@ Use cases for creating a load test with an existing JMeter script include:
3434

3535
## Create an Apache JMeter script
3636

37-
If you don't have an existing Apache JMeter script, you'll create a sample script to load test a single web application endpoint. For more information about creating an Apache JMeter script, see [Getting started with Apache JMeter](https://jmeter.apache.org/usermanual/get-started.html).
37+
If you already have a script, you can skip to [Create a load test](#create-a-load-test). In this section, you'll create a sample JMeter test script to load test a single web endpoint.
3838

39-
If you already have a script, you can skip to [Create a load test](#create-a-load-test).
39+
You can also use the [Apache JMeter test script recorder](https://jmeter.apache.org/usermanual/jmeter_proxy_step_by_step.html) to record the requests while navigating the application in a browser. Alternatively, [import cURL commands](https://jmeter.apache.org/usermanual/curl.html) to generate the requests in the JMeter test script.
40+
41+
To create a sample JMeter test script:
4042

4143
1. Create a *SampleTest.jmx* file on your local machine:
4244

@@ -78,7 +80,7 @@ If you already have a script, you can skip to [Create a load test](#create-a-loa
7880
</ThreadGroup>
7981
<hashTree>
8082
<HTTPSamplerProxy guiclass="HttpTestSampleGui" testclass="HTTPSamplerProxy" testname="HTTP request" enabled="true">
81-
<elementProp name="HTTPsampler.Arguments" elementType="Arguments" guiclass="HTTPArgumentsPanel" testclass="Arguments" testname="User Defined Variables" enabled="true">
83+
<elementProp name="HTTPsampler.Arguments" elementType="Arguments" guiclass="HTTPArgumentsPanel" testclass="Arguments" testname="Sample web test" enabled="true">
8284
<collectionProp name="Arguments.arguments"/>
8385
</elementProp>
8486
<stringProp name="HTTPSampler.domain"></stringProp>
@@ -113,10 +115,9 @@ If you already have a script, you can skip to [Create a load test](#create-a-loa
113115
114116
## Create a load test
115117
116-
To create a load test in Azure Load Testing, you have to specify a JMeter script. This script defines the [test plan](./how-to-create-manage-test.md#test-plan) for the load test. You can create multiple load tests in an Azure Load Testing resource.
118+
When you create a load test in Azure Load Testing, you specify a JMeter script to define the [load test plan](./how-to-create-manage-test.md#test-plan). An Azure Load Testing resource can contain multiple load tests.
117119
118-
> [!NOTE]
119-
> When you [create a quick test by using a URL](./quickstart-create-and-run-load-test.md), Azure Load Testing automatically generates the JMeter script.
120+
When you [create a quick test by using a URL](./quickstart-create-and-run-load-test.md), Azure Load Testing automatically generates the corresponding JMeter script.
120121
121122
To create a load test using an existing JMeter script in the Azure portal:
122123
@@ -139,14 +140,11 @@ To create a load test using an existing JMeter script in the Azure portal:
139140
140141
1. Select **Review + create**. Review all settings, and then select **Create** to create the load test.
141142
142-
:::image type="content" source="./media/how-to-create-and-run-load-test-with-jmeter-script/create-new-test-review.png" alt-text="Screenshot that shows the tab for reviewing and creating a test." :::
143-
144-
> [!NOTE]
145-
> You can update the test configuration at any time, for example to upload a different JMX file. Choose your test in the list of tests, and then select **Edit**.
143+
You can update the test configuration at any time, for example to upload a different JMX file. Choose your test in the list of tests, and then select **Edit**.
146144
147145
## Run the load test
148146
149-
When Azure Load Testing starts your load test, it will first deploy the JMeter script and any other files onto test engine instances and run the test.
147+
When Azure Load Testing starts your load test, it will first deploy the JMeter script, and any other files onto test engine instances, and then start the load test.
150148
151149
If you selected **Run test after creation**, your load test will start automatically. To manually start the load test you created earlier, perform the following steps:
152150
@@ -161,14 +159,16 @@ If you selected **Run test after creation**, your load test will start automatic
161159
> [!TIP]
162160
> You can stop a load test at any time from the Azure portal.
163161
164-
While the test runs and after it finishes, you can view the test run details, statistics, and metrics in the test run dashboard.
162+
1. Notice the test run details, statistics, and client metrics in the Azure portal.
165163
166-
:::image type="content" source="./media/how-to-create-and-run-load-test-with-jmeter-script/test-run-aggregated-by-percentile.png" alt-text="Screenshot that shows the test run dashboard." :::
164+
:::image type="content" source="./media/how-to-create-and-run-load-test-with-jmeter-script/test-run-aggregated-by-percentile.png" alt-text="Screenshot that shows the test run dashboard." :::
167165
168-
## Next steps
166+
Use the run statistics and error information to identify performance and stability issues for your application under load.
169167
170-
- To learn more about [creating and managing tests](./how-to-create-manage-test.md).
168+
## Next steps
171169
172-
- To learn how to export test results, see [Export test results](./how-to-export-test-results.md).
170+
You've created a cloud-based load test based on an existing JMeter test script. For Azure-hosted applications, you can also [monitor server-side metrics](./how-to-monitor-server-side-metrics.md) for further application insights.
173171
174-
- To learn how to monitor server side metrics, see [Monitor server side metrics](./how-to-monitor-server-side-metrics.md).
172+
- Learn how to [export test results](./how-to-export-test-results.md).
173+
- Learn how to [parameterize a load test with environment variables](./how-to-parameterize-load-tests.md).
174+
- Learn how to [configure your test for high-scale load](./how-to-high-scale-load.md).

articles/role-based-access-control/TOC.yml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -35,6 +35,8 @@
3535
items:
3636
- name: Role definitions
3737
href: role-definitions.md
38+
- name: Role assignments
39+
href: role-assignments.md
3840
- name: Scope
3941
href: scope-overview.md
4042
- name: Best practices

0 commit comments

Comments
 (0)