Skip to content

Commit ecae78a

Browse files
authored
Merge pull request #250312 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 edac331 + 04e54c8 commit ecae78a

File tree

9 files changed

+47
-32
lines changed

9 files changed

+47
-32
lines changed

articles/advisor/advisor-reference-reliability-recommendations.md

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -496,6 +496,13 @@ We identified the below thread resulted in an unhandled exception for your App a
496496

497497
Learn more about [App service - AppServiceProactiveCrashMonitoring (Application code should be fixed as worker process crashed due to Unhandled Exception)](https://azure.github.io/AppService/2020/08/11/Crash-Monitoring-Feature-in-Azure-App-Service.html).
498498

499+
### Consider changing your App Service configuration to 64-bit
500+
501+
We identified your application is running in 32-bit and the memory is reaching the 2GB limit.
502+
Consider switching to 64-bit processes so you can take advantage of the additional memory available in your Web Worker role. This action triggers a web app restart, so schedule accordingly.
503+
504+
Learn more about [App service 32-bit limitations](/troubleshoot/azure/app-service/web-apps-performance-faqs#i-see-the-message-worker-process-requested-recycle-due-to-percent-memory-limit-how-do-i-address-this-issue).
505+
499506
## Next steps
500507

501508
Learn more about [Reliability - Microsoft Azure Well Architected Framework](/azure/architecture/framework/resiliency/overview)

articles/ai-services/openai/concepts/use-your-data.md

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -191,7 +191,8 @@ For example, if you're creating a chatbot where the data consists of transcripti
191191

192192
This system message can help improve the quality of the response by specifying the domain (in this case finance) and mentioning that the data consists of call transcriptions. It helps set the necessary context for the model to respond appropriately.
193193

194-
> [!NOTE]
194+
> [!NOTE]
195+
> The system message is used to modify how GPT assistant responds to a user question based on retrieved documentation. It does not affect the retrieval process. If you'd like to provide instructions for the retrieval process, it is better to include them in the questions.
195196
> The system message is only guidance. The model might not adhere to every instruction specified because it has been primed with certain behaviors such as objectivity, and avoiding controversial statements. Unexpected behavior may occur if the system message contradicts with these behaviors.
196197
197198
### Maximum response
@@ -291,6 +292,8 @@ You can also use the available standalone web app to interact with your model us
291292

292293
![A screenshot of the web app interface.](../media/use-your-data/web-app.png)
293294

295+
##### Web app customization
296+
294297
You can also customize the app's frontend and backend logic. For example, you could change the icon that appears in the center of the app by updating `/frontend/src/assets/Azure.svg` and then redeploying the app [using the Azure CLI](https://github.com/microsoft/sample-app-aoai-chatGPT#deploy-with-the-azure-cli). See the source code for the web app, and more information [on GitHub](https://github.com/microsoft/sample-app-aoai-chatGPT).
295298

296299
When customizing the app, we recommend:
@@ -303,12 +306,11 @@ When customizing the app, we recommend:
303306

304307
- Pulling changes from the `main` branch for the web app's source code frequently to ensure you have the latest bug fixes and improvements.
305308

306-
#### Important considerations
309+
##### Important considerations
307310

308311
- Publishing creates an Azure App Service in your subscription. It may incur costs depending on the
309312

310313
[pricing plan](https://azure.microsoft.com/pricing/details/app-service/windows/) you select. When you're done with your app, you can delete it from the Azure portal.
311-
- You can customize the frontend and backend logic of the web app.
312314
- By default, the app will only be accessible to you. To add authentication (for example, restrict access to the app to members of your Azure tenant):
313315

314316
1. Go to the [Azure portal](https://portal.azure.com/#home) and search for the app name you specified during publishing. Select the web app, and go to the **Authentication** tab on the left navigation menu. Then select **Add an identity provider**.
@@ -340,7 +342,7 @@ Deleting your web app does not delete your Cosmos DB instance automatically. To
340342

341343
### Using the API
342344

343-
Consider setting the following parameters even if they are optional for using the API.
345+
After you upload your data through Azure OpenAI studio, you can make a call against Azure OpenAI models through APIs. Consider setting the following parameters even if they are optional for using the API.
344346

345347

346348

articles/ai-services/openai/how-to/function-calling.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -64,8 +64,8 @@ functions= [
6464
"description": "A comma separated list of features (i.e. beachfront, free wifi, etc.)"
6565
}
6666
},
67-
"required": ["location"],
68-
},
67+
"required": ["location"]
68+
}
6969
}
7070
]
7171

