Skip to content

Commit f6cd3ff

Browse files
committed
Merge branch 'main' of https://github.com/MicrosoftDocs/azure-docs-pr into nw-overview
2 parents b7fc3b6 + c060507 commit f6cd3ff

File tree

108 files changed

+1042
-800
lines changed

Some content is hidden

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

108 files changed

+1042
-800
lines changed

.openpublishing.redirection.json

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4087,10 +4087,12 @@
40874087
"source_path_from_root": "/articles/event-grid/move-domains-across-regions.md",
40884088
"redirect_url": "/azure",
40894089
"redirect_document_id": false
4090+
},
4091+
{
4092+
"source_path_from_root": "/articles/data-factory/continuous-integration-delivery-automate-github-actions.md",
4093+
"redirect_url": "/azure",
4094+
"redirect_document_id": false
40904095
}
4091-
4092-
4093-
4094-
4096+
40954097
]
40964098
}

articles/ai-services/computer-vision/includes/identity-curl-quickstart.md

Lines changed: 81 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -24,8 +24,7 @@ Get started with facial recognition using the Face REST API. The Face service pr
2424
* You'll need the key and endpoint from the resource you create to connect your application to the Face API. You'll paste your key and endpoint into the code below later in the quickstart.
2525
* You can use the free pricing tier (`F0`) to try the service, and upgrade later to a paid tier for production.
2626
* [PowerShell version 6.0+](/powershell/scripting/install/installing-powershell-core-on-windows), or a similar command-line application.
27-
* [cURL](https://curl.haxx.se/) installed.
28-
27+
* [cURL](https://curl.se/) installed.
2928

3029

3130

@@ -34,58 +33,134 @@ Get started with facial recognition using the Face REST API. The Face service pr
3433
> [!NOTE]
3534
> If you haven't received access to the Face service using the [intake form](https://aka.ms/facerecognition), some of these functions won't work.
3635
37-
1. First, call the Detect API on the source face. This is the face that we'll try to identify from the larger group. Copy the following command to a text editor, insert your own key, and then copy it into a shell window and run it.
36+
1. First, call the Detect API on the source face. This is the face that we'll try to identify from the larger group. Copy the following command to a text editor, insert your own key and endpoint, and then copy it into a shell window and run it.
37+
38+
#### [Windows](#tab/windows)
39+
40+
:::code source="~/cognitive-services-quickstart-code/curl/face/detect.ps1" ID="identify_detect":::
41+
42+
#### [Linux](#tab/linux)
3843

3944
:::code source="~/cognitive-services-quickstart-code/curl/face/detect.sh" ID="identify_detect":::
4045

46+
---
47+
4148
Save the returned face ID string to a temporary location. You'll use it again at the end.
4249

43-
1. Next you'll need to create a **LargePersonGroup**. This object will store the aggregated face data of several persons. Run the following command, inserting your own key. Optionally, change the group's name and metadata in the request body.
50+
1. Next you'll need to create a **LargePersonGroup** and give it an arbitrary ID that matches regex pattern `^[a-z0-9-_]+$`. This object will store the aggregated face data of several persons. Run the following command, inserting your own key. Optionally, change the group's name and metadata in the request body.
51+
52+
#### [Windows](#tab/windows)
53+
54+
:::code source="~/cognitive-services-quickstart-code/curl/face/detect.ps1" ID="identify_create_persongroup":::
55+
56+
#### [Linux](#tab/linux)
4457

4558
:::code source="~/cognitive-services-quickstart-code/curl/face/detect.sh" ID="identify_create_persongroup":::
4659

47-
Save the returned ID of the created group to a temporary location.
60+
---
61+
62+
Save the specified ID of the created group to a temporary location.
4863

4964
1. Next, you'll create **Person** objects that belong to the group. Run the following command, inserting your own key and the ID of the **LargePersonGroup** from the previous step. This command creates a **Person** named "Family1-Dad".
5065

66+
#### [Windows](#tab/windows)
67+
68+
:::code source="~/cognitive-services-quickstart-code/curl/face/detect.ps1" ID="identify_create_person":::
69+
70+
#### [Linux](#tab/linux)
71+
5172
:::code source="~/cognitive-services-quickstart-code/curl/face/detect.sh" ID="identify_create_person":::
5273

74+
---
75+
5376
After you run this command, run it again with different input data to create more **Person** objects: "Family1-Mom", "Family1-Son", "Family1-Daughter", "Family2-Lady", and "Family2-Man".
5477

5578
Save the IDs of each **Person** created; it's important to keep track of which person name has which ID.
5679

5780
1. Next you'll need to detect new faces and associate them with the **Person** objects that exist. The following command detects a face from the image *Family1-Dad1.jpg* and adds it to the corresponding person. You need to specify the `personId` as the ID that was returned when you created the "Family1-Dad" **Person** object. The image name corresponds to the name of the created **Person**. Also enter the **LargePersonGroup** ID and your key in the appropriate fields.
5881

82+
#### [Windows](#tab/windows)
83+
84+
:::code source="~/cognitive-services-quickstart-code/curl/face/detect.ps1" ID="identify_add_face":::
85+
86+
#### [Linux](#tab/linux)
87+
5988
:::code source="~/cognitive-services-quickstart-code/curl/face/detect.sh" ID="identify_add_face":::
6089

90+
---
91+
6192
Then, run the above command again with a different source image and target **Person**. The images available are: *Family1-Dad1.jpg*, *Family1-Dad2.jpg* *Family1-Mom1.jpg*, *Family1-Mom2.jpg*, *Family1-Son1.jpg*, *Family1-Son2.jpg*, *Family1-Daughter1.jpg*, *Family1-Daughter2.jpg*, *Family2-Lady1.jpg*, *Family2-Lady2.jpg*, *Family2-Man1.jpg*, and *Family2-Man2.jpg*. Be sure that the **Person** whose ID you specify in the API call matches the name of the image file in the request body.
6293

6394
At the end of this step, you should have multiple **Person** objects that each have one or more corresponding faces, detected directly from the provided images.
6495

6596
1. Next, train the **LargePersonGroup** with the current face data. The training operation teaches the model how to associate facial features, sometimes aggregated from multiple source images, to each single person. Insert the **LargePersonGroup** ID and your key before running the command.
6697

98+
#### [Windows](#tab/windows)
99+
100+
:::code source="~/cognitive-services-quickstart-code/curl/face/detect.ps1" ID="identify_train":::
101+
102+
#### [Linux](#tab/linux)
103+
67104
:::code source="~/cognitive-services-quickstart-code/curl/face/detect.sh" ID="identify_train":::
105+
106+
---
68107

108+
1. Check whether the training status is succeeded. If not, wait for a while and query again.
109+
110+
#### [Windows](#tab/windows)
111+
112+
:::code source="~/cognitive-services-quickstart-code/curl/face/detect.ps1" ID="identify_check_status":::
113+
114+
#### [Linux](#tab/linux)
115+
116+
:::code source="~/cognitive-services-quickstart-code/curl/face/detect.sh" ID="identify_check_status":::
117+
118+
---
119+
69120
1. Now you're ready to call the Identify API, using the source face ID from the first step and the **LargePersonGroup** ID. Insert these values into the appropriate fields in the request body, and insert your key.
70121

122+
#### [Windows](#tab/windows)
123+
124+
:::code source="~/cognitive-services-quickstart-code/curl/face/detect.ps1" ID="identify_identify":::
125+
126+
#### [Linux](#tab/linux)
127+
71128
:::code source="~/cognitive-services-quickstart-code/curl/face/detect.sh" ID="identify_identify":::
72129

130+
---
131+
73132
The response should give you a **Person** ID indicating the person identified with the source face. It should be the ID that corresponds to the "Family1-Dad" person, because the source face is of that person.
74133

75134
1. To do face verification, you'll use the **Person** ID returned in the previous step, the **LargePersonGroup** ID, and also the source face ID. Insert these values into the fields in the request body, and insert your key.
76135

136+
#### [Windows](#tab/windows)
137+
138+
:::code source="~/cognitive-services-quickstart-code/curl/face/detect.ps1" ID="verify":::
139+
140+
#### [Linux](#tab/linux)
141+
77142
:::code source="~/cognitive-services-quickstart-code/curl/face/detect.sh" ID="verify":::
78143

144+
---
145+
79146
The response should give you a boolean verification result along with a confidence value.
80147

81148

82149

83150
## Clean up resources
84151

85-
To delete the **LargePersonGroup** you created in this exercise, run the LargePersonGroup - Delete call.
152+
To delete the **LargePersonGroup** you created in this exercise, run the [LargePersonGroup - Delete](/rest/api/face/person-group-operations/delete-large-person-group) call.
153+
154+
#### [Windows](#tab/windows)
155+
156+
:::code source="~/cognitive-services-quickstart-code/curl/face/detect.ps1" ID="identify_delete":::
157+
158+
#### [Linux](#tab/linux)
86159

87160
:::code source="~/cognitive-services-quickstart-code/curl/face/detect.sh" ID="identify_delete":::
88161

162+
---
163+
89164
If you want to clean up and remove an Azure AI services subscription, you can delete the resource or resource group. Deleting the resource group also deletes any other resources associated with it.
90165

91166
* [Portal](../../multi-service-resource.md?pivots=azportal#clean-up-resources)

articles/ai-services/document-intelligence/containers/install-run.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ ms.author: lajanuar
1919
<!-- markdownlint-disable MD051 -->
2020

2121
:::moniker range="doc-intel-2.1.0 || doc-intel-4.0.0"
22-
Support for containers is currently available with Document Intelligence version `2022-08-31 (GA)` for all models and `2023-07-31 (GA)` for Read and Layout only:
22+
Support for containers is currently available with Document Intelligence version `2022-08-31 (GA)` for all models and `2023-07-31 (GA)` for Read, Layout, ID Document, Receipt and Invoice models:
2323

2424
* [REST API `2022-08-31 (GA)`](/rest/api/aiservices/document-models/analyze-document?view=rest-aiservices-v3.0%20(2022-08-31)&preserve-view=true&tabs=HTTP)
2525
* [REST API `2023-07-31 (GA)`](/rest/api/aiservices/document-models/analyze-document?view=rest-aiservices-v3.1%20(2023-07-31)&tabs=HTTP&preserve-view=true)
@@ -38,9 +38,9 @@ Azure AI Document Intelligence is an Azure AI service that lets you build automa
3838

3939
In this article you learn how to download, install, and run Document Intelligence containers. Containers enable you to run the Document Intelligence service in your own environment. Containers are great for specific security and data governance requirements.
4040

41-
* **Read**, and **Layout** models are supported by Document Intelligence v3.1 containers.
41+
* **Read**, **Layout**, **ID Document**, **Receipt**, and **Invoice** models are supported by Document Intelligence v3.1 containers.
4242

43-
* **Read**, **Layout**, **General Document**, **ID Document**, **Receipt**, **Invoice**, **Business Card**, and **Custom** models are supported by Document Intelligence v3.0 containers.
43+
* **Read**, **Layout**, **General Document**, **Business Card**, and **Custom** models are supported by Document Intelligence v3.0 containers.
4444

4545
* **Business Card** model is currently only supported in the [v2.1 containers](install-run.md?view=doc-intel-2.1.0&preserve-view=true).
4646

articles/ai-services/document-intelligence/studio-overview.md

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -53,6 +53,9 @@ Your organization can opt to disable local authentication and enforce Microsoft
5353

5454
* **Designating role assignments**. Document Intelligence Studio basic access requires the [`Cognitive Services User`](../../role-based-access-control/built-in-roles/ai-machine-learning.md#cognitive-services-user) role. For more information, *see* [Document Intelligence role assignments](quickstarts/try-document-intelligence-studio.md#azure-role-assignments) and [Document Intelligence Studio Permission](faq.yml#what-permissions-do-i-need-to-access-document-intelligence-studio-).
5555

56+
> [!IMPORTANT]
57+
> Make sure you have the Cognitive Services User role, and not the Cognitive Services Contributor role when setting up Entra authentication. In Azure concept, Contributor role can only perform actions to control and manage the resource itself, including listing the access keys. Any user accounts with "Contributor" role that is able to access the Document Intelligence service is calling with access keys. However, when setting up access with Entra ID, key-access will be disabled and Cognitive Service User role will be required for an account to use the resources.
58+
5659
## Authentication
5760

5861
Navigate to the [Document Intelligence Studio](https://formrecognizer.appliedai.azure.com/). If it's your first time logging in, a popup window appears prompting you to configure your service resource. In accordance with your organization's policy, you have one or two options:

articles/ai-services/openai/concepts/content-filter.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -989,7 +989,7 @@ data: [DONE]
989989
```
990990
991991
> [!IMPORTANT]
992-
> When content filtering is triggered for a prompt and a `"status": 400` is received as part of the response there will be a charge for this request as the prompt was evaluated by the service. [Charges will also occur](https://azure.microsoft.com/pricing/details/cognitive-services/openai-service/) when a `"status":200` is received with `"finish_reason": "content_filter"`. In this case the prompt did not have any issues, but the completion generated by the model was detected to violate the content filtering rules which results in the completion being filtered.
992+
> When content filtering is triggered for a prompt and a `"status": 400` is received as part of the response there will be a charge for this request as the prompt was evaluated by the service. Due to the asynchronous nature of the content filtering system, a charge for both the prompt and completion tokens will occur. [Charges will also occur](https://azure.microsoft.com/pricing/details/cognitive-services/openai-service/) when a `"status":200` is received with `"finish_reason": "content_filter"`. In this case the prompt did not have any issues, but the completion generated by the model was detected to violate the content filtering rules which results in the completion being filtered.
993993
994994
## Best practices
995995

articles/aks/control-plane-metrics-default-list.md

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -42,17 +42,20 @@ The following metrics are allow-listed with `minimalingestionprofile=true` for d
4242
- `apiserver_cache_list_returned_objects_total`
4343
- `apiserver_flowcontrol_demand_seats_average`
4444
- `apiserver_flowcontrol_current_limit_seats`
45-
- `apiserver_request_sli_duration_seconds_bucket`
45+
- ~~`apiserver_request_sli_duration_seconds_bucket`~~
4646
- `apiserver_request_sli_duration_seconds_sum`
4747
- `apiserver_request_sli_duration_seconds_count`
4848
- `process_start_time_seconds`
49-
- `apiserver_request_duration_seconds_bucket`
49+
- ~~`apiserver_request_duration_seconds_bucket`~~
5050
- `apiserver_request_duration_seconds_sum`
5151
- `apiserver_request_duration_seconds_count`
5252
- `apiserver_storage_list_fetched_objects_total`
5353
- `apiserver_storage_list_returned_objects_total`
5454
- `apiserver_current_inflight_requests`
5555

56+
> [!NOTE]
57+
`apiserver_request_sli_duration_seconds_bucket` and `apiserver_request_duration_seconds_bucket` are not collected now with a recent release. These are high cardinality metrics which may increase the number of metrics stored based on the number of custom resources in the cluster. If you would like to collect these bucket metrics, you can add it to the keep list. We highly recommend not turning off the minimal ingestion profile for the control plane components
58+
5659
**controlplane-etcd**
5760

5861
- `etcd_server_has_leader`

articles/aks/manage-abort-operations.md

Lines changed: 25 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,31 @@ This command provides you with a percentage that indicates how close the operati
2828
"status": "InProgress"
2929
```
3030

31+
There is also a cli command equivalent for the above that shows the status of the most recent operation in the cluster.
32+
```azurecli-interactive
33+
az aks operation show-latest --resource-group myResourceGroup --name myCluster
34+
```
35+
The following is an example output -
36+
```azurecli-interactive
37+
{
38+
"endTime": null,
39+
"error": null,
40+
"id": "/subscriptions/3368aba5-673c-452f-96b8-71326a289646/resourcegroups/testkaar/providers/Microsoft.ContainerService/managedClusters/contoso/operations/94e04d66-5b57-4c2b-bf3e-e026f1067dd1",
41+
"name": "94e04d66-5b57-4c2b-bf3e-e026f1067dd1",
42+
"operations": null,
43+
"percentComplete": 1.0,
44+
"resourceGroup": "testkaar",
45+
"resourceId": null,
46+
"startTime": "2024-06-12T18:16:21+00:00",
47+
"status": "InProgress"
48+
}
49+
```
50+
You can also run this command using the operation-id available from the above output. The `Id` parameter denotes the operation-id to use example:
51+
52+
```azurecli-interactive
53+
az aks operation show --resource-group myResourceGroup --name myCluster --operation-id "94e04d66-5b57-4c2b-bf3e-e026f1067dd1"
54+
```
55+
3156
While it's important to allow operations to gracefully terminate when they're no longer needed, there are circumstances where you need to release control of node pools and clusters with long running operations using an *abort* command.
3257

3358
AKS support for aborting long running operations is now generally available. This feature allows you to take back control and run another operation seamlessly. This design is supported using the [Azure REST API](/rest/api/azure/) or the [Azure CLI](/cli/azure/).

articles/aks/manage-azure-rbac.md

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,10 +13,11 @@ author: palma21
1313

1414
# Use Azure role-based access control for Kubernetes Authorization
1515

16-
When you leverage [integrated authentication between Microsoft Entra ID and AKS](managed-azure-ad.md), you can use Microsoft Entra users, groups, or service principals as subjects in [Kubernetes role-based access control (Kubernetes RBAC)][kubernetes-rbac]. This feature frees you from having to separately manage user identities and credentials for Kubernetes. However, you still have to set up and manage Azure RBAC and Kubernetes RBAC separately.
17-
1816
This article covers how to use Azure RBAC for Kubernetes Authorization, which allows for the unified management and access control across Azure resources, AKS, and Kubernetes resources. For more information, see [Azure RBAC for Kubernetes Authorization][kubernetes-rbac].
1917

18+
> [!NOTE]
19+
> When you leverage [integrated authentication between Microsoft Entra ID and AKS](managed-azure-ad.md), you can use Microsoft Entra users, groups, or service principals as subjects in [Kubernetes role-based access control (Kubernetes RBAC)][kubernetes-rbac]. This feature frees you from having to separately manage user identities and credentials for Kubernetes. However, you still have to set up and manage Azure RBAC and Kubernetes RBAC separately.
20+
2021
## Before you begin
2122

2223
* You need the Azure CLI version 2.24.0 or later installed and configured. Run `az --version` to find the version. If you need to install or upgrade, see [Install Azure CLI][install-azure-cli].

articles/app-service/tutorial-connect-app-access-sql-database-as-user-dotnet.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -88,7 +88,7 @@ First, enable Microsoft Entra authentication to SQL Database by assigning a Micr
8888
1. Restrict the database server authentication to Active Directory authentication. This step effectively disables SQL authentication.
8989
9090
```azurecli-interactive
91-
az sql server ad-only-auth enable --resource-group <group-name> --server-name <server-name>
91+
az sql server ad-only-auth enable --resource-group <group-name> --name <server-name>
9292
```
9393
9494
For more information on adding an Active Directory admin, see [Provision Microsoft Entra admin (SQL Database)](/azure/azure-sql/database/authentication-aad-configure#provision-azure-ad-admin-sql-database).

articles/automation/automation-linux-hrw-install.md

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -229,15 +229,13 @@ sudo python /opt/microsoft/omsconfig/modules/nxOMSAutomationWorker/DSCResources/
229229

230230
## <a name="remove-linux-hybrid-runbook-worker"></a>Remove the Hybrid Runbook Worker
231231

232-
Run the following commands as root on the agent-based Linux Hybrid Worker:
232+
1. Run the following commands as root on the agent-based Linux Hybrid Worker:
233233

234-
1. ```bash
235-
sudo bash
234+
```bash
235+
sudo bash
236+
rm -r /home/nxautomation
236237
```
237238

238-
1. ```bash
239-
rm -r /home/nxautomation
240-
```
241239
1. Under **Process Automation**, select **Hybrid worker groups** and then your hybrid worker group to go to the **Hybrid Worker Group** page.
242240
1. Under **Hybrid worker group**, select **Hybrid Workers**.
243241
1. Select the checkbox next to the machine(s) you want to delete from the hybrid worker group.

0 commit comments

Comments
 (0)