Skip to content

Commit 5257206

Browse files
authored
Merge pull request #273089 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 58e779f + 9814ea9 commit 5257206

File tree

10 files changed

+29
-15
lines changed

10 files changed

+29
-15
lines changed

articles/aks/configure-kubenet.md

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -115,7 +115,8 @@ For more information to help you decide which network model to use, see [Compare
115115
--name myAKSVnet \
116116
--address-prefixes 192.168.0.0/16 \
117117
--subnet-name myAKSSubnet \
118-
--subnet-prefix 192.168.1.0/24
118+
--subnet-prefix 192.168.1.0/24 \
119+
--location eastus
119120
```
120121
121122
3. Get the subnet resource ID using the [`az network vnet subnet show`][az-network-vnet-subnet-show] command and store it as a variable named `SUBNET_ID` for later use.

articles/aks/csi-secrets-store-identity-access.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -288,13 +288,13 @@ After the pod starts, the mounted content at the volume path specified in your d
288288
1. Show secrets held in the secrets store using the following command.
289289
290290
```bash
291-
kubectl exec busybox-secrets-store-inline -- ls /mnt/secrets-store/
291+
kubectl exec busybox-secrets-store-inline-user-msi -- ls /mnt/secrets-store/
292292
```
293293
294294
2. Display a secret in the store using the following command. This example command shows the test secret `ExampleSecret`.
295295
296296
```bash
297-
kubectl exec busybox-secrets-store-inline -- cat /mnt/secrets-store/ExampleSecret
297+
kubectl exec busybox-secrets-store-inline-user-msi -- cat /mnt/secrets-store/ExampleSecret
298298
```
299299
300300
## Obtain certificates and keys

articles/aks/use-trusted-launch.md

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -142,7 +142,10 @@ Update a node pool with trusted launch enabled using the [az aks nodepool update
142142
* **--enable-vtpm**: Enables vTPM and performs attestation by measuring the entire boot chain of your VM.
143143

144144
> [!NOTE]
145-
> The existing nodepool must be using a trusted launch image in order to enable on an existing node pool. By default, creating a node pool with a TL-compatible configuration and the feature flag registered results in a trusted launch image. Without specifying `--enable-vtpm` or `--enable-secure-boot` parameters, they are disabled by default and you can enable later using `az aks nodepool update` command.
145+
> The existing nodepool must be using a trusted launch image in order to enable on an existing node pool. Hence, for the nodepools created before registering the `TrustedLaunchPreview` feature, you cannot update them with trusted launch enabled.
146+
>
147+
> By default, creating a node pool with a TL-compatible configuration and the feature flag registered results in a trusted launch image. Without specifying `--enable-vtpm` or `--enable-secure-boot` parameters, they are disabled by default and you can enable later using `az aks nodepool update` command.
148+
146149

147150
> [!NOTE]
148151
> Secure Boot requires signed boot loaders, OS kernels, and drivers. If after enabling Secure Boot your nodes don't start, you can verify which boot components are responsible for Secure Boot failures within an Azure Linux Virtual Machine. See [verify Secure Boot failures][verify-secure-boot-failures].

articles/cloud-services-extended-support/deploy-sdk.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -295,7 +295,7 @@ If you are using a Static IP you need to reference it as a Reserved IP in Servic
295295
{
296296
Publisher = "Microsoft.Windows.Azure.Extensions",
297297
Type = "RDP",
298-
TypeHandlerVersion = "1.2.1",,
298+
TypeHandlerVersion = "1.2.1",
299299
AutoUpgradeMinorVersion = true,
300300
Settings = rdpExtensionPublicConfig,
301301
ProtectedSettings = rdpExtensionPrivateConfig,

articles/container-instances/container-instances-managed-identity.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -327,7 +327,7 @@ On a container group, you can enable both a system-assigned identity and one or
327327

328328
```json
329329
"identity": {
330-
"type": "System Assigned, UserAssigned",
330+
"type": "SystemAssigned, UserAssigned",
331331
"userAssignedIdentities": {
332332
"myResourceID1": {
333333
}

articles/defender-for-iot/device-builders/how-to-send-security-messages.md

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@ title: Send Defender for IoT device security messages
33
description: Learn how to send your security messages using Defender for IoT.
44
ms.topic: how-to
55
ms.date: 03/28/2022
6-
ms.custom:
76
---
87

98
# Send security messages SDK
@@ -76,7 +75,7 @@ Once set as a security message and sent, this message will be processed by Defen
7675

7776
## Send security messages
7877

79-
Send security messages *without* using Defender for IoT agent, by using the [Azure IoT C device SDK](https://github.com/Azure/azure-iot-sdk-c/tree/public-preview), [Azure IoT C# device SDK](https://github.com/Azure/azure-iot-sdk-csharp/tree/preview), , [Azure IoT Node.js SDK](https://github.com/Azure/azure-iot-sdk-node), [Azure IoT Python SDK](https://github.com/Azure/azure-iot-sdk-python), or [Azure IoT Java SDK](https://github.com/Azure/azure-iot-sdk-java).
78+
Send security messages *without* using Defender for IoT agent, by using the [Azure IoT C device SDK](https://github.com/Azure/azure-iot-sdk-c/tree/public-preview), [Azure IoT C# device SDK](https://github.com/Azure/azure-iot-sdk-csharp/tree/preview), [Azure IoT Node.js SDK](https://github.com/Azure/azure-iot-sdk-node), [Azure IoT Python SDK](https://github.com/Azure/azure-iot-sdk-python), or [Azure IoT Java SDK](https://github.com/Azure/azure-iot-sdk-java).
8079

8180
To send the device data from your devices for processing by Defender for IoT, use one of the following APIs to mark messages for correct routing to Defender for IoT processing pipeline.
8281

articles/reliability/reliability-traffic-manager.md

Lines changed: 14 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -138,10 +138,21 @@ This scenario is ideal for the use of Azure Traffic Manager that has inbuilt pro
138138

139139
1. Set up health check and failover configuration
140140

141-
In this step, you set the DNS TTL to 10 seconds, which is honored by most internet-facing recursive resolvers. This configuration means that no DNS resolver will cache the information for more than 10 seconds. For the endpoint monitor settings, the path is current set at / or root, but you can customize the endpoint settings to evaluate a path, for example, prod.contoso.com/index. The example below shows the **https** as the probing protocol. However, you can choose **http** or **tcp** as well. The choice of protocol depends upon the end application. The probing interval is set to 10 seconds, which enables fast probing, and the retry is set to 3. As a result, Traffic Manager will fail over to the second endpoint if three consecutive intervals register a failure. The following formula defines the total time for an automated failover:
142-
Time for failover = TTL + Retry * Probing interval
141+
In this step, you set the DNS TTL to 10 seconds, which is honored by most internet-facing recursive resolvers. This configuration means that no DNS resolver will cache the information for more than 10 seconds.
142+
143+
For the endpoint monitor settings, the path is current set at / or root, but you can customize the endpoint settings to evaluate a path, for example, prod.contoso.com/index.
144+
145+
The example below shows the **https** as the probing protocol. However, you can choose **http** or **tcp** as well. The choice of protocol depends upon the end application. The probing interval is set to 10 seconds, which enables fast probing, and the retry is set to 3. As a result, Traffic Manager will fail over to the second endpoint if three consecutive intervals register a failure.
146+
147+
The following formula defines the total time for an automated failover:
148+
149+
`Time for failover = TTL + Retry * Probing interval`
150+
143151
And in this case, the value is 10 + 3 * 10 = 40 seconds (Max).
144-
If the Retry is set to 1 and TTL is set to 10 secs, then the time for failover 10 + 1 * 10 = 20 seconds. Set the Retry to a value greater than **1** to eliminate chances of failovers due to false positives or any minor network blips.
152+
153+
If the Retry is set to 1 and TTL is set to 10 secs, then the time for failover 10 + 1 * 10 = 20 seconds.
154+
155+
Set the Retry to a value greater than **1** to eliminate chances of failovers due to false positives or any minor network blips.
145156

146157

147158
![Screenshot of setting up health check.](../networking/media/disaster-recovery-dns-traffic-manager/set-up-health-check.png)

articles/search/search-pagination-page-layout.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -280,12 +280,12 @@ Within a highlighted field, formatting is applied to whole terms. For example, o
280280

281281
### Phrase search highlighting
282282

283-
Whole-term formatting applies even on a phrase search, where multiple terms are enclosed in double quotation marks. The following example is the same query, except that "divine secrets" is submitted as a quotation-enclosed phrase (some REST clients require that you escape the interior quotation marks with a backslash `\"`):
283+
Whole-term formatting applies even on a phrase search, where multiple terms are enclosed in double quotation marks. The following example is the same query, except that "divine secrets" is submitted as a quotation-enclosed phrase (some REST clients require that you escape the interior quotation marks with a backslash `\"`):
284284

285285
```http
286286
POST /indexes/good-books/docs/search?api-version=2020-06-30
287287
{
288-
"search": "\"divine secrets\"",,
288+
"search": "\"divine secrets\"",
289289
"select": "title,original_title",
290290
"highlight": "title",
291291
"highlightPreTag": "<b>",

articles/search/vector-search-how-to-create-index.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -628,7 +628,7 @@ api-key: {{admin-api-key}}
628628
. . .
629629
],
630630
"contentVector": [
631-
-0.02780858241021633,,
631+
-0.02780858241021633,
632632
. . .
633633
],
634634
"@search.action": "upload"

articles/time-series-insights/how-to-tsi-gen2-migration.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -188,7 +188,7 @@ You can use the ‘Ingestion (preview)’ section with the below settings to mon
188188

189189
:::image type="content" source="media/gen2-migration/adx-ingest-monitoring-results.png" alt-text="Screenshot of the Azure Data Explorer ingestion for Monitoring results" lightbox="media/gen2-migration/adx-ingest-lightingest-command.png":::
190190

191-
You’ll know that the ingestion is complete once you see the metrics go to 0 for your table. If you want to see more details,, you can use Log Analytics. On the Azure Data Explorer cluster section select on the ‘Log’ tab:
191+
You’ll know that the ingestion is complete once you see the metrics go to 0 for your table. If you want to see more details, you can use Log Analytics. On the Azure Data Explorer cluster section select on the ‘Log’ tab:
192192

193193
:::image type="content" source="media/gen2-migration/adx-ingest-monitoring-logs.png" alt-text="Screenshot of the Azure Data Explorer ingestion for Monitoring logs" lightbox="media/gen2-migration/adx-ingest-monitoring-logs.png":::
194194

0 commit comments

Comments
 (0)