Skip to content

Commit f2cb2e3

Browse files
authored
Merge pull request #207904 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 bf686db + 24e2d5a commit f2cb2e3

19 files changed

+63
-49
lines changed

articles/active-directory/managed-identities-azure-resources/managed-identities-status.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -50,6 +50,7 @@ The following Azure services support managed identities for Azure resources:
5050
| Azure Import/Export | [Use customer-managed keys in Azure Key Vault for Import/Export service](../../import-export/storage-import-export-encryption-key-portal.md)
5151
| Azure IoT Hub | [IoT Hub support for virtual networks with Private Link and Managed Identity](../../iot-hub/virtual-network-support.md) |
5252
| Azure Kubernetes Service (AKS) | [Use managed identities in Azure Kubernetes Service](../../aks/use-managed-identity.md) |
53+
| Azure Load Testing | [Use managed identities for Azure Load Testing](../../load-testing/how-to-use-a-managed-identity.md) |
5354
| Azure Logic Apps | [Authenticate access to Azure resources using managed identities in Azure Logic Apps](../../logic-apps/create-managed-service-identity.md) |
5455
| Azure Log Analytics cluster | [Azure Monitor customer-managed key](../../azure-monitor/logs/customer-managed-keys.md)
5556
| Azure Machine Learning Services | [Use Managed identities with Azure Machine Learning](../../machine-learning/how-to-use-managed-identities.md?tabs=python) |

articles/api-management/api-management-howto-configure-custom-domain-gateway.md

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -53,6 +53,8 @@ Add a custom domain certificate (.PFX) file to your API Management instance, or
5353
> This setting is shared by all domain names configured for the gateway.
5454
9. Select **Add** to assign the custom domain name to the selected self-hosted gateway.
5555

