Skip to content

Commit 315d7d9

Browse files
authored
Merge branch 'MicrosoftDocs:main' into main
2 parents 0e19949 + 9765434 commit 315d7d9

12 files changed

+252
-281
lines changed

articles/aks/istio-deploy-addon.md

Lines changed: 0 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -44,26 +44,6 @@ Run the following command to update to the latest version of the extension relea
4444
az extension update --name aks-preview
4545
```
4646

47-
### Register the _AzureServiceMeshPreview_ feature flag
48-
49-
Register the `AzureServiceMeshPreview` feature flag by using the [az feature register][az-feature-register] command:
50-
51-
```azurecli-interactive
52-
az feature register --namespace "Microsoft.ContainerService" --name "AzureServiceMeshPreview"
53-
```
54-
55-
It takes a few minutes for the feature to register. Verify the registration status by using the [az feature show][az-feature-show] command:
56-
57-
```azurecli-interactive
58-
az feature show --namespace "Microsoft.ContainerService" --name "AzureServiceMeshPreview"
59-
```
60-
61-
When the status reflects *Registered*, refresh the registration of the *Microsoft.ContainerService* resource provider by using the [az provider register][az-provider-register] command:
62-
63-
```azurecli-interactive
64-
az provider register --namespace Microsoft.ContainerService
65-
```
66-
6747
## Install Istio add-on at the time of cluster creation
6848

6949
To install the Istio add-on when creating the cluster, use the `--enable-azure-service-mesh` or`--enable-asm` parameter.

articles/aks/istio-plugin-ca.md

Lines changed: 0 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -38,26 +38,6 @@ Run the following command to update to the latest version of the extension relea
3838
az extension update --name aks-preview
3939
```
4040

41-
### Register the _AzureServiceMeshPreview_ feature flag
42-
43-
Register the `AzureServiceMeshPreview` feature flag by using the [az feature register][az-feature-register] command:
44-
45-
```azurecli-interactive
46-
az feature register --namespace "Microsoft.ContainerService" --name "AzureServiceMeshPreview"
47-
```
48-
49-
It takes a few minutes for the feature to register. Verify the registration status by using the [az feature show][az-feature-show] command:
50-
51-
```azurecli-interactive
52-
az feature show --namespace "Microsoft.ContainerService" --name "AzureServiceMeshPreview"
53-
```
54-
55-
When the status reflects *Registered*, refresh the registration of the *Microsoft.ContainerService* resource provider by using the [az provider register][az-provider-register] command:
56-
57-
```azurecli-interactive
58-
az provider register --namespace Microsoft.ContainerService
59-
```
60-
6141
### Set up Azure Key Vault
6242

6343
1. You need an [Azure Key Vault resource][akv-quickstart] to supply the certificate and key inputs to the Istio add-on.

