Skip to content

Commit 10b26d6

Browse files
authored
Merge pull request #225375 from MicrosoftDocs/repo_sync_working_branch
Confirm merge from repo_sync_working_branch to main to sync with https://github.com/MicrosoftDocs/azure-docs (branch main)
2 parents 8d76c83 + fe141b7 commit 10b26d6

File tree

12 files changed

+93
-58
lines changed

12 files changed

+93
-58
lines changed

articles/active-directory/develop/scenario-protected-web-api-app-configuration.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,7 @@ You need to specify the `TenantId` only if you want to accept access tokens from
7070
{
7171
"AzureAd": {
7272
"Instance": "https://login.microsoftonline.com/",
73-
"ClientId": "Enter_the_Application_(client)_ID_here"
73+
"ClientId": "Enter_the_Application_(client)_ID_here",
7474
"TenantId": "common"
7575
},
7676
"Logging": {

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

Lines changed: 7 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -26,10 +26,6 @@ Lifecycle Workflow's built-in tasks each include an identifier, known as **taskD
2626

2727
Common task parameters are the non-unique parameters contained in every task. When adding tasks to a new workflow, or a workflow template, you can customize and configure these parameters so that they match your requirements.
2828

29-
30-
> [!NOTE]
31-
> The user's employee hire date is used as the start time for the Temporary Access Pass. Please make sure that the TAP lifetime task setting and the [time portion of your user's hire date](how-to-lifecycle-workflow-sync-attributes.md#importance-of-time) are set appropriately so that the TAP is still valid when the user starts their first day.
32-
3329
|Parameter |Definition |
3430
|---------|---------|
3531
|category | A read-only string that identifies the category or categories of the task. Automatically determined when the taskDefinitionID is chosen. |
@@ -123,21 +119,23 @@ For Microsoft Graph the parameters for the **Send onboarding reminder email** ta
123119

124120
### Generate Temporary Access Pass and send via email to user's manager
125121

126-
When a compatible user joins your organization, Lifecycle Workflows allow you to automatically generate a Temporary Access Pass(TAP), and have it sent to the new user's manager.
122+
When a compatible user joins your organization, Lifecycle Workflows allow you to automatically generate a Temporary Access Pass (TAP), and have it sent to the new user's manager.
123+
124+
> [!NOTE]
125+
> The user's employee hire date is used as the start time for the Temporary Access Pass. Please make sure that the TAP lifetime task setting and the [time portion of your user's hire date](how-to-lifecycle-workflow-sync-attributes.md#importance-of-time) are set appropriately so that the TAP is still valid when the user starts their first day. If the hire date at the time of workflow execution is already in the past, the current time is used as the start time.
127126
128127
With this task in the Azure portal, you're able to give the task a name and description. You must also set:
129128

130-
**Activation duration**- How long the password is active.
131-
**One time use**- If the password is one use only.
129+
- **Activation duration**- How long the passcode is active.
130+
- **One time use**- If the passcode can only be used once.
132131
:::image type="content" source="media/lifecycle-workflow-task/tap-task.png" alt-text="Screenshot of Workflows task: TAP task.":::
133132

134133

135134
The Azure AD prerequisites to run the **Generate Temporary Access Pass and send via email to user's manager** task are:
136135

137136
- A populated manager attribute for the user.
138137
- A populated manager's mail attribute for the user.
139-
- An enabled TAP tenant policy. For more information, see [Enable the Temporary Access Pass policy](../authentication/howto-authentication-temporary-access-pass.md#enable-the-temporary-access-pass-policy)
140-
138+
- The TAP tenant policy must be enabled and the selected values for activation duration and one time use must be within the allowed range of the policy. For more information, see [Enable the Temporary Access Pass policy](../authentication/howto-authentication-temporary-access-pass.md#enable-the-temporary-access-pass-policy)
141139

142140
> [!IMPORTANT]
143141
> A user having this task run for them in a workflow must also not have any other authentication methods, sign-ins, or AAD role assignments for this task to work for them.
@@ -175,10 +173,6 @@ For Microsoft Graph the parameters for the **Generate Temporary Access Pass and
175173
176174
```
177175

178-
> [!NOTE]
179-
> The employee hire date is the same as the startDateTime used for the tapLifetimeInMinutes parameter.
180-
181-
182176
### Add user to groups
183177

184178
Allows users to be added to Microsoft 365 and cloud-only security groups. Mail-enabled, distribution, dynamic and privileged access groups are not supported. To control access to on-premises applications and resources, you need to enable group writeback. For more information, see [Azure AD Connect group writeback](../hybrid/how-to-connect-group-writeback-v2.md).

articles/aks/learn/quick-windows-container-deploy-cli.md

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,23 @@ This article assumes a basic understanding of Kubernetes concepts. For more info
2727
- If you have multiple Azure subscriptions, select the appropriate subscription ID in which the resources should be billed using the
2828
[az account](/cli/azure/account) command.
2929

30+
- Verify _Microsoft.OperationsManagement_ and _Microsoft.OperationalInsights_ providers are registered on your subscription. These are Azure resource providers required to support Container insights. To check the registration status, run the following commands:
31+
32+
```sh
33+
az provider show -n Microsoft.OperationsManagement -o table
34+
az provider show -n Microsoft.OperationalInsights -o table
35+
```
36+
37+
If they are not registered, register _Microsoft.OperationsManagement_ and _Microsoft.OperationalInsights_ using the following commands:
38+
39+
```sh
40+
az provider register --namespace Microsoft.OperationsManagement
41+
az provider register --namespace Microsoft.OperationalInsights
42+
```
43+
44+
> [!NOTE]
45+
> Run the commands with administrative privileges if you plan to run the commands in this quickstart locally instead of in Azure Cloud Shell.
46+
3047
### Limitations
3148

3249
The following limitations apply when you create and manage AKS clusters that support multiple node pools:
@@ -408,5 +425,6 @@ To learn more about AKS, and walk through a complete code to deployment example,
408425
[aks-faq]: faq.md
409426
[az-extension-add]: /cli/azure/extension#az-extension-add
410427
[az-extension-update]: /cli/azure/extension#az-extension-update
428+
[azure-monitor-containers]: ../../azure-monitor/containers/container-insights-overview.md
411429
[windows-server-password]: /windows/security/threat-protection/security-policy-settings/password-must-meet-complexity-requirements#reference
412430
[win-faq-change-admin-creds]: ../windows-faq.md#how-do-i-change-the-administrator-password-for-windows-server-nodes-on-my-cluster

articles/azure-functions/storage-considerations.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -93,7 +93,7 @@ You can use the following strategies to avoid host ID collisions:
9393

9494
You can explicitly set a specific host ID for your function app in the application settings by using the `AzureFunctionsWebHost__hostid` setting. For more information, see [AzureFunctionsWebHost__hostid](functions-app-settings.md#azurefunctionswebhost__hostid).
9595

96-
When the collision occurs between slots, you may need to mark this setting as a slot setting. To learn how to create app settings, see [Work with application settings](functions-how-to-use-azure-function-app-settings.md#settings).
96+
When the collision occurs between slots, you must set a specific host ID for each slot, including the production slot. You must also mark these settings as [deployment settings](functions-deployment-slots.md#create-a-deployment-setting) so they don't get swapped. To learn how to create app settings, see [Work with application settings](functions-how-to-use-azure-function-app-settings.md#settings).
9797

9898
## Azure Arc-enabled clusters
9999

articles/cognitive-services/language-service/summarization/includes/quickstarts/python-sdk.md

Lines changed: 42 additions & 40 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ ms.custom: ignite-fall-2021
1414

1515
# [Conversation summarization](#tab/conversation-summarization)
1616

17-
[Reference documentation](/python/api/overview/azure/ai-language-conversations-readme?preserve-view=true&view=azure-python-preview) | [Additional samples](https://github.com/Azure/azure-sdk-for-python/blob/azure-ai-language-conversations_1.1.0b2/sdk/cognitivelanguage/azure-ai-language-conversations/samples/README.md) | [Package (PyPi)](https://pypi.org/project/azure-ai-language-conversations/1.1.0b2/) | [Library source code](https://github.com/Azure/azure-sdk-for-python/tree/azure-ai-language-conversations_1.1.0b2/sdk/cognitivelanguage/azure-ai-language-conversations)
17+
[Reference documentation](/python/api/overview/azure/ai-language-conversations-readme?preserve-view=true&view=azure-python-preview) | [Additional samples](https://github.com/Azure/azure-sdk-for-python/blob/azure-ai-language-conversations_1.1.0b3/sdk/cognitivelanguage/azure-ai-language-conversations/samples/README.md) | [Package (PyPi)](https://pypi.org/project/azure-ai-language-conversations/1.1.0b3/) | [Library source code](https://github.com/Azure/azure-sdk-for-python/tree/azure-ai-language-conversations_1.1.0b3/sdk/cognitivelanguage/azure-ai-language-conversations)
1818

1919
---
2020

@@ -49,7 +49,7 @@ pip install azure-ai-textanalytics==5.3.0b1
4949
# [Conversation summarization](#tab/conversation-summarization)
5050

5151
```console
52-
pip install azure-ai-language-conversations==1.1.0b2
52+
pip install azure-ai-language-conversations==1.1.0b3
5353
```
5454

5555
---
@@ -155,84 +155,86 @@ with client:
155155
"text": "Hello, you’re chatting with Rene. How may I help you?",
156156
"id": "1",
157157
"role": "Agent",
158-
"participantId": "Agent_1"
158+
"participantId": "Agent_1",
159159
},
160160
{
161161
"text": "Hi, I tried to set up wifi connection for Smart Brew 300 coffee machine, but it didn’t work.",
162162
"id": "2",
163163
"role": "Customer",
164-
"participantId": "Customer_1"
164+
"participantId": "Customer_1",
165165
},
166166
{
167167
"text": "I’m sorry to hear that. Let’s see what we can do to fix this issue. Could you please try the following steps for me? First, could you push the wifi connection button, hold for 3 seconds, then let me know if the power light is slowly blinking on and off every second?",
168168
"id": "3",
169169
"role": "Agent",
170-
"participantId": "Agent_1"
170+
"participantId": "Agent_1",
171171
},
172172
{
173173
"text": "Yes, I pushed the wifi connection button, and now the power light is slowly blinking.",
174174
"id": "4",
175175
"role": "Customer",
176-
"participantId": "Customer_1"
176+
"participantId": "Customer_1",
177177
},
178178
{
179179
"text": "Great. Thank you! Now, please check in your Contoso Coffee app. Does it prompt to ask you to connect with the machine?",
180180
"id": "5",
181181
"role": "Agent",
182-
"participantId": "Agent_1"
182+
"participantId": "Agent_1",
183183
},
184184
{
185185
"text": "No. Nothing happened.",
186186
"id": "6",
187187
"role": "Customer",
188-
"participantId": "Customer_1"
188+
"participantId": "Customer_1",
189189
},
190190
{
191191
"text": "I’m very sorry to hear that. Let me see if there’s another way to fix the issue. Please hold on for a minute.",
192192
"id": "7",
193193
"role": "Agent",
194-
"participantId": "Agent_1"
195-
}
194+
"participantId": "Agent_1",
195+
},
196196
],
197197
"modality": "text",
198198
"id": "conversation1",
199-
"language": "en"
199+
"language": "en",
200200
},
201201
]
202202
},
203203
"tasks": [
204204
{
205-
"taskName": "analyze 1",
205+
"taskName": "Issue task",
206+
"kind": "ConversationalSummarizationTask",
207+
"parameters": {"summaryAspects": ["issue"]},
208+
},
209+
{
210+
"taskName": "Resolution task",
206211
"kind": "ConversationalSummarizationTask",
207-
"parameters": {
208-
"summaryAspects": ["Issue, Resolution"]
209-
}
210-
}
211-
]
212+
"parameters": {"summaryAspects": ["resolution"]},
213+
},
214+
],
212215
}
213216
)
214217

215218
# view result
216219
result = poller.result()
217-
task_result = result["tasks"]["items"][0]
218-
print("... view task status ...")
219-
print("status: {}".format(task_result["status"]))
220-
resolution_result = task_result["results"]
221-
if resolution_result["errors"]:
222-
print("... errors occured ...")
223-
for error in resolution_result["errors"]:
224-
print(error)
225-
else:
226-
conversation_result = resolution_result["conversations"][0]
227-
if conversation_result["warnings"]:
228-
print("... view warnings ...")
229-
for warning in conversation_result["warnings"]:
230-
print(warning)
220+
task_results = result["tasks"]["items"]
221+
for task in task_results:
222+
print(f"\n{task['taskName']} status: {task['status']}")
223+
task_result = task["results"]
224+
if task_result["errors"]:
225+
print("... errors occurred ...")
226+
for error in task_result["errors"]:
227+
print(error)
231228
else:
232-
summaries = conversation_result["summaries"]
233-
print("... view task result ...")
234-
print("issue: {}".format(summaries[0]["text"]))
235-
print("resolution: {}".format(summaries[1]["text"]))
229+
conversation_result = task_result["conversations"][0]
230+
if conversation_result["warnings"]:
231+
print("... view warnings ...")
232+
for warning in conversation_result["warnings"]:
233+
print(warning)
234+
else:
235+
summaries = conversation_result["summaries"]
236+
for summary in summaries:
237+
print(f"{summary['aspect']}: {summary['text']}")
236238

237239
```
238240

@@ -242,11 +244,11 @@ with client:
242244
### Output
243245

244246
```console
245-
... view task status ...
246-
status: succeeded
247-
... view task result ...
248-
issue: Customer tried to set up wifi connection for Smart Brew 300 coffee machine, but it didn't work
249-
resolution: Asked customer to try the following steps | Asked customer for the power light | Helped customer to connect to the machine
247+
Issue task status: succeeded
248+
issue: Customer tried to set up wifi connection for Smart Brew 300 coffee machine but it didn't work. No error message.
249+
250+
Resolution task status: succeeded
251+
resolution: Asked customer to check if the Contoso Coffee app prompts to connect with the machine. Customer ended the chat.
250252
```
251253

252254
---

articles/deployment-environments/configure-catalog-item.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ In Azure Deployment Environments Preview, you can use a [catalog](concept-enviro
1919
A catalog item is combined of least two files:
2020

2121
- An [Azure Resource Manager template (ARM template)](../azure-resource-manager/templates/overview.md) in JSON file format. For example, *azuredeploy.json*.
22-
- A manifest YAML file (*manifest.yml*).
22+
- A manifest YAML file (*manifest.yaml*).
2323

2424
>[!NOTE]
2525
> Azure Deployment Environments Preview currently supports only ARM templates.

articles/deployment-environments/how-to-configure-use-cli.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -259,7 +259,7 @@ az devcenter admin project delete -g <resource-group-name> --name <project-name>
259259
**Create an environment**
260260

261261
```azurecli
262-
az devcenter dev environment create -g <resource-group-name> --dev-center-name <devcenter-name> \
262+
az devcenter dev environment create --dev-center-name <devcenter-name> \
263263
--project-name <project-name> -n <name> --environment-type <environment-type-name> \
264264
--catalog-item-name <catalog-item-name> ---catalog-name <catalog-name> \
265265
--parameters <deployment-parameters-json-string>

0 commit comments

Comments
 (0)