Skip to content

Commit ac49dc0

Browse files
authored
Merge pull request #290248 from MicrosoftDocs/main
Merge main to live, 4 AM
2 parents 003d3bc + 9f4b256 commit ac49dc0

File tree

43 files changed

+211
-174
lines changed

Some content is hidden

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

43 files changed

+211
-174
lines changed

articles/app-service/network-secure-outbound-traffic-azure-firewall.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -99,7 +99,7 @@ Outbound traffic from your app is now routed through the integrated virtual netw
9999
1. Navigate to the firewall's overview page and select its firewall policy.
100100

101101
1. In the firewall policy page, from the left navigation, select **Application Rules** > **Add a rule collection**.
102-
1. In **Rules**, add a network rule with the App Service subnet as the source address, and specify an FQDN destination. In the screenshot below, the destination FQDN is set to `api.my-ip.io`.
102+
1. In **Rules**, add a network rule with the App Service subnet as the source address, and specify an FQDN destination. In the screenshot below, the destination FQDN is set to `contoso.com`.
103103

104104
:::image type="content" source="./media/network-secure-outbound-traffic-azure-firewall/config-azfw-policy-app-rule.png" alt-text="Screenshot of configure Azure Firewall policy rule.":::
105105

@@ -113,7 +113,7 @@ Outbound traffic from your app is now routed through the integrated virtual netw
113113
An easy way to verify your configuration is to use the `curl` command from your app's SCM debug console to verify the outbound connection.
114114

115115
1. In a browser, navigate to `https://<app-name>.scm.azurewebsites.net/DebugConsole`.
116-
1. In the console, run `curl -s <protocol>://<fqdn-address>` with a URL that matches the application rule you configured, To continue example in the previous screenshot, you can use **curl -s https://api.my-ip.io/ip**. The following screenshot shows a successful response from the API, showing the public IP address of your App Service app.
116+
1. In the console, run `curl -s <protocol>://<fqdn-address>` with a URL that matches an application rule you configured. The following screenshot is an example to a website that shows a successful response from a API, showing an IP address.
117117

118118
:::image type="content" source="./media/network-secure-outbound-traffic-azure-firewall/verify-outbound-traffic-fw-allow-rule.png" alt-text="Screenshot of verifying the success outbound traffic by using curl command in SCM debug console.":::
119119

articles/azure-netapp-files/azacsnap-release-notes.md

Lines changed: 13 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ services: azure-netapp-files
55
author: Phil-Jensen
66
ms.service: azure-netapp-files
77
ms.topic: conceptual
8-
ms.date: 08/15/2024
8+
ms.date: 10/31/2024
99
ms.author: phjensen
1010
---
1111