articles/azure-monitor/app/convert-classic-resource.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -416,7 +416,7 @@ The structure of a Log Analytics workspace is described in [Log Analytics worksp
416416
| traces | AppTraces | Detailed logs (traces) emitted through application code/logging frameworks recorded via `TrackTrace()`. |
417417

418418
> [!CAUTION]
419-
> Don't take a production dependency on the Log Analytics tables until you see new telemetry records show up directly in Log Analytics. It might take up to 24 hours after the migration process started for records to appear.
419+
> Don't take a production dependency on Log Analytics tables until you see new telemetry records show up directly in Log Analytics. Initially, after you trigger the migration, new telemetry will continue to be ingested into the Classic Application Insights tables. The switch to writing new telemetry records directly into Log Analytics tables may take up to 24 hours. During this transition period, there is no interruption or loss of data, and telemetry will not be written to both systems simultaneously. Once the migration operation is complete, all new telemetry will only be recorded in the Log Analytics tables.
420420
421421
### Table schemas
422422

articles/data-factory/how-to-send-notifications-to-teams.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -134,7 +134,7 @@ Before you can send notifications to Teams from your pipelines, you must create
134134
},
135135
{
136136
"name": "Pipline Name:",
137-
"value": "@{pipeline().parameters.name}"
137+
"value": "@{pipeline().Pipeline}"
138138
},
139139
{
140140
"name": "Pipeline Status:",

articles/iot-operations/troubleshoot/known-issues.md

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,15 @@ This article contains known issues for Azure IoT Operations Preview.
2121

2222
- Uninstalling K3s: When you uninstall k3s on Ubuntu by using the `/usr/local/bin/k3s-uninstall.sh` script, you might encounter an issue where the script gets stuck on unmounting the NFS pod. A workaround for this issue is to run the following command before you run the uninstall script: `sudo systemctl stop k3s`.
2323

24+
## Azure IoT Data Processor Preview
25+
26+
If the data processor extension fails to uninstall, run the following commands and try the uninstall operation again:
27+
28+
```bash
29+
kubectl delete pod aio-dp-reader-worker-0 --grace-period=0 --force -n azure-iot-operations
30+
kubectl delete pod aio-dp-reader-worker-0 --grace-period=0 --force -n azure-iot-operations
31+
```
32+
2433
## Azure IoT MQ (preview)
2534

2635
- You can only access the default deployment by using the cluster IP, TLS, and a service account token. Clients outside the cluster need extra configuration before they can connect.

articles/payment-hsm/create-payment-hsm.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -203,10 +203,10 @@ In the output, host 1 and host 2 are listed, as well as a management interface:
203203
... myPaymentHSM_HSMMgmtNic Standard True Succeeded myResourceGroup ...
204204
```
205205

206-
To see the newly created network interfaces, use the [az network nic show](/cli/azure/network/nic#az-network-nic-show) command, providing the resource group and name of the network interface:
206+
To see the details of a newly created network interface, use the [az network nic show](/cli/azure/network/nic#az-network-nic-show) command, providing the resource group and name of the network interface:
207207

208208
```azurecli-interactive
209-
az network nic show -g myresourcegroup -n myPaymentHSM_HSMHost1Nic
209+
az network nic show -g myresourcegroup -n myPaymentHSM_HSMHost1Nic
210210
```
211211

212212
The output contains this line:
128 KB
Loading
4.27 KB
Loading

articles/payment-hsm/view-payment-hsms.md

Lines changed: 13 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
---
2-
title: View your Azure Payment HSMs
3-
description: View your Azure Payment HSMs
2+
title: View your Azure Payment HSMs.
3+
description: View your Azure Payment HSMs.
44
services: payment-hsm
55
ms.service: payment-hsm
66
author: msmbaldwin
@@ -48,16 +48,22 @@ Get-AzDedicatedHsm -Name "myPaymentHSM" -ResourceGroup "myResourceGroup"
4848

4949
# [Azure portal](#tab/azure-portal)
5050

51-
5251
To view your payment HSMs in the Azure portal:
5352

54-
1. Sign in to the [Azure portal](https://portal.azure.com)
53+
1. Sign in to the [Azure portal](https://portal.azure.com).
5554
1. Select "Resource groups".
5655
1. Select your resource group (for example, "myResourceGroup").
57-
1. You will see your network interfaces, but not your payment HSMs. Select the "Show hidden types" box.
58-
:::image type="content" source="./media/portal-view-payment-hsms.png" lightbox="./media/portal-view-payment-hsms.png" alt-text="Screenshot of the Azure portal displaying all payment HSMs.":::
56+
1. Your network interfaces will appear. To view your payment HSMs as well, select the "Show hidden types" box.
57+
:::image type="content" source="./media/portal-view-payment-hsms.png" lightbox="./media/portal-view-payment-hsms.png" alt-text="Screenshot of the Azure portal displaying all payment HSMs.":::
5958
1. You can select one of your payment HSMs to see its properties.
60-
:::image type="content" source="./media/portal-view-payment-hsm.png" lightbox="./media/portal-view-payment-hsm.png" alt-text="Screenshot of the Azure portal displaying a specific payment HSM and its properties.":::
59+
:::image type="content" source="./media/portal-view-payment-hsm.png" lightbox="./media/portal-view-payment-hsm.png" alt-text="Screenshot of the Azure portal displaying a specific payment HSM and its properties.":::
60+
61+
To view the IP addresses of the host and management network interfaces, see the "connected devices" associated with your Virtual Network:
62+
63+
1. From the [Azure portal](https://portal.azure.com), select "Virtual networks".
64+
1. Select your virtual network (for example, "myVNet").
65+
1. From the left-hand sidebar, select "Connected devices".
66+
:::image type="content" source="./media/portal-view-network-interfaces.png" lightbox="./media/portal-view-network-interfaces.png" alt-text="Screenshot of the Azure portal displaying the network interfaces associated with a virtual network.":::
6167

6268
---
6369

0 commit comments

Comments
 (0)