Skip to content

Commit cf9e157

Browse files
author
gitName
committed
Merge branch 'main' of https://github.com/MicrosoftDocs/azure-docs-pr into sfiimg
2 parents bfbe31a + 5f22adc commit cf9e157

File tree

2,119 files changed

+42255
-12656
lines changed

Some content is hidden

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

2,119 files changed

+42255
-12656
lines changed

articles/api-center/build-register-apis-vscode-extension.md

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ The following Visual Studio Code extensions are needed for the specified scenari
2828
* [GitHub Actions](https://marketplace.visualstudio.com/items?itemName=GitHub.vscode-github-actions) - to register APIs using a CI/CD pipeline with GitHub Actions
2929
* [Azure Pipelines](https://marketplace.visualstudio.com/items?itemName=ms-azure-devops.azure-pipelines) - to register APIs using a CI/CD pipeline with Azure Pipelines
3030
* [GitHub Copilot](https://marketplace.visualstudio.com/items?itemName=GitHub.copilot) - to generate OpenAPI specification files from API code
31-
* [GitHub Copilot for Azure](https://marketplace.visualstudio.com/items?itemName=ms-azuretools.vscode-azure-github-copilot) - to generate OpenAPI specification files using the Azure API Center Plugin for GitHub Copilot for Azure
31+
* [GitHub Copilot for Azure](https://marketplace.visualstudio.com/items?itemName=ms-azuretools.vscode-azure-github-copilot) - to generate OpenAPI specification files using the Azure API Center Plugin for [GitHub Copilot for Azure](/azure/developer/github-copilot-azure/introduction) (preview)
3232

3333
[!INCLUDE [vscode-extension-setup](includes/vscode-extension-setup.md)]
3434

@@ -66,7 +66,7 @@ After generating the OpenAPI specification file and checking for accuracy, you c
6666

6767
## Generate OpenAPI spec using natural language prompts
6868

69-
The API Center plugin for [GitHub Copilot for Azure](https://marketplace.visualstudio.com/items?itemName=ms-azuretools.vscode-azure-github-copilot) helps you design new APIs starting from natural language prompts. With AI assistance, quickly generate an OpenAPI spec for API development that complies with your organization's standards.
69+
The API Center plugin for [GitHub Copilot for Azure](https://marketplace.visualstudio.com/items?itemName=ms-azuretools.vscode-azure-github-copilot) (preview) helps you design new APIs starting from natural language prompts. With AI assistance, quickly generate an OpenAPI spec for API development that complies with your organization's standards.
7070

7171
> [!NOTE]
7272
> This feature is available in the pre-release version of the API Center extension.
@@ -98,4 +98,5 @@ The API Center plugin for [GitHub Copilot for Azure](https://marketplace.visuals
9898
* [Discover and consume APIs with the Azure API Center extension for Visual Studio Code](discover-apis-vscode-extension.md)
9999
* [Govern APIs with the Azure API Center extension for Visual Studio Code](govern-apis-vscode-extension.md)
100100
* [Enable and view platform API catalog in Visual Studio Code](enable-platform-api-catalog-vscode-extension.md)
101+
* [Overview of GitHub Copilot for Azure](/azure/developer/github-copilot-azure/introduction)
101102

articles/api-management/api-management-howto-integrate-internal-vnet-appgateway.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -86,7 +86,7 @@ Throughout this guide, you need to define several variables. Naming is based on
8686

8787
```powershell
8888
# These variables must be changed.
89-
$subscriptionId = "00000000-0000-0000-0000-000000000000" # GUID of your Azure subscription
89+
$subscriptionId = "aaaa0a0a-bb1b-cc2c-dd3d-eeeeee4e4e4e" # GUID of your Azure subscription
9090
$domain = "contoso.net" # The custom domain for your certificate
9191
$apimServiceName = "apim-contoso" # API Management service instance name, must be globally unique
9292
$apimDomainNameLabel = $apimServiceName # Domain name label for API Management's public IP address, must be globally unique

articles/api-management/breaking-changes/workspaces-breaking-changes-march-2025.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,7 @@ The following are abbreviated steps to add a workspace gateway to a workspace. F
6565

6666
> [!NOTE]
6767
> * The workspace gateway incurs additional charges. For more information, see [API Management pricing](https://aka.ms/apimpricing).
68-
> * API Management currently supports a dedicated gateway per workspace only. If this is impacting your migration plans, see the workspaces roadmap in the [workspaces GA announcement](https://aka.ms/apim/workspaces/ga-announcement).
68+
> * We're introducing the ability to associate multiple workspaces with a workspace gateway, helping organizations manage APIs with workspaces at a lower cost. This feature is being rolled out starting in December 2024 and it may not be available to all eligible services before January. [Learn more](https://aka.ms/apim/workspaces/sharedgateway)
6969
7070
1. In the [Azure portal](https://portal.azure.com), navigate to your API Management instance.
7171
1. In the left menu, under **APIs**, select **Workspaces**.

articles/api-management/how-to-configure-local-metrics-logs.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -310,8 +310,8 @@ For example, you can filter all syslogs to just the ones from the self-hosted ga
310310

311311
```shell
312312
$ cat host/var/log/syslog | grep "apimuser"
313-
May 15 05:54:20 aks-agentpool-43853532-vmss000000 apimuser[8]: Timestamp=2023-05-15T05:54:20.0445178Z, isRequestSuccess=True, totalTime=290, category=GatewayLogs, callerIpAddress=141.134.132.243, timeGenerated=2023-05-15T05:54:20.0445178Z, region=Repro, correlationId=b28565ec-73e0-41e6-9312-efcdd6841846, method=GET, url="http://20.126.242.200/echo/resource?param1\=sample", backendResponseCode=200, responseCode=200, responseSize=628, cache=none, backendTime=287, apiId=echo-api, operationId=retrieve-resource, apimSubscriptionId=master, clientProtocol=HTTP/1.1, backendProtocol=HTTP/1.1, apiRevision=1, backendMethod=GET, backendUrl="http://echoapi.cloudapp.net/api/resource?param1\=sample"
314-
May 15 05:54:21 aks-agentpool-43853532-vmss000000 apimuser[8]: Timestamp=2023-05-15T05:54:21.1189171Z, isRequestSuccess=True, totalTime=150, category=GatewayLogs, callerIpAddress=141.134.132.243, timeGenerated=2023-05-15T05:54:21.1189171Z, region=Repro, correlationId=ab4d7464-acee-40ae-af95-a521cc57c759, method=GET, url="http://20.126.242.200/echo/resource?param1\=sample", backendResponseCode=200, responseCode=200, responseSize=628, cache=none, backendTime=148, apiId=echo-api, operationId=retrieve-resource, apimSubscriptionId=master, clientProtocol=HTTP/1.1, backendProtocol=HTTP/1.1, apiRevision=1, backendMethod=GET, backendUrl="http://echoapi.cloudapp.net/api/resource?param1\=sample"
313+
May 15 05:54:20 aks-agentpool-43853532-vmss000000 apimuser[8]: Timestamp=2023-05-15T05:54:20.0445178Z, isRequestSuccess=True, totalTime=290, category=GatewayLogs, callerIpAddress=141.134.132.243, timeGenerated=2023-05-15T05:54:20.0445178Z, region=Repro, correlationId=aaaa0000-bb11-2222-33cc-444444dddddd, method=GET, url="http://20.126.242.200/echo/resource?param1\=sample", backendResponseCode=200, responseCode=200, responseSize=628, cache=none, backendTime=287, apiId=echo-api, operationId=retrieve-resource, apimSubscriptionId=master, clientProtocol=HTTP/1.1, backendProtocol=HTTP/1.1, apiRevision=1, backendMethod=GET, backendUrl="http://echoapi.cloudapp.net/api/resource?param1\=sample"
314+
May 15 05:54:21 aks-agentpool-43853532-vmss000000 apimuser[8]: Timestamp=2023-05-15T05:54:21.1189171Z, isRequestSuccess=True, totalTime=150, category=GatewayLogs, callerIpAddress=141.134.132.243, timeGenerated=2023-05-15T05:54:21.1189171Z, region=Repro, correlationId=bbbb1111-cc22-3333-44dd-555555eeeeee, method=GET, url="http://20.126.242.200/echo/resource?param1\=sample", backendResponseCode=200, responseCode=200, responseSize=628, cache=none, backendTime=148, apiId=echo-api, operationId=retrieve-resource, apimSubscriptionId=master, clientProtocol=HTTP/1.1, backendProtocol=HTTP/1.1, apiRevision=1, backendMethod=GET, backendUrl="http://echoapi.cloudapp.net/api/resource?param1\=sample"
315315
```
316316
> [!NOTE]
317317
> If you have changed the root with `chroot`, for example `chroot /host`, then the above path needs to reflect that change.

articles/api-management/how-to-create-workspace.md

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ author: dlepow
55
ms.topic: how-to
66
ms.service: azure-api-management
77
ms.author: danlep
8-
ms.date: 07/10/2024
8+
ms.date: 11/12/2024
99
ms.custom:
1010
---
1111

@@ -24,7 +24,8 @@ Follow the steps in this article to:
2424
* Assign permissions to the workspace
2525

2626
> [!NOTE]
27-
> Currently, creating a workspace gateway is a long-running operation that can take up to 3 hours or more to complete.
27+
> * Currently, creating a workspace gateway is a long-running operation that can take up to 3 hours or more to complete.
28+
> * We're introducing the ability to associate multiple workspaces with a workspace gateway, helping organizations manage APIs with workspaces at a lower cost. This feature is being rolled out starting in December 2024 and it may not be available to all eligible services before January. [Learn more](https://aka.ms/apim/workspaces/sharedgateway)
2829
2930
## Prerequisites
3031

articles/api-management/how-to-deploy-self-hosted-gateway-kubernetes-opentelemetry.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -213,7 +213,7 @@ Now that both our OpenTelemetry Collector and the self-hosted gateway are deploy
213213
X-Forwarded-For: 10.244.1.1
214214
traceparent: 00-3192030c89fd7a60ef4c9749d6bdef0c-f4eeeee46f770061-01
215215
Request-Id: |3192030c89fd7a60ef4c9749d6bdef0c.f4eeeee46f770061.
216-
Request-Context: appId=cid-v1:c24f5e00-aa25-47f2-bbb5-035847e7f52a
216+
Request-Context: appId=cid-v1:00001111-aaaa-2222-bbbb-3333cccc4444
217217
X-Powered-By: Azure API Management - http://api.azure.com/,ASP.NET
218218
X-AspNet-Version: 4.0.30319
219219
```

articles/api-management/workspaces-overview.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -67,12 +67,13 @@ Workspace gateways are managed independently from the API Management service and
6767
* For information on the cost of workspace gateways, see [API Management pricing](https://aka.ms/apimpricing).
6868
* For a detailed comparison of API Management gateways, see [API Management gateways overview](api-management-gateways-overview.md).
6969

70+
> [!NOTE]
71+
> We're introducing the ability to associate multiple workspaces with a workspace gateway, helping organizations manage APIs with workspaces at a lower cost. This feature is being rolled out starting in December 2024 and it may not be available to all eligible services before January. [Learn more](https://aka.ms/apim/workspaces/sharedgateway)
72+
7073
### Gateway hostname
7174

7275
Each association of a workspace to a workspace gateway creates a unique hostname for APIs managed in that workspace. Default hostnames follow the pattern `<workspace-name>-<hash>.gateway.<region>.azure-api.net`. Currently, custom hostnames aren't supported for workspace gateways.
7376

74-
> [!NOTE]
75-
> Through October 2024, APIs in workspaces can be accessed at runtime using the gateway hostname of your API Management instance in addition to the hostname of the workspace gateway.
7677

7778
### Network isolation
7879

@@ -109,7 +110,6 @@ Workspace gateways are currently available in the following regions:
109110
The following constraints currently apply to workspace gateways:
110111

111112
* A workspace gateway needs to be in the same region as the API Management instance's primary Azure region and in the same subscription.
112-
* A gateway can be associated only with one workspace
113113
* A workspace can't be associated with a self-hosted gateway
114114
* Workspace gateways don't support inbound private endpoints
115115
* APIs in workspace gateways can't be assigned custom hostnames

articles/app-service/ip-address-change-ssl.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -26,11 +26,11 @@ If you received a notification that the TLS/SSL IP address of your Azure App Ser
2626

2727
3. Select your App Service app from the list.
2828

29-
4. Under the **Settings** header, click **SSL settings** in the left navigation.
29+
4. Under the **Settings** header, click **Custom domain** in the left navigation.
3030

31-
1. In the TLS/SSL bindings section, select the host name record. In the editor that opens, choose **SNI SSL** on the **SSL Type** drop-down menu and click **Add Binding**. When you see the operation success message, the existing IP address has been released.
31+
5. In the **Custom domains** section, look for the domain with the Binding type of IP Based SSL. Click the three elipses for that domain and select **Update binding**. In the editor that opens, choose **SNI SSL** for the TLS/SSL type and click **Update**.
3232

33-
6. In the **SSL bindings** section, again select the same host name record with the certificate. In the editor that opens, this time choose **IP Based SSL** on the **SSL Type** drop-down menu and click **Add Binding**. When you see the operation success message, you’ve acquired a new IP address.
33+
6. In the **Custom domains** section, select the same host name record. In the editor that opens, this time choose **IP Based SSL** for the TLS/SSL type and click **Update**. When you see the operation success message, you’ve acquired a new IP address.
3434

3535
7. If an A record (DNS record pointing directly to your IP address) is configured in your Domain Registration Portal (third party DNS Provider or Azure DNS), replace the existing IP address with the newly generated one. You can find the new IP address by following the instructions in the next section.
3636

153 KB
Loading
63.4 KB
Loading

0 commit comments

Comments
 (0)