Skip to content

Commit 7459ac1

Browse files
authored
Merge pull request #289364 from MicrosoftDocs/main
10/29 11:00 AM IST Publish
2 parents 882428c + 59058ab commit 7459ac1

File tree

19 files changed

+76
-71
lines changed

19 files changed

+76
-71
lines changed

articles/api-center/configure-environments-deployments.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -73,9 +73,9 @@ Here you add a deployment by associating one of your APIs with the environment y
7373

7474
1. In the left menu, under **Assets**, select **APIs**.
7575

76-
1. Select an API, for example, the *Demo Conference API*.
76+
1. Select an API, for example, the *Conference API*.
7777

78-
1. On the **Demo Conference API** page, under **Details**, select **Deployments** > **+ Add deployment**.
78+
1. On the **Conference API** page, under **Details**, select **Deployments** > **+ Add deployment**.
7979

8080
1. In the **Add deployment** page, add the following information. If you previously defined the custom *Line of business* metadata or other metadata assigned to environments, you'll see them at the bottom of the page.
8181

@@ -85,7 +85,7 @@ Here you add a deployment by associating one of your APIs with the environment y
8585
|**Identification**|After you enter the preceding title, Azure API Center generates this identifier, which you can override.| Azure resource name for the deployment.|
8686
| **Description** | Optionally enter a description. | Description of the deployment. |
8787
| **Environment** | Make a selection from the dropdown, such as *My Testing*, or optionally select **Create new**.| New or existing environment where the API version is deployed. |
88-
| **Definition** | Select or add a definition file for a version of the Demo Conference API. | API definition file. |
88+
| **Definition** | Select or add a definition file for a version of the Conference API. | API definition file. |
8989
| **Runtime URL** | Enter a base URL, for example, `https://api.contoso.com`. | Base runtime URL for the API in the environment. |
9090
| **Line of business** | If you added this custom metadata, optionally make a selection from the dropdown, such as **IT**. | Custom metadata that identifies the business unit that manages APIs in the environment. |
9191

447 Bytes
Loading
35.3 KB
Loading
2.17 KB
Loading
1.58 KB
Loading

articles/api-center/register-apis.md

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ In this tutorial, you learn how to use the portal to:
2727
* One or more APIs that you want to register in your API center. Here are two examples, with links to their OpenAPI definitions:
2828

