Skip to content

Commit b095e6c

Browse files
Merge pull request #275883 from TimShererWithAquent/052124OPBR
Fix merge conflicts in sync build
2 parents 33ecff3 + 71db949 commit b095e6c

File tree

44 files changed

+110
-129
lines changed

Some content is hidden

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

44 files changed

+110
-129
lines changed

articles/ai-services/computer-vision/includes/quickstarts-sdk/identity-python-sdk.md

Lines changed: 24 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -15,12 +15,12 @@ ms.author: pafarley
1515

1616
Get started with facial recognition using the Face client library for Python. Follow these steps to install the package and try out the example code for basic tasks. The Face service provides you with access to advanced algorithms for detecting and recognizing human faces in images. Follow these steps to install the package and try out the example code for basic face identification using remote images.
1717

18-
[Reference documentation](/python/api/overview/azure/cognitiveservices/face-readme) | [Library source code](https://github.com/Azure/azure-sdk-for-python/tree/master/sdk/cognitiveservices/azure-cognitiveservices-vision-face) | [Package (PiPy)](https://pypi.org/project/azure-cognitiveservices-vision-face/) | [Samples](/samples/browse/?products=azure&term=face)
18+
[Reference documentation](/python/api/azure-ai-vision-face/azure.ai.vision.face) | [Library source code](https://github.com/Azure/azure-sdk-for-python/tree/main/sdk/face/azure-ai-vision-face/azure/ai/vision/face) | [Package (PiPy)](https://aka.ms/azsdk-python-face-pkg) | [Samples](https://github.com/Azure/azure-sdk-for-python/tree/main/sdk/face/azure-ai-vision-face/samples)
1919

2020
## Prerequisites
2121

2222
* Azure subscription - [Create one for free](https://azure.microsoft.com/free/cognitive-services/)
23-
* [Python 3.x](https://www.python.org/)
23+
* [Python 3.8+](https://www.python.org/)
2424
* Your Python installation should include [pip](https://pip.pypa.io/en/stable/). You can check if you have pip installed by running `pip --version` on the command line. Get pip by installing the latest version of Python.
2525
* [!INCLUDE [contributor-requirement](../../../includes/quickstarts/contributor-requirement.md)]
2626
* Once you have your Azure subscription, <a href="https://portal.azure.com/#create/Microsoft.CognitiveServicesFace" title="Create a Face resource" target="_blank">create a Face resource</a> in the Azure portal to get your key and endpoint. After it deploys, select **Go to resource**.
@@ -38,7 +38,7 @@ Get started with facial recognition using the Face client library for Python. Fo
3838
After installing Python, you can install the client library with:
3939

4040
```console
41-
pip install --upgrade azure-cognitiveservices-vision-face
41+
python -m pip install azure-ai-vision-face
4242
```
4343

4444
1. Create a new Python application
@@ -65,25 +65,28 @@ Get started with facial recognition using the Face client library for Python. Fo
6565
## Output
6666

6767
```console
68-
Person group: c8e679eb-0b71-43b4-aa91-ab8200cae7df
69-
face 861d769b-d014-40e8-8b4a-7fd3bc9b425b added to person f80c1cfa-b8cb-46f8-9f7f-e72fbe402bc3
70-
face e3c356a4-1ac3-4c97-9219-14648997f195 added to person f80c1cfa-b8cb-46f8-9f7f-e72fbe402bc3
71-
face f9119820-c374-4c4d-b795-96ae2fec5069 added to person be4084a7-0c7b-4cf9-9463-3756d2e28e17
72-
face 67d626df-3f75-4801-9364-601b63c8296a added to person be4084a7-0c7b-4cf9-9463-3756d2e28e17
73-
face 19e2e8cc-5029-4087-bca0-9f94588fb850 added to person 3ff07c65-6193-4d3e-bf18-d7c106393cd5
74-
face dcc61e80-16b1-4241-ae3f-9721597bae4c added to person 3ff07c65-6193-4d3e-bf18-d7c106393cd5
75-
pg resource is c8e679eb-0b71-43b4-aa91-ab8200cae7df
76-
<msrest.pipeline.ClientRawResponse object at 0x00000240DAD47310>
77-
Training status: running.
78-
79-
Training status: succeeded.
80-
68+
Person group: dbd92bf0-8b74-43fc-a27a-b127c1bb1b66
69+
face 1d09b50e-0fb6-430c-a47c-9bb235761c17 added to person ea92a5d5-5250-44db-88fb-3b32e1a1ecaf
70+
face 74e1807a-6c86-4c74-b497-a3bcdda8c631 added to person ea92a5d5-5250-44db-88fb-3b32e1a1ecaf
71+
face 512cc8ff-e18a-4702-9413-3c83af9a0915 added to person f03219b3-c2dc-4ad6-b00b-bd71792686ac
72+
face 899bbe8e-2d03-4941-8221-d087911df21b added to person f03219b3-c2dc-4ad6-b00b-bd71792686ac
73+
face dfc0d142-36b0-4d90-982b-b51570ead5a8 added to person 8697d263-be7b-4d78-ba40-b55305dbbeb6
74+
face 29939a66-9da2-46f2-b572-abbe4e0d754a added to person 8697d263-be7b-4d78-ba40-b55305dbbeb6
75+
Train the person group dbd92bf0-8b74-43fc-a27a-b127c1bb1b66
76+
The person group dbd92bf0-8b74-43fc-a27a-b127c1bb1b66 is trained successfully.
8177
Pausing for 10 seconds to avoid triggering rate limit on free account...
8278
Identifying faces in image
83-
Person for face ID 40582995-d3a8-41c4-a9d1-d17ae6b46c5c is identified in image, with a confidence of 0.96725.
84-
Person for face ID 7a0368a2-332c-4e7a-81c4-2db3d74c78c5 is identified in image, with a confidence of 0.96921.
85-
No person identified for face ID c4a3dd28-ef2d-457e-81d1-a447344242c4 in image.
86-
Person for face ID 360edf1a-1e8f-402d-aa96-1734d0c21c1c is identified in image, with a confidence of 0.92886.
79+
Person is identified for face ID 5779a986-238c-499d-b22a-d2a7cec92e88 in image, with a confidence of 0.96725.
80+
verification result: True. confidence: 0.96725
81+
Person is identified for face ID a28a4997-600e-4595-be39-d7a7d0f8afc8 in image, with a confidence of 0.96921.
82+
verification result: True. confidence: 0.96921
83+
No person identified for face ID 02a56d35-f3a4-43eb-a295-f23a1b772de9 in image.
84+
Person is identified for face ID 5de2019a-c4d3-4021-b8d0-9a3b86adceb7 in image, with a confidence of 0.92886.
85+
verification result: True. confidence: 0.92886
86+
87+
The person group dbd92bf0-8b74-43fc-a27a-b127c1bb1b66 is deleted.
88+
89+
End of quickstart.
8790
```
8891

8992

@@ -95,10 +98,6 @@ If you want to clean up and remove an Azure AI services subscription, you can de
9598
* [Portal](../../../multi-service-resource.md?pivots=azportal#clean-up-resources)
9699
* [Azure CLI](../../../multi-service-resource.md?pivots=azcli#clean-up-resources)
97100

98-
To delete the **PersonGroup** you created in this quickstart, run the following code in your script:
99-
100-
[!code-python[](~/cognitive-services-quickstart-code/python/Face/FaceQuickstart.py?name=snippet_deletegroup)]
101-
102101
## Next steps
103102

104103
In this quickstart, you learned how to use the Face client library for Python to do basic face identification. Next, learn about the different face detection models and how to specify the right model for your use case.
@@ -107,4 +106,4 @@ In this quickstart, you learned how to use the Face client library for Python to
107106
> [Specify a face detection model version](../../how-to/specify-detection-model.md)
108107
109108
* [What is the Face service?](../../overview-identity.md)
110-
* More extensive sample code can be found on [GitHub](https://github.com/Azure-Samples/cognitive-services-quickstart-code/blob/master/python/Face/FaceQuickstart.py).
109+
* More extensive sample code can be found on [GitHub](https://github.com/Azure/azure-sdk-for-python/tree/main/sdk/face/azure-ai-vision-face/samples).

articles/ai-services/document-intelligence/concept-model-overview.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ ms.author: lajanuar
4545

4646
The following table shows the available models for each current preview and stable API:
4747

48-
|**Model Type**| **Model**|&bullet; [2024-02-29-preview](/rest/api/aiservices/document-models/build-model?view=rest-aiservices-2024-02-29-preview&preserve-view=true&branch=docintelligence&tabs=HTTP) <br> &bullet [2023-10-31-preview](/rest/api/aiservices/operation-groups?view=rest-aiservices-2024-02-29-preview&preserve-view=true)|[2023-07-31 (GA)](/rest/api/aiservices/document-models/analyze-document?view=rest-aiservices-2023-07-31&preserve-view=true&tabs=HTTP)|[2022-08-31 (GA)](https://westus.dev.cognitive.microsoft.com/docs/services/form-recognizer-api-2022-08-31/operations/AnalyzeDocument)|[v2.1 (GA)](https://westus.dev.cognitive.microsoft.com/docs/services/form-recognizer-api-v2-1/operations/AnalyzeBusinessCardAsync)|
48+
|**Model Type**| **Model**|&bullet; [2024-02-29-preview](/rest/api/aiservices/document-models/build-model?view=rest-aiservices-2024-02-29-preview&preserve-view=true&branch=docintelligence&tabs=HTTP) <br> &bullet; [2023-10-31-preview](/rest/api/aiservices/operation-groups?view=rest-aiservices-2024-02-29-preview&preserve-view=true)|[2023-07-31 (GA)](/rest/api/aiservices/document-models/analyze-document?view=rest-aiservices-2023-07-31&preserve-view=true&tabs=HTTP)|[2022-08-31 (GA)](https://westus.dev.cognitive.microsoft.com/docs/services/form-recognizer-api-2022-08-31/operations/AnalyzeDocument)|[v2.1 (GA)](https://westus.dev.cognitive.microsoft.com/docs/services/form-recognizer-api-v2-1/operations/AnalyzeBusinessCardAsync)|
4949
|----------------|-----------|---|--|---|---|
5050
|Document analysis models|[Read](concept-read.md) | ✔️| ✔️| ✔️| n/a|
5151
|Document analysis models|[Layout](concept-layout.md) | ✔️| ✔️| ✔️| ✔️|

articles/aks/azure-csi-files-storage-provision.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -83,7 +83,7 @@ Storage classes define how to create an Azure file share. A storage account is a
8383
* `Standard_ZRS`: Standard zone redundant storage (ZRS)
8484
* `Standard_RAGRS`: Standard read-access geo-redundant storage (RA-GRS)
8585
* `Premium_LRS`: Premium locally redundant storage (LRS)
86-
* `Premium_ZRS`: pPremium zone redundant storage (ZRS)
86+
* `Premium_ZRS`: Premium zone redundant storage (ZRS)
8787

8888
> [!NOTE]
8989
> Minimum premium file share is 100GB.

articles/aks/network-observability-managed-cli.md

Lines changed: 1 addition & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -208,9 +208,7 @@ az aks get-credentials --name myAKSCluster --resource-group myResourceGroup
208208
```
209209

210210

211-
## Enable visualization on Grafana
212-
213-
# [**Non-Cilium**](#tab/non-cilium)
211+
## Visualize using Grafana
214212

215213
> [!NOTE]
216214
> The following section requires deployments of Azure managed Prometheus and Grafana.
@@ -234,36 +232,6 @@ az aks get-credentials --name myAKSCluster --resource-group myResourceGroup
234232
235233
1. Check if the Metrics in **Kubernetes / Networking** Grafana dashboard are visible. If metrics aren't shown, change time range to last 15 minutes in top right dropdown box.
236234
237-
# [**Cilium**](#tab/cilium)
238-
239-
> [!NOTE]
240-
> The following section requires deployments of Azure managed Prometheus and Grafana.
241-
242-
1. Azure Monitor pods should restart themselves, if they don't, rollout restart with following command:
243-
244-
```azurecli-interactive
245-
kubectl get po -owide -n kube-system | grep ama-
246-
```
247-
248-
```output
249-
ama-metrics-5bc6c6d948-zkgc9 2/2 Running 0 (21h ago) 26h
250-
ama-metrics-ksm-556d86b5dc-2ndkv 1/1 Running 0 (26h ago) 26h
251-
ama-metrics-node-lbwcj 2/2 Running 0 (21h ago) 26h
252-
ama-metrics-node-rzkzn 2/2 Running 0 (21h ago) 26h
253-
ama-metrics-win-node-gqnkw 2/2 Running 0 (26h ago) 26h
254-
ama-metrics-win-node-tkrm8 2/2 Running 0 (26h ago) 26h
255-
```
256-
257-
1. Once the Azure Monitor pods have been deployed on the cluster, port forward to the `ama` pod to verify the pods are being scraped. Use the following example to port forward to the pod:
258-
259-
```azurecli-interactive
260-
kubectl port-forward -n kube-system $(kubectl get po -n kube-system -l rsName=ama-metrics -oname | head -n 1) 9090:9090
261-
```
262-
263-
1. Open `http://localhost:9090` in your browser and navigate to **Status** > **Targets**, verify if **cilium-pods** are present and state says up.
264-
265-
1. Sign in to Azure Managed Grafana and import dashboard with the ID: [16611](https://grafana.com/grafana/dashboards/16611-cilium-metrics/). Also, select **Dashboards** from the left navigation menu, open **Kubernetes / Networking** dashboard under **Managed Prometheus** folder. Metrics should be visible in both these dashboards.
266-
267235
---
268236
269237
## Clean up resources

articles/aks/use-oidc-issuer.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -79,10 +79,10 @@ az aks show --name myAKScluster --resource-group myResourceGroup --query "oidcIs
7979
The output should resemble the following:
8080

8181
```output
82-
https://eastus.oic.prod-aks.azure.com/00000000-0000-0000-0000-000000000000/00000000-0000-0000-0000-000000000000/
82+
https://eastus.oic.prod-aks.azure.com/00000000-0000-0000-0000-000000000000/11111111-1111-1111-1111-111111111111/
8383
```
8484

85-
By default, the Issuer is set to use the base URL `https://{region}.oic.prod-aks.azure.com/{uuid}`, where the value for `{region}` matches the location the AKS cluster is deployed in. The value `{uuid}` represents the OIDC key, which is a randomly generated guid for each cluster that is immutable.
85+
By default, the Issuer is set to use the base URL `https://{region}.oic.prod-aks.azure.com/{tenant_id}/{uuid}`, where the value for `{region}` matches the location the AKS cluster is deployed in. The value `{uuid}` represents the OIDC key, which is a randomly generated guid for each cluster that is immutable.
8686

8787
### Get the discovery document
8888

articles/aks/workload-identity-deploy-cluster.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -82,7 +82,7 @@ The variable should contain the Issuer URL similar to the following example:
8282
https://eastus.oic.prod-aks.azure.com/00000000-0000-0000-0000-000000000000/11111111-1111-1111-1111-111111111111/
8383
```
8484

85-
By default, the Issuer is set to use the base URL `https://{region}.oic.prod-aks.azure.com/{tenant_id}/{uuid}`, where the value for `{region}` matches the location the AKS cluster is deployed in. The value `{uuid}` represents the OIDC key.
85+
By default, the Issuer is set to use the base URL `https://{region}.oic.prod-aks.azure.com/{tenant_id}/{uuid}`, where the value for `{region}` matches the location the AKS cluster is deployed in. The value `{uuid}` represents the OIDC key, which is a randomly generated guid for each cluster that is immutable.
8686

8787
## Create a managed identity
8888

articles/api-center/enable-api-center-portal.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ First configure an app registration in your Microsoft Entra ID tenant. The app r
5252
* Under **Supported account types**, select **Accounts in this organizational directory (Single tenant)**.
5353
* In **Redirect URI**, select **Single-page application (SPA)** and set the URI.
5454

55-
* For local testing, set the URI to `http://localhost:5173`.
55+
* For local testing, set the URI to `https://localhost:5173`.
5656
* For production, set the URI to the URI of your API Center portal deployment.
5757
* Select **Register**.
5858
1. On the **Overview** page, copy the **Application (client) ID** and the **Directory (tenant) ID**. You set these values when you build the portal.

articles/api-management/api-management-api-import-restrictions.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ If you receive errors while importing your OpenAPI document, make sure you've va
4848

4949
| Requirement | Description |
5050
| ----------- | ----------- |
51-
| **Unique names for required path and query parameters** | In OpenAPI: <ul><li>A parameter name only needs to be unique within a location, for example path, query, header.</li></ul>In API Management:<ul><li>We allow operations to be discriminated by both path and query parameters.</li><li>OpenAPI doesn't support this discrimination, so we require parameter names to be unique within the entire URL template.</li></ul> |
51+
| **Unique names for required path and query parameters** | In OpenAPI: <ul><li>A parameter name only needs to be unique within a location, for example path, query, header.</li></ul>In API Management:<ul><li>We allow operations to be discriminated by both path and query parameters.</li><li>OpenAPI doesn't support this discrimination, so we require parameter names to be unique within the entire URL template. Names are case-insensitive.</li></ul> |
5252
| **Defined URL parameter** | Must be part of the URL template. |
5353
| **Available source file URL** | Applied to relative server URLs. |
5454
| **`\$ref` pointers** | Can't reference external files. |

articles/api-management/api-management-howto-app-insights.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -394,6 +394,6 @@ Addressing the issue of telemetry data flow from API Management to Application I
394394
395395
## Next steps
396396
397-
+ Learn more about [Azure Application Insights](/azure/application-insights/).
397+
+ Learn more about [Azure Application Insights](../azure-monitor/app/app-insights-overview.md).
398398
+ Consider [logging with Azure Event Hubs](api-management-howto-log-event-hubs.md).
399399
+ Learn about visualizing data from Application Insights using [Azure Managed Grafana](visualize-using-managed-grafana-dashboard.md)

articles/app-service/app-service-key-vault-references.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ In order to read secrets from a key vault, you need to have a vault created and
2525

2626
Key vault references use the app's system-assigned identity by default, but you can [specify a user-assigned identity](#access-vaults-with-a-user-assigned-identity).
2727

28-
1. Authorize [read access to secrets your key vault](../key-vault/general/security-features.md#privileged-access) for the managed identity you created earlier. How you do it depends on the permissions model of your key vault:
28+
1. Authorize [read access to secrets in your key vault](../key-vault/general/security-features.md#privileged-access) for the managed identity you created earlier. How you do it depends on the permissions model of your key vault:
2929

3030
- **Azure role-based access control**: Assign the **Key Vault Secrets User** role to the managed identity. For instructions, see [Provide access to Key Vault keys, certificates, and secrets with an Azure role-based access control](../key-vault/general/rbac-guide.md).
3131
- **Vault access policy**: Assign the **Get** secrets permission to the managed identity. For instructions, see [Assign a Key Vault access policy](../key-vault/general/assign-access-policy.md).

0 commit comments

Comments
 (0)