Skip to content

Commit ba014d0

Browse files
author
gitName
committed
Merge branch 'main' of https://github.com/MicrosoftDocs/azure-docs-pr into scf
2 parents 18757a2 + 970588b commit ba014d0

32 files changed

+52
-85
lines changed

articles/api-management/azure-openai-enable-semantic-caching.md

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -61,6 +61,10 @@ Configure a [backend](backends.md) resource for the embeddings API deployment wi
6161
```
6262
https://my-aoai.openai.azure.com/openai/deployments/embeddings-deployment/embeddings
6363
```
64+
* **Authorization credentials** - Go to **Managed Identity** tab.
65+
* **Client indentity** - Select *System assigned identity* or type in a User assigned managed identity client ID.
66+
* **Resource ID** - Enter `https://cognitiveservices.azure.com/` for Azure OpenAI Service.
67+
6468
### Test backend
6569

6670
To test the backend, create an API operation for your Azure OpenAI Service API:
@@ -123,7 +127,6 @@ Configure the following policies to enable semantic caching for Azure OpenAI API
123127
<azure-openai-semantic-cache-lookup
124128
score-threshold="0.8"
125129
embeddings-backend-id="embeddings-deployment"
126-
embeddings-backend-auth="system-assigned"
127130
ignore-system-messages="true"
128131
max-message-count="10">
129132
<vary-by>@(context.Subscription.Id)</vary-by>