56+
> [!NOTE]
57+
> If clients connecting to the self-hosted gateway using the custom domain expect to be presented with all intermediate certificates in the chain, you must upload individual CA certificates to your API Management Service and associate them with the self-hosted gateway. For instructions on how to achieve this, see [Create custom CA for self-hosted gateway](api-management-howto-ca-certificates.md#create-custom-ca-for-self-hosted-gateway) .
5658
## Next steps
5759

5860
[Upgrade and scale your service](upgrade-and-scale.md)

articles/availability-zones/migrate-app-service.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -85,7 +85,7 @@ You can create an App Service with availability zones using the [Azure CLI](/cli
8585
To enable availability zones using the Azure CLI, include the `--zone-redundant` parameter when you create your App Service plan. You can also include the `--number-of-workers` parameter to specify capacity. If you don't specify a capacity, the platform defaults to three. Capacity should be set based on the workload requirement, but no less than three. A good rule of thumb to choose capacity is to ensure sufficient instances for the application such that losing one zone of instances leaves sufficient capacity to handle expected load.
8686

8787
```azurecli
88-
az appservice plan create --resource-group MyResourceGroup --name MyPlan --zone-redundant --number-of-workers 6
88+
az appservice plan create --resource-group MyResourceGroup --name MyPlan --sku P1v2 --zone-redundant --number-of-workers 6
8989
```
9090

9191
> [!TIP]

articles/azure-functions/durable/durable-functions-monitor-python.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -106,7 +106,7 @@ POST https://{host}/orchestrators/E3_Monitor
106106
Content-Length: 77
107107
Content-Type: application/json
108108
109-
{ "repo": "<your github handle>/<a new github repo under your user>", "phone": "+1425XXXXXXX" }
109+
{ "repo": "<your GitHub handle>/<a new GitHub repo under your user>", "phone": "+1425XXXXXXX" }
110110
```
111111

112112
For example, if your GitHub username is `foo` and your repository is `bar` then your value for `"repo"` should be `"foo/bar"`.

articles/azure-functions/functions-bindings-storage-blob-input.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,10 +22,10 @@ For information on setup and configuration details, see the [overview](./functio
2222

2323
# [In-process](#tab/in-process)
2424

25-
```csharp
26-
2725
The following example is a [C# function](functions-dotnet-class-library.md) that uses a queue trigger and an input blob binding. The queue message contains the name of the blob, and the function logs the size of the blob.
2826

27+
```csharp
28+
2929
[FunctionName("BlobInput")]
3030
public static void Run(
3131
[QueueTrigger("myqueue-items")] string myQueueItem,

articles/azure-signalr/concept-service-mode.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -32,13 +32,13 @@ So if you have a SignalR application and want to integrate with SignalR service,
3232
In default mode, there will be websocket connections between hub server and SignalR service (called server connections). These connections are used to transfer messages between server and client. When a new client is connected, SignalR service will route the client to one hub server (assume you have more than one server) through existing server connections. Then the client connection will stick to the same hub server during its lifetime. When client sends messages, they always go to the same hub server. With this behavior, you can safely maintain some states for individual connections on your hub server. For example, if you want to stream something between server and client, you don't need to consider the case that data packets go to different servers.
3333

3434
> [!IMPORTANT]
35-
> This also means in default mode client cannot connect without server being connected first. If all your hub servers are disconnected due to network interruption or server reboot, your client connect will get an error telling you no server is connected. So it's your responsibility to make sure at any time there is at least one hub server connected to SignalR service (for example, have multiple hub servers and make sure they won't go offline at the same time for things like maintenance).
35+
> This also means in default mode a client cannot connect without server being connected first. If all your hub servers are disconnected due to network interruption or server reboot, your client connections will get an error telling you no server is connected. So it's your responsibility to make sure at any time there is at least one hub server connected to SignalR service (for example, have multiple hub servers and make sure they won't go offline at the same time for things like maintenance).
3636
3737
This routing model also means when a hub server goes offline, the connections routed that server will be dropped. So you should expect connection drop when your hub server is offline for maintenance and handle reconnect properly so that it won't have negative impact to your application.
3838

3939
## Serverless mode
4040

41-
Serverless mode, as its name implies, is a mode that you cannot have any hub server. Comparing to default mode, in this mode client doesn't require hub server to get connected. All connections are connected to service in a "serverless" mode and service is responsible for maintaining client connections like handling client pings (in default mode this is handled by hub servers).
41+
In Serverless mode, you don't have a hub server. Unlike default mode, the client doesn't require a hub server to be running. All connections are connected in a "serverless" mode and the Azure SignalR service is responsible for maintaining client connections like handling client pings (in default mode this is handled by hub servers).
4242

4343
Also there is no server connection in this mode (if you try to use service SDK to establish server connection, you will get an error). Therefore there is also no connection routing and server-client stickiness (as described in the default mode section). But you can still have server-side application to push messages to clients. This can be done in two ways, use [REST APIs](https://github.com/Azure/azure-signalr/blob/dev/docs/rest-api.md) for one-time send, or through a websocket connection so that you can send multiple messages more efficiently (note this websocket connection is different than server connection).
4444

@@ -85,4 +85,4 @@ To learn more about how to use default and serverless mode, read the following a
8585

8686
* [Azure SignalR Service internals](signalr-concept-internals.md)
8787

88-
* [Azure Functions development and configuration with Azure SignalR Service](signalr-concept-serverless-development-config.md)
88+
* [Azure Functions development and configuration with Azure SignalR Service](signalr-concept-serverless-development-config.md)

articles/cognitive-services/language-service/summarization/includes/quickstarts/nodejs-sdk.md

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -127,6 +127,11 @@ summarization_example(textAnalyticsClient).catch((err) => {
127127
> [!div class="nextstepaction"]
128128
> <a href="https://microsoft.qualtrics.com/jfe/form/SV_0Cl5zkG3CnDjq6O?PLanguage=JAVASCRIPT&Pillar=Language&Product=Summarization&Page=quickstart&Section=Code-example" target="_target">I ran into an issue</a>
129129
130+
### Command
131+
132+
```console
133+
node index.js
134+
```
130135
### Output
131136

132137
```console

articles/defender-for-cloud/defender-for-sql-usage.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ ms.date: 07/28/2022
99

1010
# Enable Microsoft Defender for SQL servers on machines
1111

12-
This Microsoft Defender plan detects anomalous activities indicating unusual and potentially harmful attempts to access or exploit databases.
12+
This Microsoft Defender plan detects anomalous activities indicating unusual and potentially harmful attempts to access or exploit databases on the SQL server.
1313

1414
You'll see alerts when there are suspicious database activities, potential vulnerabilities, or SQL injection attacks, and anomalous database access and query patterns.
1515

@@ -19,7 +19,7 @@ Microsoft Defender for SQL servers on machines extends the protections for your
1919

2020
- On-premises SQL servers:
2121

22-
- [Azure Arc-enabled SQL Server (preview)](/sql/sql-server/azure-arc/overview)
22+
- [Azure Arc-enabled SQL Server](/sql/sql-server/azure-arc/overview)
2323

2424
- [SQL Server running on Windows machines without Azure Arc](../azure-monitor/agents/agent-windows.md)
2525

articles/defender-for-cloud/quickstart-enable-database-protections.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,9 +9,9 @@ ms.date: 07/28/2022
99

1010
# Enable Microsoft Defender for Cloud database plans
1111

12-
This article explains how to enable Microsoft Defender for Cloud's database protections for the most common database types, Azure, hybrid, and multicloud environments.
12+
This article explains how to enable Microsoft Defender for Cloud's database protections for the most common database types, within Azure, hybrid, and multicloud environments.
1313

14-
Defender for Cloud database protections lets you protect your entire database estate with attack detection and threat response for the most popular database types in Azure. Defender for Cloud provides protection for the database engines and for data types, according to their attack surface and security risks.
14+
Defender for Cloud database protections let you protect your entire database estate with attack detection and threat response for the most popular database types in Azure. Defender for Cloud provides protection for the database engines and for data types, according to their attack surface and security risks.
1515

1616
Database protection includes:
1717

articles/digital-twins/concepts-data-explorer-plugin.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -82,7 +82,7 @@ The simplest way to ingest IoT data from Azure Digital Twins into Azure Data Exp
8282
8383
### Direct ingestion
8484
85-
You can also opt to [ingest IoT data directly into your Azure Data Explorer cluster from IoT Hub](/azure/data-explorer/ingest-data-iot-hub), or from other sources. Then, the Azure Digital Twins graph will be used to contextualize the time series data using joint Azure Digital Twins/Azure Data Explorer queries. This option is a good choice for direct-ingestion workloads. For more information about this process, continue through the rest of this section.
85+
You can also opt to [ingest IoT data directly into your Azure Data Explorer cluster from IoT Hub](/azure/data-explorer/ingest-data-iot-hub), or from other sources. Then, the Azure Digital Twins graph will be used to contextualize the time series data using joint Azure Digital Twins/Azure Data Explorer queries. This option is a good choice for direct-ingestion workloads—however, you won't be able to leverage Azure Digital Twins' event-based architecture to update other twins, trigger downstream services, or emit notifications when twins change state. For more information about this process, continue through the rest of this section.
8686
8787
#### Mapping data across Azure Data Explorer and Azure Digital Twins
8888

0 commit comments

Comments
 (0)