Skip to content

Commit ba80035

Browse files
authored
Merge pull request #277208 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 4e49bd8 + 3e1a78b commit ba80035

File tree

8 files changed

+22
-36
lines changed

8 files changed

+22
-36
lines changed

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

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -581,7 +581,7 @@ 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 (0613)` | `gpt-4o` | `gpt-turbo (0409)` |
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 (0409)` |
585585
|------|---|---|---|---|---|----|----|----|
586586
| Australia East ||||| || | |
587587
| Canada East ||||| || | |
@@ -598,6 +598,8 @@ Each user message can translate to multiple search queries, all of which get sen
598598
| UK South ||| ||| | | |
599599
| West US | || || | || |
600600

601+
\*\*This is a text-only implementation
602+
601603
If your Azure OpenAI resource is in another region, you won't be able to use Azure OpenAI On Your Data.
602604

603605
## Next steps

articles/azure-functions/functions-bindings-event-grid-output.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -149,7 +149,7 @@ Starting in version 3.3.0, it's possible to use Microsoft Entra ID when authenti
149149
[FunctionName("EventGridAsyncOutput")]
150150
public static async Task Run(
151151
[TimerTrigger("0 */5 * * * *")] TimerInfo myTimer,
152-
[EventGrid(Connection = "MyEventGridConnection"]IAsyncCollector<CloudEvent> outputEvents,
152+
[EventGrid(Connection = "MyEventGridConnection")]IAsyncCollector<CloudEvent> outputEvents,
153153
ILogger log)
154154
{
155155
for (var i = 0; i < 3; i++)
@@ -165,7 +165,7 @@ When you use the `Connection` property, the `topicEndpointUri` must be specified
165165
```json
166166
{
167167
"Values": {
168-
"myConnection__topicEndpointUri": "{topicEndpointUri}"
168+
"MyEventGridConnection__topicEndpointUri": "{topicEndpointUri}"
169169
}
170170
}
171171
```

articles/azure-functions/run-functions-from-deployment-package.md

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ ms.date: 02/05/2022
88

99
# Run your functions from a package file in Azure
1010

11-
In Azure, you can run your functions directly from a deployment package file in your function app. The other option is to deploy your files in the `d:\home\site\wwwroot` (Windows) or `/home/site/wwwroot` (Linux) directory of your function app.
11+
In Azure, you can run your functions directly from a deployment package file in your function app. The other option is to deploy your files in the `c:\home\site\wwwroot` (Windows) or `/home/site/wwwroot` (Linux) directory of your function app.
1212

1313
This article describes the benefits of running your functions from a package. It also shows how to enable this functionality in your function app.
1414

@@ -30,7 +30,7 @@ To enable your function app to run from a package, add a `WEBSITE_RUN_FROM_PACKA
3030

3131
| Value | Description |
3232
|---------|---------|
33-
| **`1`** | Indicates that the function app runs from a local package file deployed in the `d:\home\data\SitePackages` (Windows) or `/home/data/SitePackages` (Linux) folder of your function app. |
33+
| **`1`** | Indicates that the function app runs from a local package file deployed in the `c:\home\data\SitePackages` (Windows) or `/home/data/SitePackages` (Linux) folder of your function app. |
3434
|**`<URL>`** | Sets a URL that is the remote location of the specific package file you want to run. Required for functions apps running on Linux in a Consumption plan. |
3535

3636
The following table indicates the recommended `WEBSITE_RUN_FROM_PACKAGE` options for deployment to a specific operating system and hosting plan:
@@ -66,13 +66,13 @@ This section provides information about how to run your function app from a loca
6666

6767
+ Using an on-site package is the recommended option for running from the deployment package, except on Linux hosted in a Consumption plan.
6868
+ [Zip deployment](#integration-with-zip-deployment) is the recommended way to upload a deployment package to your site.
69-
+ When not using zip deployment, make sure the `d:\home\data\SitePackages` (Windows) or `/home/data/SitePackages` (Linux) folder has a file named `packagename.txt`. This file contains only the name, without any whitespace, of the package file in this folder that's currently running.
69+
+ When not using zip deployment, make sure the `c:\home\data\SitePackages` (Windows) or `/home/data/SitePackages` (Linux) folder has a file named `packagename.txt`. This file contains only the name, without any whitespace, of the package file in this folder that's currently running.
7070

7171
### Integration with zip deployment
7272

73-
[Zip deployment][Zip deployment for Azure Functions] is a feature of Azure App Service that lets you deploy your function app project to the `wwwroot` directory. The project is packaged as a .zip deployment file. The same APIs can be used to deploy your package to the `d:\home\data\SitePackages` (Windows) or `/home/data/SitePackages` (Linux) folder.
73+
[Zip deployment][Zip deployment for Azure Functions] is a feature of Azure App Service that lets you deploy your function app project to the `wwwroot` directory. The project is packaged as a .zip deployment file. The same APIs can be used to deploy your package to the `c:\home\data\SitePackages` (Windows) or `/home/data/SitePackages` (Linux) folder.
7474

75-
With the `WEBSITE_RUN_FROM_PACKAGE` app setting value of `1`, the zip deployment APIs copy your package to the `d:\home\data\SitePackages` (Windows) or `/home/data/SitePackages` (Linux) folder instead of extracting the files to `d:\home\site\wwwroot` (Windows) or `/home/site/wwwroot` (Linux). It also creates the `packagename.txt` file. After a restart, the package is mounted to `wwwroot` as a read-only filesystem. For more information about zip deployment, see [Zip deployment for Azure Functions](deployment-zip-push.md).
75+
With the `WEBSITE_RUN_FROM_PACKAGE` app setting value of `1`, the zip deployment APIs copy your package to the `c:\home\data\SitePackages` (Windows) or `/home/data/SitePackages` (Linux) folder instead of extracting the files to `c:\home\site\wwwroot` (Windows) or `/home/site/wwwroot` (Linux). It also creates the `packagename.txt` file. After a restart, the package is mounted to `wwwroot` as a read-only filesystem. For more information about zip deployment, see [Zip deployment for Azure Functions](deployment-zip-push.md).
7676

7777
> [!NOTE]
7878
> When a deployment occurs, a restart of the function app is triggered. Function executions currently running during the deploy are terminated. Please review [Improve the performance and reliability of Azure Functions](performance-reliability.md#write-functions-to-be-stateless) to learn how to write stateless and defensive functions.

articles/expressroute/how-to-configure-coexisting-gateway-portal.md

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,6 @@ The steps to configure both scenarios are covered in this article. You can confi
3636
* **Both the ExpressRoute and VPN gateways must be able to communicate with each other via BGP to function properly.** If using a UDR on the gateway subnet, ensure that it doesn't include a route for the gateway subnet range itself as this will interfere with BGP traffic.
3737
* **If you want to use transit routing between ExpressRoute and VPN, the ASN of Azure VPN Gateway must be set to 65515.** Azure VPN Gateway supports the BGP routing protocol. For ExpressRoute and Azure VPN to work together, you must keep the Autonomous System Number of your Azure VPN gateway at its default value, 65515. If you previously selected an ASN other than 65515 and you change the setting to 65515, you must reset the VPN gateway for the setting to take effect.
3838
* **The gateway subnet must be /27 or a shorter prefix**, such as /26, /25, or you receive an error message when you add the ExpressRoute virtual network gateway.
39-
* **Coexistence for IPv4 traffic only.** ExpressRoute co-existence with VPN gateway is supported, but only for IPv4 traffic. IPv6 traffic isn't supported for VPN gateways.
4039

4140
## Configuration designs
4241

articles/frontdoor/front-door-ddos.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ Azure Front Door is a Content Delivery Network (CDN) that can help you protect y
1515

1616
## Infrastructure DDoS protection
1717

18-
Azure Front Door benefits from the default Azure infrastructure DDoS protection. This protection monitors and mitigates network layer attacks in real time by using the global scale and capacity of Front Door’s network. This protection has a proven track record in safeguarding Microsoft’s enterprise and consumer services from large-scale attacks.
18+
Azure Front Door benefits from the [default Azure infrastructure DDoS protection](../ddos-protection/ddos-protection-overview.md). This protection monitors and mitigates network layer attacks in real time by using the global scale and capacity of Front Door’s network. This protection has a proven track record in safeguarding Microsoft’s enterprise and consumer services from large-scale attacks.
1919

2020
## Protocol blocking
2121

articles/frontdoor/rule-set-server-variables.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ When you work with Rule Set actions, specify server variables by using the follo
5151
* Offsets and lengths within range: `{var:0:5}` = `AppId`, `{var:7:7}` = `1f59297`, `{var:7:-7}` = `1f592979c584d0f9d679db3e`
5252
* Zero lengths: `{var:0:0}` = null, `{var:4:0}` = null
5353
* Offsets within range and lengths out of range: `{var:0:100}` = `AppId=01f592979c584d0f9d679db3e66a3e5e`, `{var:5:100}` = `=01f592979c584d0f9d679db3e66a3e5e`, `{var:0:-48}` = null, `{var:4:-48}` = null
54-
* `{url_path:seg#}`: Allow users to capture and use the desired URL path segment in URL Redirect, URL Rewrite, or any meaningful action. User can also capture multiple segments by using the same style as substring capture `{url_path:seg1:3}`. For example, for a source pattern `/id/12345/default` and a URL rewrite Destination `/{url_path:1}/home`, the expected URL path after rewrite is `/12345/home`. for a multiple-segment capture, when the source pattern is `/id/12345/default/location/test`, a URL rewrite destination `/{url_path:seg1:3}/home` results in `/12345/default/location/home`. Segment capture includes the location path, so if route is `/match/*`, segment 0 will be match.
54+
* `{url_path:seg#}`: Allow users to capture and use the desired URL path segment in URL Redirect, URL Rewrite, or any meaningful action. User can also capture multiple segments by using the same style as substring capture `{url_path:seg1:3}`. For example, for a source pattern `/id/12345/default` and a URL rewrite Destination `/{url_path:seg1}/home`, the expected URL path after rewrite is `/12345/home`. For a multiple-segment capture, when the source pattern is `/id/12345/default/location/test`, a URL rewrite destination `/{url_path:seg1:3}/home` results in `/12345/default/location/home`. Segment capture includes the location path, so if route is `/match/*`, segment 0 will be match.
5555

5656
Offset corresponds to the index of the start segment, and length refers to how many segments to capture, including the one at index = offset.
5757

articles/virtual-machines/linux/using-cloud-init.md

Lines changed: 8 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,8 @@ ms.author: srijangupta
1313
# cloud-init support for virtual machines in Azure
1414

1515
> [!CAUTION]
16-
> This article references CentOS, a Linux distribution that is nearing End Of Life (EOL) status. Please consider your use and plan accordingly. For more information, see the [CentOS End Of Life guidance](~/articles/virtual-machines/workloads/centos/centos-end-of-life.md).
17-
16+
> This article references CentOS, a Linux distribution that is nearing End Of Life (EOL) status. Please consider your use and plan accordingly.
17+
>
1818
**Applies to:** :heavy_check_mark: Linux VMs :heavy_check_mark: Flexible scale sets
1919

2020
This article explains the support that exists for [cloud-init](https://cloudinit.readthedocs.io) to configure a virtual machine (VM) or Virtual Machine Scale Sets at provisioning time in Azure. These cloud-init configurations are run on first boot once the resources have been provisioned by Azure.
@@ -61,11 +61,6 @@ There are two stages to making cloud-init available to the supported Linux distr
6161

6262
* All other CentOS SKUs starting from CentOS 7 (version 7.7) and CentOS 8 (version 8.1) including both Gen1 and Gen2 images are provisioned using cloud-init. CentOS 6.10, 7.4, 7.5, and 7.6 images don't support cloud-init.
6363

64-
> [!NOTE]
65-
> OpenLogic is now Rogue Wave Software
66-
67-
68-
6964
### Oracle
7065

7166
Publisher / Version| Offer | SKU | Version | image cloud-init ready | cloud-init package support on Azure|
@@ -84,23 +79,13 @@ There are two stages to making cloud-init available to the supported Linux distr
8479
|SUSE 12 |SLES (SUSE Linux Enterprise Server) |sp5 |latest |yes | yes |
8580

8681
* All other SUSE SKUs starting from SLES 15 (sp1) and SLES 12 (sp5) including both Gen1 and Gen2 images are provisioned using cloud-init.
87-
* Additionally these images are also provisioned with cloud-init -
88-
89-
90-
Publisher / Version| Offer | SKU / Version
91-
|:--- |:--- |:---
92-
|SUSE 12 |SLES (SUSE Linux Enterprise Server) |sles-{byos/sap/sap-byos}:12-sp4:2020.06.10
93-
|SUSE 12 |SLES (SUSE Linux Enterprise Server) |sles-{byos/sap/sap-byos}:12-sp3:2020.06.10
94-
|SUSE 12 |SLES (SUSE Linux Enterprise Server) |sles-{byos/sap/sap-byos}:12-sp2:2020.06.10
95-
|SUSE 15 |SLES (SUSE Linux Enterprise Server) |manager-proxy-4-byosgen1:2020.06.10
96-
|SUSE 15 |SLES (SUSE Linux Enterprise Server) |manager-server-4-byos:gen1:2020.06.10
97-
9882

9983
### Debian
10084
| Publisher / Version | Offer | SKU | Version | image cloud-init ready | cloud-init package support on Azure|
10185
|:--- |:--- |:--- |:--- |:--- |:--- |
102-
| debian (Gen1) |debian-10 | 10-cloudinit |10:0.20201013.422| yes | yes - support from package version: `20.2-2~deb10u1` |
103-
| debian (Gen2) |debian-10 | 10-cloudinit-gen2 |0.20201013.422| yes | yes - support from package version: `20.2-2~deb10u1` |
86+
| debian-10 |Debian |10-cloudinit-gen2 |Debian:debian-10:10-cloudinit-gen2:0.0.1015 |yes |yes
87+
| debian-10 |Debian |10-cloudinit-gen2 |Debian:debian-10:10-cloudinit-gen2:0.0.991 |yes |yes
88+
| debian-10 |Debian |10-cloudinit-gen2 |Debian:debian-10:10-cloudinit-gen2:0.0.999 |yes |yes
10489

10590

10691
Currently Azure Stack will support the provisioning of cloud-init enabled images.
@@ -130,7 +115,7 @@ The following example creates a resource group named *myResourceGroup* in the *e
130115
az group create --name myResourceGroup --location eastus
131116
```
132117

133-
The next step is to create a file in your current shell, named *cloud-init.txt* and paste the following configuration. For this example, create the file in the Cloud Shell not on your local machine. You can use any editor of your choice. Enter `sensible-editor cloud-init.txt` to create the file and see a list of available editors. In this example, we're using the **nano** editor. Choose #1 to use the **nano** editor. Make sure that the whole cloud-init file is copied correctly, especially the first line:
118+
The next step is to create a file in your current shell, named *cloud-init.txt* and paste the following configuration. For this example, create the file in the Cloud Shell not on your local machine. You can use any editor of your choice. Enter sensible-editor cloud-init.txt to create the file and see a list of available editors. Use the editor of your choice. Some typical choices are [nano](https://linux.die.net/man/1/nano), [vim](https://linux.die.net/man/1/vi), or [ed](https://linux.die.net/man/1/ed). Make sure that the whole cloud-init file is copied correctly, especially the first line:
134119

135120
SLES| Ubuntu | RHEL
136121
|:--- |:--- |:---
@@ -140,7 +125,7 @@ The next step is to create a file in your current shell, named *cloud-init.txt*
140125
> [!NOTE]
141126
> cloud-init has multiple [input types](https://cloudinit.readthedocs.io/en/latest/topics/format.html), cloud-init will use first line of the customData/userData to indicate how it should process the input, for example `#cloud-config` indicates that the content should be processed as a cloud-init config.
142127
143-
Press <kbd>Ctrl + X</kbd> to exit the file, type <kbd>y</kbd> to save the file, and press <kbd>Enter</kbd> to confirm the file name on exit.
128+
Exit the file and save the file according to the editor. Verify file name on exit.
144129

145130
The final step is to create a VM with the [az vm create](/cli/azure/vm) command.
146131

@@ -170,7 +155,7 @@ For more details of cloud-init logging, see the [cloud-init documentation](https
170155
## Telemetry
171156
cloud-init collects usage data and sends it to Microsoft to help improve our products and services. Telemetry is only collected during the provisioning process (first boot of the VM). The data collected helps us investigate provisioning failures and monitor performance and reliability. Data collected doesn't include any identifiers (personal identifiers). Read our [privacy statement](https://go.microsoft.com/fwlink/?LinkId=521839) to learn more. Some examples of telemetry being collected are (this isn't an exhaustive list): OS-related information (cloud-init version, distro version, kernel version), performance metrics of essential VM provisioning actions (time to obtain DHCP lease, time to retrieve metadata necessary to configure the VM, etc.), cloud-init log, and dmesg log.
172157

173-
Telemetry collection is currently enabled for most of our marketplace images that uses cloud-init. It is enabled by specifying KVP telemetry reporter for cloud-init. In most Azure Marketplace images, this configuration can be found in the file /etc/cloud/cloud.cfg.d/10-azure-kvp.cfg. Removing this file during image preparation will disable telemetry collection for any VM created from this image.
158+
Telemetry collection is currently enabled for most of our marketplace images that use cloud-init. It is enabled by specifying KVP telemetry reporter for cloud-init. In most Azure Marketplace images, this configuration can be found in the file /etc/cloud/cloud.cfg.d/10-azure-kvp.cfg. Removing this file during image preparation will disable telemetry collection for any VM created from this image.
174159

175160
Sample content of 10-azure-kvp.cfg
176161
```

articles/virtual-machines/vm-support-help.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ author: mimckitt
55
ms.author: mimckitt
66
ms.service: virtual-machines
77
ms.topic: troubleshooting
8-
ms.date: 02/28/2023
8+
ms.date: 05/30/2024
99
ms.custom: support-help-page
1010
---
1111

@@ -20,7 +20,7 @@ Here are suggestions for where you can get help when developing your Azure Virtu
2020

2121
Various articles explain how to determine, diagnose, and fix issues that you might encounter when using Azure Virtual Machines. Use these articles to troubleshoot deployment failures, unexpected restarts, connection issues and more.
2222

23-
For a full list of self help troubleshooting content, see [Azure Virtual Machine troubleshooting documentation](/troubleshoot/azure/virtual-machines/welcome-virtual-machines)
23+
For a full list of self help troubleshooting content, see [Azure Windows Virtual Machines troubleshooting documentation](/troubleshoot/azure/virtual-machines/windows/welcome-virtual-machines-windows) and [Azure Linux Virtual Machines troubleshooting documentation](/troubleshoot/azure/virtual-machines/linux/welcome-virtual-machines-linux).
2424

2525

2626
## Post a question on Microsoft Q&A

0 commit comments

Comments
 (0)