Skip to content

Commit 822d040

Browse files
committed
Merge branch 'main' of https://github.com/MicrosoftDocs/azure-docs-pr into portalPrivateEndpoint
2 parents 68bb5e9 + 8a03319 commit 822d040

35 files changed

+350
-198
lines changed

.openpublishing.redirection.azure-kubernetes-service.json

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -456,11 +456,6 @@
456456
"redirect_url": "/azure/aks/create-node-pools",
457457
"redirect_document_id": false
458458
},
459-
{
460-
"source_path_from_root": "/articles/copilot/limited-access.md",
461-
"redirect_url": "/azure/copilot/manage-access",
462-
"redirect_document_id": false
463-
},
464459
{
465460
"source_path_from_root": "/articles/aks/command-invoke.md",
466461
"redirect_url": "/azure/aks/access-private-cluster",

.openpublishing.redirection.json

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4063,6 +4063,16 @@
40634063
"redirect_url":"/azure/reliability/reliability-cosmos-db-nosql",
40644064
"redirect_document_id":false
40654065
},
4066+
{
4067+
"source_path_from_root": "/articles/copilot/limited-access.md",
4068+
"redirect_url": "/azure/copilot/manage-access",
4069+
"redirect_document_id": false
4070+
},
4071+
{
4072+
"source_path_from_root": "/articles/azure-portal/mobile-app/microsoft-copilot-for-azure.md",
4073+
"redirect_url": "/azure/azure-portal/mobile-app/microsoft-copilot-in-azure",
4074+
"redirect_document_id": false
4075+
},
40664076
{
40674077
"source_path_from_root":"/articles/migrate/how-to-assess.md",
40684078
"redirect_url":"/azure/migrate/whats-new#update-april-2024",

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

Lines changed: 16 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -581,24 +581,22 @@ Each user message can translate to multiple search queries, all of which get sen
581581

582582
## Regional availability and model support
583583

584-
| Region | `gpt-35-turbo-16k (0613)` | `gpt-35-turbo (1106)` | `gpt-4-32k (0613)` | `gpt-4 (1106-preview)` | `gpt-4 (0125-preview)` | `gpt-4-32k (0314)`** | `gpt-4 (0613)` | `gpt-4 (0314)`** | `gpt-4o` | `gpt-turbo (409)` |
585-
|------|---|---|---|---|---|----|----|----|----|---|
586-
| Australia East ||||| |||| | |
587-
| Canada East ||||| |||| | |
588-
| East US || | | ||| ||| |
589-
| East US 2 || | || || ||||
590-
| France Central ||||| |||| | |
591-
| Japan East || | | | || || | |
592-
| North Central US || | | ||| ||| |
593-
| Norway East || | || || || | |
594-
| South Central US | | | | ||| ||| |
595-
| South India | || || || || | |
596-
| Sweden Central ||||| |||| ||
597-
| Switzerland North || || | |||| | |
598-
| UK South ||| |||| || | |
599-
| West US | || || || ||| |
600-
601-
** Models are being retired no sooner than 31 July 2024
584+
| Region | `gpt-35-turbo-16k (0613)` | `gpt-35-turbo (1106)` | `gpt-4-32k (0613)` | `gpt-4 (1106-preview)` | `gpt-4 (0125-preview)` | `gpt-4 (0613)` | `gpt-4o` | `gpt-turbo (409)` |
585+
|------|---|---|---|---|---|----|----|----|
586+
| Australia East ||||| || | |
587+
| Canada East ||||| || | |
588+
| East US || | | || || |
589+
| East US 2 || | || | |||
590+
| France Central ||||| || | |
591+
| Japan East || | | | | | | |
592+
| North Central US || | | || || |
593+
| Norway East || | || | | | |
594+
| South Central US | | | | || || |
595+
| South India | || || | | | |
596+
| Sweden Central ||||| || ||
597+
| Switzerland North || || | || | |
598+
| UK South ||| ||| | | |
599+
| West US | || || | || |
602600

603601
If your Azure OpenAI resource is in another region, you won't be able to use Azure OpenAI On Your Data.
604602

articles/azure-portal/TOC.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -78,7 +78,7 @@
7878
href: mobile-app/learn-training.md
7979
displayName: mobile, app, training
8080
- name: Microsoft Copilot in Azure
81-
href: mobile-app/microsoft-copilot-for-azure.md
81+
href: mobile-app/microsoft-copilot-in-azure.md
8282
- name: Reference
8383
items:
8484
- name: Keyboard shortcuts
File renamed without changes.

articles/container-registry/container-registry-auto-purge.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ At a minimum, specify the following when you run `acr purge`:
4242

4343
`acr purge` supports several optional parameters. The following two are used in examples in this article:
4444

45-
* `--untagged` - Specifies that all manifests that don't have associated tags (*untagged manifests*) are deleted. This parameter also deletes untagged manifests in addition to tags that are already being deleted.
45+
* `--untagged` - Specifies that all manifests that don't have associated tags (*untagged manifests*) are deleted. This parameter also deletes untagged manifests in addition to tags that are already being deleted. Remove all tags associated with a manifest to purge it; only then you can purge a tag free manifest using `--untagged`.
4646
* `--dry-run` - Specifies that no data is deleted, but the output is the same as if the command is run without this flag. This parameter is useful for testing a purge command to make sure it does not inadvertently delete data you intend to preserve.
4747
* `--keep` - Specifies that the latest x number of to-be-deleted tags are retained. The latest tags are determined by the last modified time of the tag.
4848
* `--concurrency` - Specifies a number of purge tasks to process concurrently. A default value is used if this parameter is not provided.

articles/container-registry/container-registry-tasks-reference-yaml.md

Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -202,6 +202,29 @@ steps:
202202
- build: -t $Registry/hello-world -f hello-world.dockerfile ./subDirectory
203203
```
204204

205+
### Dynamic variable passing in ACR Tasks
206+
207+
When working with Azure container registry (ACR) tasks, you may find yourself needing to pass different values to your build process without changing the task definition by using the `--set` flag with the `az acr task run` command.
208+
209+
#### Example: Setting image tag at runtime
210+
211+
Suppose you have an ACR task defined in a `acr-task.yml` file with a placeholder for the image tag:
212+
213+
```yaml
214+
steps:
215+
- build: -t $Registry/hello-world:{{.Values.tag}}
216+
```
217+
218+
You can trigger the task and set the `tag` variable to `v2` at runtime using the following Azure CLI command:
219+
220+
```azurecli
221+
az acr task run --registry myregistry --name mytask --set tag=v2
222+
```
223+
224+
This command will start the ACR task named `mytask` and build the image using the `v2` tag, overriding the placeholder in the `acr-task.yml` file.
225+
226+
This approach allows for customization in your CI/CD pipelines, enabling you to dynamically adjust parameters based on your current needs without altering the task definitions.
227+
205228
## push
206229

207230
Push one or more built or retagged images to a container registry. Supports pushing to private registries like Azure Container Registry, or to the public Docker Hub.
@@ -385,6 +408,7 @@ az acr run -f mounts-secrets.yaml --set-secret mysecret=abcdefg123456 https://gi
385408
<!-- SOURCE: https://github.com/Azure-Samples/acr-tasks/blob/master/mounts-secrets.yaml -->
386409
[!code-yml[task](~/acr-tasks/mounts-secrets.yaml)]
387410

411+
388412
## Task step properties
389413

390414
Each step type supports several properties appropriate for its type. The following table defines all of the available step properties. Not all step types support all properties. To see which of these properties are available for each step type, see the [cmd](#cmd), [build](#build), and [push](#push) step type reference sections.

articles/container-registry/monitor-service-reference.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -24,9 +24,9 @@ Resource Provider and Type: [Microsoft.ContainerRegistry/registries](../azure-mo
2424
| AgentPoolCPUTime | Yes | Seconds | Total | CPU time used by [ACR tasks](container-registry-tasks-overview.md) running on dedicated [agent pools](tasks-agent-pools.md) | None |
2525
| RunDuration | Yes | Milliseconds | Total | Duration of [ACR tasks](container-registry-tasks-overview.md) runs | None |
2626
| StorageUsed | No | Bytes | Average | Storage used by the container registry<br/><br/>Sum of storage for unique and shared layers, manifest files, and replica copies in all repositories<sup>1</sup> | Geolocation |
27-
| SuccessfulPullCount | Yes | Count | Total | Successful pulls of container images and other artifacts from the registry | None |
28-
| SuccessfulPushCount | Yes | Count | Total | Successful pushes of container images and other artifacts to the registry | None |
29-
| TotalPullCount | Yes | Count | Total | Total pulls of container images and other artifacts from the registry | None |
27+
| SuccessfulPullCount | Yes | Count | Total | Successful pulls of container images and other artifacts from the registry. Total get requests to registry v2 manifest api with 200 response. | None |
28+
| SuccessfulPushCount | Yes | Count | Total | Successful pushes of container images and other artifacts to the registry. | None |
29+
| TotalPullCount | Yes | Count | Total | Total pulls of container images and other artifacts from the registry. Total get requests to registry v2 manifest api. | None |
3030
| TotalPushCount | Yes | Count | Total | Total pushes of container images and other artifacts to the registry | None |
3131

3232
<sup>1</sup>Because of layer sharing, registry storage used may be less than the sum of storage for individual repositories. When you [delete](container-registry-delete.md) a repository or tag, you recover only the storage used by manifest files and the unique layers referenced.

articles/ddos-protection/ddos-protection-overview.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ Distributed denial of service (DDoS) attacks are some of the largest availabilit
1616

1717
Azure DDoS Protection, combined with application design best practices, provides enhanced DDoS mitigation features to defend against DDoS attacks. It's automatically tuned to help protect your specific Azure resources in a virtual network. Protection is simple to enable on any new or existing virtual network, and it requires no application or resource changes.
1818

19-
:::image type="content" source="./media/ddos-best-practices/ddos-protection-overview-architecture.png" alt-text="Diagram of the reference architecture for an Azure DDoS protected PaaS web application.":::
19+
:::image type="content" source="./media/ddos-best-practices/ddos-protection-overview-architecture.png" alt-text="Diagram of the reference architecture for an Azure DDoS protected PaaS web application." lightbox="./media/ddos-best-practices/ddos-protection-overview-architecture.png":::
2020

2121
Azure DDoS Protection protects at layer 3 and layer 4 network layers. For web applications protection at layer 7, you need to add protection at the application layer using a WAF offering. For more information, see [Application DDoS protection](../web-application-firewall/shared/application-ddos-protection.md).
2222

articles/ddos-protection/manage-ddos-ip-protection-cli.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
---
2-
title: 'Quickstart: Create and configure Azure DDoS IP Protection using Azure CLI'
2+
title: 'QuickStart: Create and configure Azure DDoS IP Protection using Azure CLI'
33
description: Learn how to create Azure DDoS IP Protection using Azure CLI
44
author: AbdullahBell
55
ms.author: abell
@@ -14,7 +14,7 @@ ms.custom: template-quickstart, devx-track-azurecli
1414
Get started with Azure DDoS IP Protection by using Azure CLI.
1515
In this QuickStart, you'll enable DDoS IP protection and link it to a public IP address.
1616

17-
:::image type="content" source="./media/manage-ddos-ip-protection-portal/ddos-ip-protection-diagram.png" alt-text="Diagram of DDoS IP Protection protecting the Public IP address.":::
17+
:::image type="content" source="./media/manage-ddos-ip-protection-portal/ddos-ip-protection-diagram.png" alt-text="Diagram of DDoS IP Protection protecting the Public IP address." lightbox="./media/manage-ddos-ip-protection-portal/ddos-ip-protection-diagram.png":::
1818

1919
## Prerequisites
2020

0 commit comments

Comments
 (0)