@@ -17,6 +17,18 @@ Download the latest release of the binary for [Linux](https://aka.ms/azacsnap-li
1717

1818
For specific information on Preview features, refer to the [AzAcSnap Preview](azacsnap-preview.md) page.
1919

20+
## Oct-2024
21+
22+
### AzAcSnap 10a (Build: 1B79BA*)
23+
24+
AzAcSnap 10a is being released with the following fixes and improvements:
25+
26+
- Fixes and Improvements:
27+
- Allow configurable wait timeout for Microsoft SQL Server. This will help you increase timeout for slow responding systems (default and minimum value is 30 seconds).
28+
- Added a global override variable `MSSQL_CMD_TIMEOUT_SECS` to be used in either the `.azacsnaprc` file or as an environment variable set to the required wait timeout in seconds. For details on configuration refer to the [global override settings to control AzAcSnap behavior](azacsnap-tips.md#global-override-settings-to-control-azacsnap-behavior).
29+
30+
Download the binary of [AzAcSnap 10a for Linux](https://aka.ms/azacsnap-10a-linux)([signature file](https://aka.ms/azacsnap-10a-linux-signature)) or [AzAcSnap 10a for Windows](https://aka.ms/azacsnap-10a-windows).
31+
2032
## Jul-2024
2133

2234
### AzAcSnap 10 (Build: 1B55F1*)

articles/azure-sql-edge/configure.md

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -185,11 +185,11 @@ Your Azure SQL Edge configuration changes and database files are persisted in th
185185
The first option is to mount a directory on your host as a data volume in your container. To do that, use the `docker run` command with the `-v <host directory>:/var/opt/mssql` flag. This allows the data to be restored between container executions.
186186
187187
```bash
188-
docker run -e 'ACCEPT_EULA=Y' -e 'MSSQL_SA_PASSWORD=<YourStrong!Passw0rd>' -p 1433:1433 -v <host directory>/data:/var/opt/mssql/data -v <host directory>/log:/var/opt/mssql/log -v <host directory>/secrets:/var/opt/mssql/secrets -d mcr.microsoft.com/azure-sql-edge
188+
docker run -e 'ACCEPT_EULA=Y' -e 'MSSQL_SA_PASSWORD=<password>' -p 1433:1433 -v <host directory>/data:/var/opt/mssql/data -v <host directory>/log:/var/opt/mssql/log -v <host directory>/secrets:/var/opt/mssql/secrets -d mcr.microsoft.com/azure-sql-edge
189189
```
190190
191191
```PowerShell
192-
docker run -e "ACCEPT_EULA=Y" -e "MSSQL_SA_PASSWORD=<YourStrong!Passw0rd>" -p 1433:1433 -v <host directory>/data:/var/opt/mssql/data -v <host directory>/log:/var/opt/mssql/log -v <host directory>/secrets:/var/opt/mssql/secrets -d mcr.microsoft.com/azure-sql-edge
192+
docker run -e "ACCEPT_EULA=Y" -e "MSSQL_SA_PASSWORD=<password>" -p 1433:1433 -v <host directory>/data:/var/opt/mssql/data -v <host directory>/log:/var/opt/mssql/log -v <host directory>/secrets:/var/opt/mssql/secrets -d mcr.microsoft.com/azure-sql-edge
193193
```
194194
195195
This technique also enables you to share and view the files on the host outside of Docker.
@@ -205,11 +205,11 @@ This technique also enables you to share and view the files on the host outside
205205
The second option is to use a data volume container. You can create a data volume container by specifying a volume name instead of a host directory with the `-v` parameter. The following example creates a shared data volume named **sqlvolume**.
206206
207207
```bash
208-
docker run -e 'ACCEPT_EULA=Y' -e 'MSSQL_SA_PASSWORD=<YourStrong!Passw0rd>' -p 1433:1433 -v sqlvolume:/var/opt/mssql -d mcr.microsoft.com/azure-sql-edge
208+
docker run -e 'ACCEPT_EULA=Y' -e 'MSSQL_SA_PASSWORD=<password>' -p 1433:1433 -v sqlvolume:/var/opt/mssql -d mcr.microsoft.com/azure-sql-edge
209209
```
210210
211211
```PowerShell
212-
docker run -e "ACCEPT_EULA=Y" -e "MSSQL_SA_PASSWORD=<YourStrong!Passw0rd>" -p 1433:1433 -v sqlvolume:/var/opt/mssql -d mcr.microsoft.com/azure-sql-edge
212+
docker run -e "ACCEPT_EULA=Y" -e "MSSQL_SA_PASSWORD=<password>" -p 1433:1433 -v sqlvolume:/var/opt/mssql -d mcr.microsoft.com/azure-sql-edge
213213
```
214214
215215
> [!NOTE]

articles/azure-sql-edge/deploy-kubernetes.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,7 @@ Create an SA password in the Kubernetes cluster. Kubernetes can manage sensitive
7171
The following command creates a password for the SA account:
7272

7373
```azurecli
74-
kubectl create secret generic mssql --from-literal=MSQL_SA_PASSWORD="MyC0m9l&xP@ssw0rd" -n <namespace name>
74+
kubectl create secret generic mssql --from-literal=MSQL_SA_PASSWORD="<password>" -n <namespace name>
7575
```
7676

7777
Replace `MyC0m9l&xP@ssw0rd` with a complex password.

articles/azure-sql-edge/troubleshoot.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,7 @@ If the SQL Edge container fails to run, try the following tests:
6363
- If you get an error such as `failed to create endpoint CONTAINER_NAME on network bridge. Error starting proxy: listen tcp 0.0.0.0:1433 bind: address already in use.`, you're attempting to map the container port 1433 to a port that is already in use. This can happen if you're running SQL Edge locally on the host machine. It can also happen if you start two SQL Edge containers and try to map them both to the same host port. If this happens, use the `-p` parameter to map the container port 1433 to a different host port. For example:
6464

6565
```bash
66-
sudo docker run --cap-add SYS_PTRACE -e 'ACCEPT_EULA=1' -e 'MSSQL_SA_PASSWORD=yourStrong(!)Password' -p 1433:1433 --name azuresqledge -d mcr.microsoft.com/azure-sql-edge-developer.
66+
sudo docker run --cap-add SYS_PTRACE -e 'ACCEPT_EULA=1' -e 'MSSQL_SA_PASSWORD=<password>' -p 1433:1433 --name azuresqledge -d mcr.microsoft.com/azure-sql-edge-developer.
6767
```
6868

6969
- If you get an error such as `Got permission denied while trying to connect to the Docker daemon socket at unix:///var/run/docker.sock: Get http://%2Fvar%2Frun%2Fdocker.sock/v1.30tdout=1&tail=all: dial unix /var/run/docker.sock: connect: permission denied` when trying to start a container, then add your user to the docker group in Ubuntu. Then sign out and sign back in again, as this change affects new sessions.

articles/batch/pool-endpoint-configuration.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
---
22
title: Configure node endpoints in Azure Batch pool
3-
description: How to configure or disable access to SSH or RDP ports on compute nodes in an Azure Batch pool.
3+
description: How to configure node endpoints such as access to SSH or RDP ports on compute nodes in an Azure Batch pool.
44
ms.topic: how-to
55
ms.date: 11/08/2024
66
---
77

8-
# Configure or disable remote access to compute nodes in an Azure Batch pool
8+
# Configure remote access to compute nodes in an Azure Batch pool
99

1010
If configured, you can allow a [node user](/rest/api/batchservice/computenode/adduser) with network connectivity to connect
1111
externally to a compute node in a Batch pool. For example, a user can connect by Remote Desktop (RDP) on port 3389 to a
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.

0 commit comments

Comments
 (0)