2929
* [Swagger Petstore API](https://github.com/swagger-api/swagger-petstore/blob/master/src/main/resources/openapi.yaml)
30-
* [Azure Demo Conference API](https://conferenceapi.azurewebsites.net?format=json)
30+
* [Conference API](https://bigconference.azurewebsites.net)
3131

3232
* Complete the previous tutorial, [Define custom metadata](add-metadata-properties.md), to define custom metadata for your APIs.
3333

@@ -41,7 +41,7 @@ When you register (add) an API in your API center, the API registration includes
4141

4242
After registering an API, you can add versions and definitions to the API.
4343

44-
The following steps register two sample APIs: Swagger Petstore API and Demo Conference API (see [Prerequisites](#prerequisites)). If you prefer, register APIs of your own.
44+
The following steps register two sample APIs: Swagger Petstore API and Conference API (see [Prerequisites](#prerequisites)). If you prefer, register APIs of your own.
4545

4646
1. In the [portal](https://portal.azure.com), navigate to your API center.
4747

@@ -70,7 +70,7 @@ The following steps register two sample APIs: Swagger Petstore API and Demo Conf
7070

7171
1. Select **Create**. The API is registered.
7272

73-
1. Repeat the preceding three steps to register another API, such as the Demo Conference API.
73+
1. Repeat the preceding three steps to register another API, such as the Conference API.
7474

7575
> [!TIP]
7676
> When you register an API in the portal, you can select any of the predefined API types or enter another type of your choice.
@@ -89,9 +89,9 @@ Here you add a version to one of your APIs:
8989

9090
1. In the portal, navigate to your API center.
9191

92-
1. In the left menu, select **APIs**, and then select an API, for example, *Demo Conference API*.
92+
1. In the left menu, select **APIs**, and then select an API, for example, *Swagger Petstore*.
9393

94-
1. On the Demo Conference API page, under **Details**, select **Versions** > **+ Add version**.
94+
1. On the API page, under **Details**, select **Versions** > **+ Add version**.
9595

9696
:::image type="content" source="media/register-apis/add-version.png" alt-text="Screenshot of adding an API version in the portal." lightbox="media/register-apis/add-version.png":::
9797

@@ -126,9 +126,9 @@ To add an API definition to your version:
126126
|**Title**| Enter a title of your choice, such as *v2 Definition*.|Name you choose for the API definition.|
127127
|**Identification**|After you enter the preceding title, Azure API Center generates this identifier, which you can override.| Azure resource name for the definition.|
128128
| **Description** | Optionally enter a description. | Description of the API definition. |
129-
| **Specification name** | For the Demo Conference API, select **OpenAPI**. | Specification format for the API.|
130-
| **Specification version** | Enter a version identifier of your choice, such as *2.0*. | Specification version. |
131-
|**Document** | Browse to a local definition file for the Demo Conference API, or enter a URL. Example URL: `https://conferenceapi.azurewebsites.net?format=json` | API definition file. |
129+
| **Specification name** | For the Petstore API, select **OpenAPI**. | Specification format for the API.|
130+
| **Specification version** | Enter a version identifier of your choice, such as *3.0*. | Specification version. |
131+
|**Document** | Browse to a local definition file for the Petstore API, or enter a URL. Example URL: `https://raw.githubusercontent.com/swagger-api/swagger-petstore/refs/heads/master/src/main/resources/openapi.yaml` | API definition file. |
132132

133133
:::image type="content" source="media/register-apis/add-definition.png" alt-text="Screenshot of adding an API definition in the portal." lightbox="media/register-apis/add-definition.png" :::
134134

articles/app-service/routine-maintenance.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@ Maintenance operations upgrade machines iteratively while App Service monitors t
6060

6161
### Are business hours reflected?
6262

63-
Maintenance operations are optimized to start outside the standard business hours of 9 AM to 5 PM. Statistically, that's the best time for any interruptions and restarts of workloads because there's less stress on the system (in customer applications and transitively on the platform itself). For App Service plans and App Service Environment v2, maintenance can continue into business hours during longer maintenance events.
63+
Yes, business hours are reflected for the time zone of the region. Maintenance operations are optimized to start outside the standard business hours of 9 AM to 5 PM. Statistically, that's the best time for any interruptions and restarts of workloads because there's less stress on the system (in customer applications and transitively on the platform itself). If resources are still upgrading by 9 AM in a given region, the upgrade will safely pause before the next critical step and until the end of business hours.
6464

6565
### What are my options to control routine maintenance?
6666

articles/azure-sql-edge/disconnected-deployment.md

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ title: Deploy Azure SQL Edge with Docker - Azure SQL Edge
33
description: Learn about deploying Azure SQL Edge with Docker
44
author: rwestMSFT
55
ms.author: randolphwest
6-
ms.date: 09/21/2024
6+
ms.date: 10/28/2024
77
ms.service: azure-sql-edge
88
ms.topic: quickstart
99
ms.custom: mode-other
@@ -55,13 +55,13 @@ Azure SQL Edge containers aren't supported on the following platforms for produc
5555
- Start an Azure SQL Edge instance running as the Developer edition:
5656

5757
```bash
58-
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
58+
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
5959
```
6060

6161
- Start an Azure SQL Edge instance running as the Premium edition:
6262

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

6767
> [!IMPORTANT]
@@ -72,7 +72,7 @@ Azure SQL Edge containers aren't supported on the following platforms for produc
7272
| Parameter | Description |
7373
| --- | --- |
7474
| **-e "ACCEPT_EULA=Y"** | Set the **ACCEPT_EULA** variable to any value to confirm your acceptance of the [End-User Licensing Agreement](https://go.microsoft.com/fwlink/?linkid=2139274). Required setting for the SQL Edge image. |
75-
| **-e "MSSQL_SA_PASSWORD=yourStrong(!)Password"** | Specify your own strong password that is at least eight characters and meets the [Azure SQL Edge password requirements](/sql/relational-databases/security/password-policy). Required setting for the SQL Edge image. |
75+
| **-e "MSSQL_SA_PASSWORD=\<password\>"** | Specify your own strong password that is at least eight characters and meets the [password requirements](/sql/relational-databases/security/password-policy). Required setting for the SQL Edge image. |
7676
| **-p 1433:1433** | Map a TCP port on the host environment (first value) with a TCP port in the container (second value). In this example, SQL Edge is listening on TCP 1433 in the container and this is exposed to the port, 1433, on the host. |
7777
| **--name azuresqledge** | Specify a custom name for the container rather than a randomly generated one. If you run more than one container, you can't reuse this same name. |
7878
| **-d** | Run the container in the background (daemon) |
@@ -106,12 +106,12 @@ The **SA** account is a system administrator on the Azure SQL Edge instance that
106106
107107
1. Choose a strong password to use for the SA user.
108108
109-
1. Use `docker exec` to run **sqlcmd** to change the password using Transact-SQL. In the following example, replace the old password, `<YourStrong!Passw0rd>`, and the new password, `<YourNewStrong!Passw0rd>`, with your own password values.
109+
1. Use `docker exec` to run **sqlcmd** to change the password using Transact-SQL. In the following example, replace the old password, `<old-password>`, and the new password, `<new-password>`, with your own password values.
110110
111111
```bash
112112
sudo docker exec -it azuresqledge /opt/mssql-tools/bin/sqlcmd \
113-
-S localhost -U SA -P "<YourStrong@Passw0rd>" \
114-
-Q 'ALTER LOGIN SA WITH PASSWORD="<YourNewStrong@Passw0rd>"'
113+
-S localhost -U SA -P "<old-password>" \
114+
-Q 'ALTER LOGIN SA WITH PASSWORD="<new-password>"'
115115
```
116116
117117
## Connect to Azure SQL Edge
@@ -127,7 +127,7 @@ The following steps use the Azure SQL Edge command-line tool, **sqlcmd**, inside
127127
1. Once inside the container, connect locally with **sqlcmd**. **sqlcmd** isn't in the path by default, so you have to specify the full path.
128128

129129
```bash
130-
/opt/mssql-tools/bin/sqlcmd -S localhost -U SA -P "<YourNewStrong@Passw0rd>"
130+
/opt/mssql-tools/bin/sqlcmd -S localhost -U SA -P "<password>"
131131
```
132132

133133
> [!TIP]

articles/bastion/bastion-connect-vm-ssh-linux.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ This article shows you how to securely and seamlessly create an SSH connection t
1616

1717
Azure Bastion provides secure connectivity to all of the VMs in the virtual network in which it's provisioned. Using Azure Bastion protects your virtual machines from exposing RDP/SSH ports to the outside world, while still providing secure access using RDP/SSH. For more information, see the [What is Azure Bastion?](bastion-overview.md) article.
1818

19-
When connecting to a Linux virtual machine using SSH, you can use both username/password and SSH keys for authentication. The SSH private key must be in a format that begins with `"-----BEGIN RSA PRIVATE KEY-----"` and ends with `"-----END RSA PRIVATE KEY-----"`.
19+
When connecting to a Linux virtual machine using SSH, you can use both username/password and SSH keys for authentication.
2020

2121
## Prerequisites
2222

articles/container-apps/ingress-how-to.md

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -203,7 +203,12 @@ type: Microsoft.App/containerApps
203203
204204
::: zone pivot="azure-portal"
205205
206-
This feature isn't supported in the Azure portal.
206+
:::image type="content" source="media/ingress/additional-tcp-ingress-ports-portal.png" lightbox="media/ingress/additional-tcp-ingress-ports-portal.png" alt-text="Screenshot of adding additional TCP ports for Container Apps ingress through the portal.":::
207+
208+
1. Expand the **Additional TCP ports** section within the Ingress blade.
209+
2. Add in additional TCP ports that your application will be accepting traffic on in the _Target port_ field. If _Exposed port_ is left empty, this will take from the same value set in _Target port_.
210+
3. Change the _Ingress traffic_ field as needed. This will configure where ingress traffic will be limited to for each port.
211+
4. When finished, click **Save**.
207212
208213
::: zone-end
209214

0 commit comments

Comments
 (0)