articles/aks/ingress-basic.md

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -75,9 +75,9 @@ To control image versions, you'll want to import them into your own Azure Contai
7575
REGISTRY_NAME=<REGISTRY_NAME>
7676
SOURCE_REGISTRY=registry.k8s.io
7777
CONTROLLER_IMAGE=ingress-nginx/controller
78-
CONTROLLER_TAG=v1.2.1
78+
CONTROLLER_TAG=v1.8.1
7979
PATCH_IMAGE=ingress-nginx/kube-webhook-certgen
80-
PATCH_TAG=v1.1.1
80+
PATCH_TAG=v2023040
8181
DEFAULTBACKEND_IMAGE=defaultbackend-amd64
8282
DEFAULTBACKEND_TAG=1.5
8383
@@ -95,9 +95,9 @@ $RegistryName = "<REGISTRY_NAME>"
9595
$ResourceGroup = (Get-AzContainerRegistry | Where-Object {$_.name -eq $RegistryName} ).ResourceGroupName
9696
$SourceRegistry = "registry.k8s.io"
9797
$ControllerImage = "ingress-nginx/controller"
98-
$ControllerTag = "v1.2.1"
98+
$ControllerTag = "v1.8.1"
9999
$PatchImage = "ingress-nginx/kube-webhook-certgen"
100-
$PatchTag = "v1.1.1"
100+
$PatchTag = "v20230407"
101101
$DefaultBackendImage = "defaultbackend-amd64"
102102
$DefaultBackendTag = "1.5"
103103
@@ -133,7 +133,7 @@ ACR_URL=<REGISTRY_URL>
133133

134134
# Use Helm to deploy an NGINX ingress controller
135135
helm install ingress-nginx ingress-nginx/ingress-nginx \
136-
--version 4.1.3 \
136+
--version 4.7.1 \
137137
--namespace ingress-basic \
138138
--create-namespace \
139139
--set controller.replicaCount=2 \
@@ -208,7 +208,7 @@ ACR_URL=<REGISTRY_URL>
208208

209209
# Use Helm to deploy an NGINX ingress controller
210210
helm install ingress-nginx ingress-nginx/ingress-nginx \
211-
--version 4.1.3 \
211+
--version 4.7.1 \
212212
--namespace ingress-basic \
213213
--create-namespace \
214214
--set controller.replicaCount=2 \

