Skip to content

Commit 0d1a9eb

Browse files
committed
Merge branch 'main' of https://github.com/MicrosoftDocs/azure-docs-pr into vnet-tut-peering
2 parents 77a8b29 + cb91d8b commit 0d1a9eb

25 files changed

+378
-241
lines changed

articles/api-management/api-management-get-started-publish-versions.md

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ ms.author: danlep
1212
---
1313
# Tutorial: Publish multiple versions of your API
1414

15-
There are times when it's impractical to have all callers to your API use exactly the same version. When callers want to upgrade to a later version, they want an approach that's easy to understand. As shown in this tutorial, it is possible to provided multiple *versions* in Azure API Management.
15+
There are times when it's impractical to have all callers to your API use exactly the same version. When callers want to upgrade to a later version, they want an approach that's easy to understand. As shown in this tutorial, it is possible to provide multiple *versions* in Azure API Management.
1616

1717
For background, see [Versions & revisions](https://azure.microsoft.com/blog/versions-revisions/).
1818

@@ -67,11 +67,13 @@ After creating the version, it now appears underneath **Demo Conference API** in
6767

6868
![Versions listed under an API in the Azure portal](media/api-management-getstarted-publish-versions/version-list.png)
6969

70-
You can now edit and configure **v1** as an API that is separate from **Original**. Changes to one version do not affect another.
71-
7270
> [!Note]
7371
> If you add a version to a non-versioned API, an **Original** is also automatically created. This version responds on the default URL. Creating an Original version ensures that any existing callers are not broken by the process of adding a version. If you create a new API with versions enabled at the start, an Original isn't created.
7472
73+
## Edit a version
74+
75+
After adding the version, you can now edit and configure it as an API that is separate from an Original. Changes to one version do not affect another. For example, add or remove API operations, or edit the OpenAPI specification. For more information, see [Edit an API](edit-api.md).
76+
7577
## Add the version to a product
7678

7779
In order for callers to see the new version, it must be added to a *product*. If you didn't already add the version to a product, you can add it to a product at any time.

articles/api-management/soft-delete.md

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -114,7 +114,10 @@ https://management.azure.com/subscriptions/{subscriptionId}/resourceGroups/{reso
114114

115115
## Purge a soft-deleted instance
116116

117-
Use the API Management [Purge](/rest/api/apimanagement/current-ga/deleted-services/purge) operation, substituting `{subscriptionId}`, `{location}`, and `{serviceName}` with your Azure subscription, resource location, and API Management name:
117+
Use the API Management [Purge](/rest/api/apimanagement/current-ga/deleted-services/purge) operation, substituting `{subscriptionId}`, `{location}`, and `{serviceName}` with your Azure subscription, resource location, and API Management name.
118+
119+
> [!NOTE]
120+
> To purge a soft-deleted instance, you must have the following RBAC permissions at the subscription scope: Microsoft.ApiManagement/locations/deletedservices/delete, Microsoft.ApiManagement/deletedservices/read.
118121
119122
```rest
120123
DELETE https://management.azure.com/subscriptions/{subscriptionId}/providers/Microsoft.ApiManagement/locations/{location}/deletedservices/{serviceName}?api-version=2021-08-01

articles/azure-fluid-relay/reference/service-limits.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,9 +9,9 @@ ms.topic: reference
99
ms.service: azure-fluid
1010
---
1111

12-
# Azure Fluid Relay Limits
12+
# Azure Fluid Relay limits
1313

14-
This article outlines known limitation of Azure Fluid Relay.
14+
This article outlines known limitations of Azure Fluid Relay.
1515

1616
## Distributed Data Structures
1717

@@ -21,7 +21,7 @@ The Azure Fluid Relay doesn't support [experimental distributed data structures
2121

2222
The maximum number of simultaneous users in one session on Azure Fluid Relay is 100 users. This limit is on simultaneous users. What this means is that the 101st user won't be allowed to join the session. In the case where an existing user leaves the session, a new user will be able to join. This is because the number of simultaneous users at that point will be less than the limit.
2323

24-
## Fluid Summaries
24+
## Fluid summaries
2525

2626
Incremental summaries uploaded to Azure Fluid Relay can't exceed 28 MB in size. More info [here](https://fluidframework.com/docs/concepts/summarizer).
2727

articles/azure-fluid-relay/resources/support.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,15 +9,15 @@ ms.topic: reference
99
ms.service: azure-fluid
1010
---
1111

12-
# Help and Support options for Azure Fluid Relay
12+
# Help and support options for Azure Fluid Relay
1313

1414
If you have an issue or question involving Azure Fluid Relay, the following options are available.
1515

16-
## Check out Frequently Asked Questions
16+
## Check out frequently asked questions
1717

1818
You can see if your question is already answered on our Frequently Asked Questions [page](faq.md).
1919

20-
## Create an Azure Support Request
20+
## Create an Azure support request
2121

2222
With Azure, there are many [support options and plans](https://azure.microsoft.com/support/plans/) available, which you can explore and review. You can create a support ticket in the [Azure portal](https://portal.azure.com/#blade/Microsoft_Azure_Support/HelpAndSupportBlade/overview).
2323

articles/cognitive-services/Speech-Service/toc.yml

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -194,12 +194,14 @@ items:
194194
href: call-center-transcription.md
195195
- name: Ingestion Client
196196
href: ingestion-client.md
197-
- name: Pronunciation Assessment
197+
- name: Language learning
198198
items:
199-
- name: Pronunciation Assessment in Speech Studio
200-
href: pronunciation-assessment-tool.md
201-
- name: How to use Pronunciation Assessment
202-
href: how-to-pronunciation-assessment.md
199+
- name: Pronunciation Assessment
200+
items:
201+
- name: Pronunciation Assessment in Speech Studio
202+
href: pronunciation-assessment-tool.md
203+
- name: How to use Pronunciation Assessment
204+
href: how-to-pronunciation-assessment.md
203205
- name: Conversation transcription
204206
items:
205207
- name: Conversation Transcription overview

articles/connectors/built-in.md

Lines changed: 58 additions & 34 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
---
2-
title: Overview about built-in connectors in Azure Logic Apps
3-
description: Learn about built-in connectors that run natively to create automated integration workflows in Azure Logic Apps.
2+
title: Built-in connector overview
3+
description: Learn about built-in connectors that run natively in Azure Logic Apps.
44
services: logic-apps
55
ms.suite: integration
66
ms.reviewer: estfan, azla
@@ -24,22 +24,46 @@ This article provides a general overview about built-in connectors in Consumptio
2424

2525
## Built-in connectors in Consumption versus Standard
2626

27-
The following table lists the current and expanding galleries of built-in connectors available for Consumption versus Standard logic app workflows. An asterisk (**\***) marks [service provider-based built-in connectors](../logic-apps/custom-connector-overview.md#service-provider-interface-implementation).
27+
The following table lists the current and expanding galleries of built-in connectors available for Consumption versus Standard logic app workflows. For Standard workflows, an asterisk (**\***) marks [built-in connectors based on the *service provider* model](#service-provider-interface-implementation), which is described in more detail later.
2828

2929
| Consumption | Standard |
3030
|-------------|----------|
3131
| Azure API Management<br>Azure App Services <br>Azure Functions <br>Azure Logic Apps <br>Batch <br>Control <br>Data Operations <br>Date Time <br>Flat File <br>HTTP <br>Inline Code <br>Integration Account <br>Liquid <br>Request <br>Schedule <br>Variables <br>XML | Azure Blob* <br>Azure Cosmos DB* <br>Azure Functions <br>Azure Queue* <br>Azure Table Storage* <br>Control <br>Data Operations <br>Date Time <br>DB2* <br>Event Hubs* <br>Flat File <br>FTP* <br>HTTP <br>IBM Host File* <br>Inline Code <br>Liquid operations <br>MQ* <br>Request <br>Schedule <br>Service Bus* <br>SFTP* <br>SQL Server* <br>Variables <br>Workflow operations <br>XML operations |
3232
|||
3333

34+
<a name="service-provider-interface-implementation"></a>
35+
36+
## Service provider-based built-in connectors
37+
38+
In Standard logic app workflows, a built-in connector that has the following attributes is informally known as a *service provider*:
39+
40+
* Is based on the [Azure Functions extensibility model](../azure-functions/functions-bindings-register.md).
41+
42+
* Provides access from a Standard logic app workflow to a service, such as Azure Blob Storage, Azure Service Bus, Azure Event Hubs, SFTP, and SQL Server.
43+
44+
Some built-in connectors support only a single way to authenticate a connection to the underlying service. Other built-in connectors can offer a choice, such as using a connection string, Azure Active Directory (Azure AD), or a managed identity.
45+
46+
* Runs in the same process as the redesigned Azure Logic Apps runtime.
47+
48+
These service provider-based built-in connectors are available alongside their [managed connector versions](managed.md).
49+
50+
In contrast, a built-in connector that's *not a service provider* has the following attributes:
51+
52+
* Isn't based on the Azure Functions extensibility model.
53+
54+
* Is directly implemented as a job within the Azure Logic Apps runtime, such as Schedule, HTTP, Request, and XML operations.
55+
3456
<a name="custom-built-in"></a>
3557

3658
## Custom built-in connectors
3759

38-
For Standard logic apps, if a built-connector isn't available for your scenario, you can create your own built-in connector. You can use the same [*service provider interface implementation*](../logic-apps/custom-connector-overview.md#service-provider-interface-implementation) that's used by service provider-based built-in connectors, such as SQL Server, Service Bus, Blob Storage, Event Hubs, and Blob Storage. This interface implementation is based on the [Azure Functions extensibility model](../azure-functions/functions-bindings-register.md) and provides the capability for you to create custom built-in connectors that anyone can use in Standard logic apps.
60+
For Standard logic apps, you can create your own built-in connector with the same [built-in connector extensibility model](../logic-apps/custom-connector-overview.md#built-in-connector-extensibility-model) that's used by service provider-based built-in connectors, such as Azure Blob, Azure Event Hubs, Azure Service Bus, SQL Server, and more. This interface implementation is based on the [Azure Functions extensibility model](../azure-functions/functions-bindings-register.md) and provides the capability for you to create custom built-in connectors that anyone can use in Standard logic apps.
61+
62+
For Consumption logic apps, you can't create your own built-in connectors, but you create your own managed connectors.
3963

4064
For more information, review the following documentation:
4165

42-
* [Custom connectors for Standard logic apps](../logic-apps/custom-connector-overview.md#custom-connector-standard)
66+
* [Custom connectors in Azure Logic Apps](../logic-apps/custom-connector-overview.md#custom-connector-standard)
4367
* [Create custom built-in connectors for Standard logic apps](../logic-apps/create-custom-built-in-connector-standard.md)
4468

4569
<a name="general-built-in"></a>
@@ -120,19 +144,19 @@ You can use the following built-in connectors to perform general tasks, for exam
120144
:::row-end:::
121145
:::row:::
122146
:::column:::
123-
[![FTP icon][ftp-icon]][ftp-doc]
147+
![FTP icon][ftp-icon]
124148
\
125149
\
126-
[**FTP**][ftp-doc]<br>(*Standard logic app only*)
150+
**FTP**<br>(*Standard logic app only*)
127151
\
128152
\
129153
Connect to FTP or FTPS servers you can access from the internet so that you can work with your files and folders.
130154
:::column-end:::
131155
:::column:::
132-
[![SFTP-SSH icon][sftp-ssh-icon]][sftp-ssh-doc]
156+
![SFTP-SSH icon][sftp-ssh-icon]
133157
\
134158
\
135-
[**SFTP-SSH**][sftp-ssh-doc]<br>(*Standard logic app only*)
159+
**SFTP-SSH**<br>(*Standard logic app only*)
136160
\
137161
\
138162
Connect to SFTP servers that you can access from the internet by using SSH so that you can work with your files and folders.
@@ -145,9 +169,9 @@ You can use the following built-in connectors to perform general tasks, for exam
145169

146170
<a name="service-built-in"></a>
147171

148-
## Service-based built-in connectors
172+
## Built-in connectors for specific services and systems
149173

150-
Connectors for some services provide both built-in connectors and managed connectors, which might differ across these versions.
174+
You can use the following built-in connectors to access specific services and systems. In Standard logic app workflows, some of these built-in connectors are also informally known as *service providers*, which can differ from their managed connector counterparts in some ways.
151175

152176
:::row:::
153177
:::column:::
@@ -172,75 +196,75 @@ Connectors for some services provide both built-in connectors and managed connec
172196
When Swagger is included, the triggers and actions defined by these apps appear like any other first-class triggers and actions in Azure Logic Apps.
173197
:::column-end:::
174198
:::column:::
175-
[![Azure Blob icon icon][azure-blob-storage-icon]][azure-app-services-doc]
199+
![Azure Blob icon][azure-blob-storage-icon]
176200
\
177201
\
178-
[**Azure Blob**][azure-blob-storage-doc]<br>(*Standard logic app only*)
202+
**Azure Blob**<br>(*Standard logic app only*)
179203
\
180204
\
181205
Connect to your Azure Blob Storage account so you can create and manage blob content.
182206
:::column-end:::
183207
:::column:::
184-
[![Azure Cosmos DB icon][azure-cosmos-db-icon]][azure-cosmos-db-doc]
208+
![Azure Cosmos DB icon][azure-cosmos-db-icon]
185209
\
186210
\
187-
[**Azure Cosmos DB**][azure-cosmos-db-doc]<br>(*Standard logic app only*)
211+
**Azure Cosmos DB**<br>(*Standard logic app only*)
188212
\
189213
\
190214
Connect to Azure Cosmos DB so that you can access and manage Azure Cosmos DB documents.
191215
:::column-end:::
192216
:::column:::
193-
[![Azure Functions icon][azure-functions-icon]][azure-functions-doc]
217+
![Azure Event Hubs icon][azure-event-hubs-icon]
194218
\
195219
\
196-
[**Azure Functions**][azure-functions-doc]
220+
**Azure Event Hubs**<br>(*Standard logic app only*)
197221
\
198222
\
199-
Call [Azure-hosted functions](../azure-functions/functions-overview.md) to run your own *code snippets* (C# or Node.js) within your workflow.
223+
Consume and publish events through an event hub. For example, get output from your logic app with Event Hubs, and then send that output to a real-time analytics provider.
200224
:::column-end:::
201225
:::row-end:::
202226
:::row:::
203227
:::column:::
204-
[![Azure Logic Apps icon][azure-logic-apps-icon]][nested-logic-app-doc]
228+
[![Azure Functions icon][azure-functions-icon]][azure-functions-doc]
205229
\
206230
\
207-
[**Azure Logic Apps**][nested-logic-app-doc]<br>(*Consumption logic app*) <br><br>-or-<br><br>[**Workflow operations**][nested-logic-app-doc]<br>(*Standard logic app*)
231+
[**Azure Functions**][azure-functions-doc]
208232
\
209233
\
210-
Call other workflows that start with the Request trigger named **When a HTTP request is received**.
234+
Call [Azure-hosted functions](../azure-functions/functions-overview.md) to run your own *code snippets* (C# or Node.js) within your workflow.
211235
:::column-end:::
212236
:::column:::
213-
[![Azure Service Bus icon][azure-service-bus-icon]][azure-service-bus-doc]
237+
[![Azure Logic Apps icon][azure-logic-apps-icon]][nested-logic-app-doc]
214238
\
215239
\
216-
[**Azure Service Bus**][azure-service-bus-doc]<br>(*Standard logic app only*)
240+
[**Azure Logic Apps**][nested-logic-app-doc]<br>(*Consumption logic app*) <br><br>-or-<br><br>**Workflow operations**<br>(*Standard logic app*)
217241
\
218242
\
219-
Manage asynchronous messages, queues, sessions, topics, and topic subscriptions.
243+
Call other workflows that start with the Request trigger named **When a HTTP request is received**.
220244
:::column-end:::
221245
:::column:::
222-
[![Azure Table Storage icon][azure-table-storage-icon]][azure-table-storage-doc]
246+
![Azure Service Bus icon][azure-service-bus-icon]
223247
\
224248
\
225-
[**Azure Table Storage**][azure-table-storage-doc]<br>(*Standard logic app only*)
249+
**Azure Service Bus**<br>(*Standard logic app only*)
226250
\
227251
\
228-
Connect to your Azure Storage account so that you can create, update, query, and manage tables.
252+
Manage asynchronous messages, queues, sessions, topics, and topic subscriptions.
229253
:::column-end:::
230254
:::column:::
231-
[![Azure Event Hubs icon][azure-event-hubs-icon]][azure-event-hubs-doc]
255+
![Azure Table Storage icon][azure-table-storage-icon]
232256
\
233257
\
234-
[**Event Hubs**][azure-event-hubs-doc]<br>(*Standard logic app only*)
258+
**Azure Table Storage**<br>(*Standard logic app only*)
235259
\
236260
\
237-
Consume and publish events through an event hub. For example, get output from your logic app with Event Hubs, and then send that output to a real-time analytics provider.
261+
Connect to your Azure Storage account so that you can create, update, query, and manage tables.
238262
:::column-end:::
239263
:::column:::
240-
[![IBM DB2 icon][ibm-db2-icon]][ibm-db2-doc]
264+
![IBM DB2 icon][ibm-db2-icon]
241265
\
242266
\
243-
[**DB2**][ibm-db2-doc]<br>(*Standard logic app only*)
267+
**DB2**<br>(*Standard logic app only*)
244268
\
245269
\
246270
Connect to IBM DB2 in the cloud or on-premises. Update a row, get a table, and more.
@@ -257,10 +281,10 @@ Connectors for some services provide both built-in connectors and managed connec
257281
Connect to IBM Host File and generate or parse contents.
258282
:::column-end:::
259283
:::column:::
260-
[![IBM MQ icon][ibm-mq-icon]][ibm-mq-doc]
284+
![IBM MQ icon][ibm-mq-icon]
261285
\
262286
\
263-
[**MQ**][ibm-mq-doc]<br>(*Standard logic app only*)
287+
**IBM MQ**<br>(*Standard logic app only*)
264288
\
265289
\
266290
Connect to IBM MQ on-premises or in Azure to send and receive messages.

0 commit comments

Comments
 (0)