articles/api-management/azure-openai-semantic-cache-lookup-policy.md

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,6 @@ Use the `azure-openai-semantic-cache-lookup` policy to perform cache lookup of r
3434
<azure-openai-semantic-cache-lookup
3535
score-threshold="similarity score threshold"
3636
embeddings-backend-id ="backend entity ID for embeddings API"
37-
embeddings-backend-auth ="system-assigned"
3837
ignore-system-messages="true | false"
3938
max-message-count="count" >
4039
<vary-by>"expression to partition caching"</vary-by>
@@ -47,7 +46,6 @@ Use the `azure-openai-semantic-cache-lookup` policy to perform cache lookup of r
4746
| ----------------- | ------------------------------------------------------ | -------- | ------- |
4847
| score-threshold | Similarity score threshold used to determine whether to return a cached response to a prompt. Value is a decimal between 0.0 and 1.0. [Learn more](../azure-cache-for-redis/cache-tutorial-semantic-cache.md#change-the-similarity-threshold). | Yes | N/A |
4948
| embeddings-backend-id | [Backend](backends.md) ID for OpenAI embeddings API call. | Yes | N/A |
50-
| embeddings-backend-auth | Authentication used for Azure OpenAI embeddings API backend. | Yes. Must be set to `system-assigned`. | N/A |
5149
| ignore-system-messages | Boolean. If set to `true`, removes system messages from a GPT chat completion prompt before assessing cache similarity. | No | false |
5250
| max-message-count | If specified, number of remaining dialog messages after which caching is skipped. | No | N/A |
5351

articles/api-management/llm-semantic-cache-lookup-policy.md

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,6 @@ Use the `llm-semantic-cache-lookup` policy to perform cache lookup of responses
3434
<llm-semantic-cache-lookup
3535
score-threshold="similarity score threshold"
3636
embeddings-backend-id ="backend entity ID for embeddings API"
37-
embeddings-backend-auth ="system-assigned"
3837
ignore-system-messages="true | false"
3938
max-message-count="count" >
4039
<vary-by>"expression to partition caching"</vary-by>
@@ -47,7 +46,6 @@ Use the `llm-semantic-cache-lookup` policy to perform cache lookup of responses
4746
| ----------------- | ------------------------------------------------------ | -------- | ------- |
4847
| score-threshold | Similarity score threshold used to determine whether to return a cached response to a prompt. Value is a decimal between 0.0 and 1.0. [Learn more](../azure-cache-for-redis/cache-tutorial-semantic-cache.md#change-the-similarity-threshold). | Yes | N/A |
4948
| embeddings-backend-id | [Backend](backends.md) ID for OpenAI embeddings API call. | Yes | N/A |
50-
| embeddings-backend-auth | Authentication used for Azure OpenAI embeddings API backend. | Yes. Must be set to `system-assigned`. | N/A |
5149
| ignore-system-messages | Boolean. If set to `true`, removes system messages from a GPT chat completion prompt before assessing cache similarity. | No | false |
5250
| max-message-count | If specified, number of remaining dialog messages after which caching is skipped. | No | N/A |
5351

articles/container-apps/java-overview.md

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -122,14 +122,16 @@ Cores are available in 0.25 core increments, with memory available at a 2:1 rati
122122
> [!NOTE]
123123
> For apps using JDK versions 9 and lower, make sure to define custom JVM memory settings to match the memory allocation in Azure Container Apps.
124124
125-
## Spring components support
125+
## Java components support
126126

127-
Azure Container Apps offers support for the following Spring Components as managed services:
127+
Azure Container Apps offers support for the following Java components as managed services:
128128

129129
- **Eureka Server for Spring**: Service registration and discovery are key requirements for maintaining a list of live application instances. Your application uses this list to for routing and load balancing inbound requests. Configuring each client manually takes time and introduces the possibility of human error. Eureka Server simplifies the management of service discovery by functioning as a [service registry](java-eureka-server.md) where microservices can register themselves and discover other services within the system.
130130

131131
- **Config Server for Spring**: Config Server provides centralized external configuration management for distributed systems. This component designed to address the challenges of [managing configuration settings across multiple microservices](java-config-server.md) in a cloud-native environment.
132132

133+
- **Gateway for Spring**: Gateway for Spring offers an efficient and powerful way to route, manage and handle API requests as part of a microservices architecture. It serves as an [API Gateway](java-gateway-for-spring.md) that routes external requests to different services, adding various capabilities such as filtering, load balancing, and more.
134+
133135
- **Admin for Spring**: The Admin for Spring managed component provides an administrative interface is designed for Spring Boot web applications that have actuator endpoints. A managed component provides integration and management to your container app by allowing you to bind your container app to the [Admin for Spring component](java-admin.md).
134136

135137
## Next steps

articles/load-balancer/load-balancer-manage-health-status.md

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -79,9 +79,6 @@ Health status can be retrieved on a per load balancing rule basis. This is suppo
7979
3. On the **Load Balancers** page, select your load balancer from the list.
8080
4. In your load balancer's **Settings** section, select **Load balancing rules**.
8181
5. In the **Load balancing rules** page, select **View details** under the **Health status** column for the rule you want to view.
82-
83-
:::image type="content" source="media/load-balancer-manage-health-status/load-balancing-rules-list-small.png" alt-text="Screenshot of list of load balancing rules with health status link." lightbox="media/load-balancer-manage-health-status/load-balancing-rules-list.png":::
84-
8582
6. Review the health status of your backend instances in the **Load balancing rule health status** window.
8683
7. To retrieve the latest health status, select **Refresh**.
8784

articles/load-balancer/load-balancer-monitor-alert-health-event-logs.md

Lines changed: 4 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -32,9 +32,6 @@ In this section, you learn configure diagnostic settings to collect LoadBalancer
3232
3333
1. In the Azure portal, navigate to your load balancer resource.
3434
1. From your load balancer resource's **Overview** page, choose **Monitoring** > **Diagnostic settings**.
35-
36-
:::image type="content" source="media/monitor-alert-load-balancer-health-event-logs/add-diagnostic-settings.png" alt-text="Screenshot of diagnostic settings window in Azure portal.":::
37-
3835
1. Select **+ Add diagnostic setting**.
3936
1. In the **Diagnostic setting** window, select or enter the following settings:
4037

@@ -62,12 +59,12 @@ In this section, you learn how to query LoadBalancerHealthEvent logs in a Log An
6259

6360
1. In the Azure portal, navigate to your load balancer resource.
6461
1. From your load balancer resource’s **Overview** page, choose **Monitoring** > **Logs**.
65-
3. In the **Queries** window, enter **Latest SNAT Port** in the search bar.
66-
4. From the results, select **Load to editor** under **Latest SNAT Port Exhaustion per LB Frontend**.
62+
1. In the **Queries** window, enter **Latest SNAT Port** in the search bar.
63+
1. From the results, select **Load to editor** under **Latest SNAT Port Exhaustion per LB Frontend**.
6764

6865
:::image type="content" source="media/monitor-alert-load-balancer-health-event-logs/search-queries.png" alt-text="Screenshot of Queries window performing search for built-in query.":::
6966

70-
5. The following code is displayed in the query editor:
67+
1. The following code is displayed in the query editor:
7168

7269
```kusto
7370
// Latest Snat Port Exhaustion Per LB Frontend
@@ -79,11 +76,10 @@ In this section, you learn how to query LoadBalancerHealthEvent logs in a Log An
7976
```
8077
:::image type="content" source="media/monitor-alert-load-balancer-health-event-logs/view-snat-query.png" alt-text="Screenshot of query editor with SNAT port exhaustion kusto query.":::
8178
82-
6. Select **Run** to execute the query.
79+
1. Select **Run** to execute the query.
8380
1. If you want to modify and save the query, make your query changes and select **Save**>**Save as query**.
8481
1. In the **Save a query** window, enter a name for the query, other optional information, and select **Save**.
8582
86-
:::image type="content" source="media/monitor-alert-load-balancer-health-event-logs/save-snat-query.png" alt-text="Screenshot of Save a query window.":::
8783
8884
## Create alerts based on LoadBalancerHealthEvent logs
8985

articles/load-balancer/load-balancer-test-frontend-reachability.md

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -104,9 +104,6 @@ This section describes how to test reachability of a standard public load balanc
104104
1. In the Search bar at the top of the portal, enter **Virtual machines** and select Virtual machines.
105105
1. In **Virtual machines**, select your virtual machine from the list.
106106
1. In the virtual machine’s menu, select **Networking** and then select **Add inbound port rule**.
107-
108-
:::image type="content" source="media/load-balancer-front-end-reachability-testing/virtual-machine-port-rules-thumb.png" alt-text="Screenshot of Virtual network page listing port rules and selection of add outbound port rule button." lightbox="media/load-balancer-front-end-reachability-testing/virtual-machine-port-rules.png":::
109-
110107
1. In **Add inbound security rule**, enter or select the following information:
111108

112109
| **Setting** | **Value** |
@@ -121,9 +118,6 @@ This section describes how to test reachability of a standard public load balanc
121118
| **Priority** | Enter **100** or a priority of your choosing. |
122119
| **Name** | Enter **AllowICMP** or a name of your choosing |
123120
| **Description** | Leave as Blank or enter a description |
124-
125-
:::image type="content" source="media/load-balancer-front-end-reachability-testing/add-Inbound-port-rule-thumb.png" alt-text="Screenshot of Add inbound port rule windows with settings allowing ICMP echo messages."lightbox="media/load-balancer-front-end-reachability-testing/add-Inbound-port-rule.png":::
126-
127121
1. Select **Add**.
128122

129123
### Connect to the virtual machine

articles/load-balancer/manage-admin-state-how-to.md

Lines changed: 2 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -71,13 +71,7 @@ In this section, you learn how to set an admin state to **Up** or **Down** as pa
7171

7272
7. Select **Save**.
7373
8. In your **Backend pools** page, select the corresponding **Admin State** value of your recently added backend pool instance.
74-
75-
:::image type="content" source="media/manage-admin-state-how-to/select-admin-state-backend-pools-window.png" alt-text="Screenshot of backend pools window with admin state link highlighted.":::
76-
7774
9. In your **Admin state details** window, select **Down** from the dropdown menu.
78-
79-
:::image type="content" source="media/manage-admin-state-how-to/set-admin-state-backend-pool-down.png" alt-text="Screenshot of admin state details windows with down selected for admin state.":::
80-
8175
10. Select **Save**.
8276

8377
# [Azure PowerShell](#tab/azurepowershell)
@@ -170,9 +164,6 @@ In this section, you learn how to set an admin state to **Up** or **Down** as pa
170164
8. Select **Add** and **Save**.
171165
9. In your **Backend pools** page, select the corresponding **Admin State** value of your recently added backend pool instance.
172166
10. In your **Admin state details** window, select **Up** from the dropdown menu.
173-
174-
:::image type="content" source="media/manage-admin-state-how-to/set-admin-state-backend-pool-up.png" alt-text="Screenshot of admin state details window with up selected for admin state.":::
175-
176167
11. Select **Save**.
177168

178169
# [Azure PowerShell](#tab/azurepowershell)
@@ -264,15 +255,12 @@ In this section, you learn how to update an existing admin state from existing b
264255
4. In your load balancer's page, select **Backend pools** under **Settings**.
265256
9. In your **Backend pools** page, select the corresponding **Admin State** value of your recently added backend pool instance.
266257
10. In your **Admin state details** window, select **Up** from the dropdown menu.
267-
268-
:::image type="content" source="media/manage-admin-state-how-to/set-admin-state-backend-pool-up.png" alt-text="Screenshot of admin state details window with up selected for admin state value.":::
269-
270258
11. Select **Save**.
271259

272260
# [Azure PowerShell](#tab/azurepowershell)
273261

274262
1. Connect to your Azure subscription with Azure PowerShell.
275-
2. Update an existing backend pool instance with the admin state value configured to UP or DOWN with [New-AzLoadBalancerBackendAddressConfig](/powershell/module/az.network/new-azloadbalancerbackendaddressconfig).. Replace the values in brackets with the names of the resources in your configuration.
263+
2. Update an existing backend pool instance with the admin state value configured to UP or DOWN with [New-AzLoadBalancerBackendAddressConfig](/powershell/module/az.network/new-azloadbalancerbackendaddressconfig). Replace the values in brackets with the names of the resources in your configuration.
276264

277265
```azurepowershell
278266
@@ -359,10 +347,7 @@ In this section, you learn how to remove an existing admin state from an existin
359347
4. In your load balancer's page, select **Backend pools** under **Settings**.
360348
5. Select the corresponding **Admin State** value of your backend pool instance that you would like to remove.
361349
6. In your admin state’s window, select **None** from the dropdown menu.
362-
363-
:::image type="content" source="media/manage-admin-state-how-to/set-admin-state-backend-pool-none.png" alt-text="Screenshot of admin state details windows with none selected for admin state.":::
364-
365-
1. Select **Save**.
350+
7. Select **Save**.
366351

367352
# [Azure PowerShell](#tab/azurepowershell)
368353

0 commit comments

Comments
 (0)