articles/aks/load-balancer-standard.md

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -455,6 +455,8 @@ The following annotations are supported for Kubernetes services with type `LoadB
455455
| `service.beta.kubernetes.io/azure-load-balancer-resource-group` | Name of the resource group | Specify the resource group of load balancer public IPs that aren't in the same resource group as the cluster infrastructure (node resource group).
456456
| `service.beta.kubernetes.io/azure-allowed-service-tags` | List of allowed service tags | Specify a list of allowed [service tags][service-tags] separated by commas.
457457
| `service.beta.kubernetes.io/azure-load-balancer-tcp-idle-timeout` | TCP idle timeouts in minutes | Specify the time in minutes for TCP connection idle timeouts to occur on the load balancer. The default and minimum value is 4. The maximum value is 30. The value must be an integer.
458+
| `service.beta.kubernetes.io/azure-load-balancer-ipv4` | IPv4 address | Specify the IPv4 address to assign to the load balancer.
459+
| `service.beta.kubernetes.io/azure-load-balancer-ipv6` | IPv6 address | Specify the IPv6 address to assign to the load balancer.
458460

459461
> [!NOTE]
460462
> `service.beta.kubernetes.io/azure-load-balancer-disable-tcp-reset` was deprecated in Kubernetes 1.18 and removed in 1.20.

articles/api-management/api-management-howto-mutual-certificates-for-clients.md

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -72,6 +72,9 @@ Configure the policy to validate one or more attributes including certificate is
7272

7373
You can also create policy expressions with the [`context` variable](api-management-policy-expressions.md#ContextVariables) to check client certificates. Examples in the following sections show expressions using the `context.Request.Certificate` property and other `context` properties.
7474

75+
> [!NOTE]
76+
> Mutual certificate authentication might not function correctly when the API Management gateway endpoint is exposed through the Application Gateway. This is because Application Gateway functions as a Layer 7 load balancer, establishing a distinct SSL connection with the backend API Management service. Consequently, the certificate attached by the client in the initial HTTP request will not be forwarded to APIM. However, as a workaround, you can transmit the certificate using the server variables option. For detailed instructions, refer to [Mutual Authentication Server Variables](../application-gateway/rewrite-http-headers-url.md#mutual-authentication-server-variables).
77+
7578
> [!IMPORTANT]
7679
> * Starting May 2021, the `context.Request.Certificate` property only requests the certificate when the API Management instance's [`hostnameConfiguration`](/rest/api/apimanagement/current-ga/api-management-service/create-or-update#hostnameconfiguration) sets the `negotiateClientCertificate` property to True. By default, `negotiateClientCertificate` is set to False.
7780
> * If TLS renegotiation is disabled in your client, you may see TLS errors when requesting the certificate using the `context.Request.Certificate` property. If this occurs, enable TLS renegotiation settings in the client.

articles/container-apps/tutorial-ci-cd-runners-jobs.md

Lines changed: 18 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -823,24 +823,24 @@ az containerapp job create -n "$JOB_NAME" -g "$RESOURCE_GROUP" --environment "$E
823823
824824
# [PowerShell](#tab/powershell)
825825
```powershell
826-
az containerapp job create -n "$JOB_NAME" -g "$RESOURCE_GROUP" --environment "$ENVIRONMENT" \
827-
--trigger-type Event \
828-
--replica-timeout 1800 \
829-
--replica-retry-limit 1 \
830-
--replica-completion-count 1 \
831-
--parallelism 1 \
832-
--image "$CONTAINER_REGISTRY_NAME.azurecr.io/$CONTAINER_IMAGE_NAME" \
833-
--min-executions 0 \
834-
--max-executions 10 \
835-
--polling-interval 30 \
836-
--scale-rule-name "azure-pipelines" \
837-
--scale-rule-type "azure-pipelines" \
838-
--scale-rule-metadata "poolName=container-apps" "targetPipelinesQueueLength=1" \
839-
--scale-rule-auth "personalAccessToken=personal-access-token" "organizationURL=organization-url" \
840-
--cpu "2.0" \
841-
--memory "4Gi" \
842-
--secrets "personal-access-token=$AZP_TOKEN" "organization-url=$ORGANIZATION_URL" \
843-
--env-vars "AZP_TOKEN=secretref:personal-access-token" "AZP_URL=secretref:organization-url" "AZP_POOL=$AZP_POOL" \
826+
az containerapp job create -n "$JOB_NAME" -g "$RESOURCE_GROUP" --environment "$ENVIRONMENT" `
827+
--trigger-type Event `
828+
--replica-timeout 1800 `
829+
--replica-retry-limit 1 `
830+
--replica-completion-count 1 `
831+
--parallelism 1 `
832+
--image "$CONTAINER_REGISTRY_NAME.azurecr.io/$CONTAINER_IMAGE_NAME" `
833+
--min-executions 0 `
834+
--max-executions 10 `
835+
--polling-interval 30 `
836+
--scale-rule-name "azure-pipelines" `
837+
--scale-rule-type "azure-pipelines" `
838+
--scale-rule-metadata "poolName=container-apps" "targetPipelinesQueueLength=1" `
839+
--scale-rule-auth "personalAccessToken=personal-access-token" "organizationURL=organization-url" `
840+
--cpu "2.0" `
841+
--memory "4Gi" `
842+
--secrets "personal-access-token=$AZP_TOKEN" "organization-url=$ORGANIZATION_URL" `
843+
--env-vars "AZP_TOKEN=secretref:personal-access-token" "AZP_URL=secretref:organization-url" "AZP_POOL=$AZP_POOL" `
844844
--registry-server "$CONTAINER_REGISTRY_NAME.azurecr.io"
845845
```
846846

articles/mysql/flexible-server/concepts-high-availability.md

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -184,7 +184,8 @@ Data-in Replication isn't supported for HA servers. But Data-in Replication for
184184
1. Enable HA.
185185

186186
- **To reduce downtime, can I fail over to the standby server during server restarts or while scaling up or down?** </br>
187-
Currently, when you do a scale up or scale down operation, the standby and primary are scaled at the same time. So failing over doesn't help. Allowing scaling up of the standby first, followed by failover, and then scaling up of the primary is on our roadmap but isn't supported yet.</br>
187+
Currently, Azure MySQL Flexible Server has utlized Planned Failover to optmize the HA operations including scaling up/down, and planned maintenance to help reduce the downtime.
188+
When such operations started, it would operate on the original standby instance first, followed by triggering a planned failover operation, and then operate on the original primary instance. </br>
188189

189190
- **Can we change the availability mode (Zone-redundant HA/same-zone) of server** </br>
190191
If you create the server with Zone-redundant HA mode enabled then you can change from Zone-redundant HA to same-zone and vice versa. To change the availability mode, you can set **High Availability** to **Disabled** on the **High Availability** pane, and then set it back to **Zone Redundant or same-zone** and choose **High Availability Mode**.</br>

articles/static-web-apps/getting-started.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -153,7 +153,7 @@ If you don't already have the [Azure Static Web Apps extension for Visual Studio
153153

154154
If you're not going to continue to use this application, you can delete the Azure Static Web Apps instance through the extension.
155155

156-
In the Visual Studio Code Explorer window, return to the _Resources_ section and under _Static Web Apps_, right-click **my-first-static-web-app** and select **Delete**.
156+
In the Visual Studio Code Azure window, return to the _Resources_ section and under _Static Web Apps_, right-click **my-first-static-web-app** and select **Delete**.
157157

158158
## Next steps
159159

0 commit comments

Comments
 (0)