Skip to content

Commit f8f5add

Browse files
authored
Merge pull request #189273 from MicrosoftDocs/main
2/21 PM Publish
2 parents 476764d + 52c7bae commit f8f5add

File tree

137 files changed

+1922
-2119
lines changed

Some content is hidden

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

137 files changed

+1922
-2119
lines changed

.openpublishing.redirection.defender-for-iot.json

Lines changed: 11 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,17 @@
3030
"redirect_url": "/azure/defender-for-iot/organizations/getting-started",
3131
"redirect_document_id": false
3232
},
33-
{
33+
{
34+
"source_path_from_root": "/articles/defender-for-iot/organizations/how-to-view-information-provided-in-alerts.md",
35+
"redirect_url": "/azure/defender-for-iot/organizations/how-to-view-alerts",
36+
"redirect_document_id": false
37+
},
38+
{
39+
"source_path_from_root": "/articles/defender-for-iot/organizations/how-to-work-with-alerts-on-your-sensor.md",
40+
"redirect_url": "/azure/defender-for-iot/organizations/concept-key-concepts#analytics-and-self-learning-engines",
41+
"redirect_document_id": false
42+
},
43+
{
3444
"source_path_from_root": "/azure/defender-for-iot/organizations/quickstart-system-prerequisites.md",
3545
"redirect_url": "/azure/defender-for-iot/organizations/getting-started",
3646
"redirect_document_id": false

articles/azure-arc/data/rotate-user-tls-certificate.md

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -118,37 +118,37 @@ DNS:mi1-svc, DNS:mi1-svc.test.svc.cluster.local, DNS:mi1-svc.test.svc
118118
119119
Use the following command by providing Kubernetes secret that you created previously to rotate the certificate:
120120
121-
```console
121+
```azurecli
122122
az sql mi-arc update -n <managed instance name> --k8s-namespace <arc> --use-k8s --service-cert-secret <your-cert-secret>
123123
```
124124

125125
For example:
126126

127-
```console
127+
```azurecli
128128
az sql mi-arc update -n mysqlmi --k8s-namespace <arc> --use-k8s --service-cert-secret mymi-cert-secret
129129
```
130130

131131
Use the following command to rotate the certificate with the PEM formatted certificate public and private keys. The command generates a default service certificate name.
132132

133-
```console
133+
```azurecli
134134
az sql mi-arc update -n <managed instance name> --k8s-namespace arc --use-k8s --cert-public-key-file <path-to-my-cert-public-key> --cert-private-key-file <path-to-my-cert-private-key> --k8s-namespace <your-k8s-namespace>
135135
```
136136

137137
For example:
138138

139-
```console
139+
```azurecli
140140
az sql mi-arc update -n mysqlmi --k8s-namespace arc --use-k8s --cert-public-key-file ./mi1-1-cert --cert-private-key-file ./mi1-1-pvt
141141
```
142142

143143
You can also provide a Kubernetes service cert secret name for `--service-cert-secret` parameter. In this case, it's taken as an updated secret name. The command checks if the secret exists. If not, the command creates a secret name and then rotates the secret in the managed instance.
144144

145-
```console
145+
```azurecli
146146
az sql mi-arc update -n <managed instance name> --k8s-namespace <arc> --use-k8s --cert-public-key-file <path-to-my-cert-public-key> --cert-private-key-file <path-to-my-cert-private-key> --service-cert-secret <path-to-mymi-cert-secret>
147147
```
148148

149149
For example:
150150

151-
```console
151+
```azurecli
152152
az sql mi-arc update -n mysqlmi --k8s-namespace arc --use-k8s --cert-public-key-file ./mi1-1-cert --cert-private-key-file ./mi1-1-pvt --service-cert-secret mi1-12-1-cert-secret
153153
```
154154

articles/azure-arc/data/troubleshooting-get-logs.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -57,8 +57,8 @@ az arcdata dc debug copy-logs --target-folder <desired folder> --exclude-dumps -
5757

5858
For example:
5959

60-
```console
61-
#az arcdata dc debug copy-logs --target-folder C:\temp\logs --exclude-dumps --skip-compress --resource-kind postgresql-12 --resource-name pg1 --use-k8s --k8s-namespace
60+
```azurecli
61+
az arcdata dc debug copy-logs --target-folder C:\temp\logs --exclude-dumps --skip-compress --resource-kind postgresql-12 --resource-name pg1 --use-k8s --k8s-namespace
6262
```
6363

6464
The following folder hierarchy is an example. It's organized by pod name, then container, and then by directory hierarchy within the container.

articles/azure-arc/data/upload-metrics-and-logs-to-azure-monitor.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -136,7 +136,7 @@ az role assignment create --assignee <appId> --role 'Monitoring Metrics Publishe
136136

137137
# [PowerShell](#tab/powershell)
138138

139-
```powershell
139+
```azurecli
140140
az role assignment create --assignee <appId> --role 'Monitoring Metrics Publisher' --scope subscriptions/<SubscriptionID>/resourceGroups/<resourcegroup>
141141
```
142142

articles/azure-arc/data/upload-metrics.md

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -34,14 +34,14 @@ The Arc data services extension managed identity is used for uploading metrics.
3434
### (1) Retrieve managed identity of the Arc data controller extension
3535

3636
# [PowerShell](#tab/powershell)
37-
```powershell
37+
```azurecli
3838
$Env:MSI_OBJECT_ID = (az k8s-extension show --resource-group <resource group> --cluster-name <connectedclustername> --cluster-type connectedClusters --name <name of extension> | convertFrom-json).identity.principalId
3939
#Example
4040
$Env:MSI_OBJECT_ID = (az k8s-extension show --resource-group myresourcegroup --cluster-name myconnectedcluster --cluster-type connectedClusters --name ads-extension | convertFrom-json).identity.principalId
4141
```
4242

4343
# [macOS & Linux](#tab/linux)
44-
```console
44+
```azurecli
4545
export MSI_OBJECT_ID=`az k8s-extension show --resource-group <resource group> --cluster-name <connectedclustername> --cluster-type connectedClusters --name <name of extension> | jq '.identity.principalId' | tr -d \"`
4646
#Example
4747
export MSI_OBJECT_ID=`az k8s-extension show --resource-group myresourcegroup --cluster-name myconnectedcluster --cluster-type connectedClusters --name ads-extension | jq '.identity.principalId' | tr -d \"`
@@ -57,12 +57,12 @@ N/A
5757

5858
Run the below command to assign the **Monitoring Metrics Publisher** role:
5959
# [PowerShell](#tab/powershell)
60-
```powershell
60+
```azurecli
6161
az role assignment create --assignee $Env:MSI_OBJECT_ID --role 'Monitoring Metrics Publisher' --scope "/subscriptions/$SUBSCRIPTION_ID/resourceGroups/$RESOURCE_GROUP_NAME"
6262
```
6363

6464
# [macOS & Linux](#tab/linux)
65-
```console
65+
```azurecli
6666
az role assignment create --assignee ${MSI_OBJECT_ID} --role 'Monitoring Metrics Publisher' --scope "/subscriptions/${subscription}/resourceGroups/${resourceGroup}"
6767
```
6868

articles/azure-arc/kubernetes/agent-upgrade.md

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -20,15 +20,15 @@ Azure Arc-enabled Kubernetes provides its agents with out- of-the-box auto-upgra
2020

2121
The following command connects a cluster to Azure Arc with auto-upgrade **enabled**:
2222

23-
```console
23+
```azurecli
2424
az connectedk8s connect --name AzureArcTest1 --resource-group AzureArcTest
2525
```
2626

2727
With auto-upgrade enabled, the agent polls Azure hourly for availability of a newer version of agents. If the agent finds an available newer version, it triggers a Helm chart upgrade for the Azure Arc agents.
2828

2929
To opt-out of auto-upgrade, specify the `--disable-auto-upgrade` parameter while connecting the cluster to Azure Arc. The following command connects a cluster to Azure Arc with auto-upgrade **disabled**:
3030

31-
```console
31+
```azurecli
3232
az connectedk8s connect --name AzureArcTest1 --resource-group AzureArcTest --disable-auto-upgrade
3333
```
3434

@@ -39,15 +39,15 @@ az connectedk8s connect --name AzureArcTest1 --resource-group AzureArcTest --dis
3939

4040
After you connect a cluster to Azure Arc, you can toggle the auto-upgrade capability with the `az connectedk8s update` command, as shown below:
4141

42-
```console
42+
```azurecli
4343
az connectedk8s update --name AzureArcTest1 --resource-group AzureArcTest --auto-upgrade false
4444
```
4545

4646
## Manually upgrade agents
4747

4848
If you have disabled auto-upgrade for agents, you can manually initiate upgrades for these agents using the `az connectedk8s upgrade` command as shown below:
4949

50-
```console
50+
```azurecli
5151
az connectedk8s upgrade -g AzureArcTest1 -n AzureArcTest --agent-version 1.1.0
5252
```
5353

articles/azure-arc/kubernetes/azure-rbac.md

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -145,7 +145,7 @@ The server application needs the `Microsoft.Authorization/*/read` permissions to
145145
146146
Enable Azure role-based access control (RBAC) on your Azure Arc-enabled Kubernetes cluster by running the following command:
147147
148-
```console
148+
```azurecli
149149
az connectedk8s enable-features -n <clusterName> -g <resourceGroupName> --features azure-rbac --app-id "${SERVER_APP_ID}" --app-secret "${SERVER_APP_SECRET}"
150150
```
151151

@@ -350,13 +350,13 @@ Copy the following JSON object into a file called *custom-role.json*. Replace th
350350

351351
1. Create the role definition by running the following command from the folder where you saved *custom-role.json*:
352352

353-
```bash
353+
```azurecli
354354
az role definition create --role-definition @custom-role.json
355355
```
356356
357357
1. Create a role assignment by using this custom role definition:
358358
359-
```bash
359+
```azurecli
360360
az role assignment create --role "Arc Deployment Viewer" --assignee <AZURE-AD-ENTITY-ID> --scope $ARM_ID/namespaces/<namespace-name>
361361
```
362362
@@ -371,7 +371,7 @@ There are two ways to get the *kubeconfig* file that you need to access the clus
371371
372372
Run the following command to start the proxy process:
373373
374-
```console
374+
```azurecli
375375
az connectedk8s proxy -n <clusterName> -g <resourceGroupName>
376376
```
377377

articles/azure-arc/kubernetes/cluster-connect.md

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -23,13 +23,13 @@ A conceptual overview of this feature is available in [Cluster connect - Azure A
2323

2424
- Install the `connectedk8s` Azure CLI extension of version >= 1.2.0:
2525

26-
```console
26+
```azurecli
2727
az extension add --name connectedk8s
2828
```
2929
3030
If you've already installed the `connectedk8s` extension, update the extension to the latest version:
3131
32-
```console
32+
```azurecli
3333
az extension update --name connectedk8s
3434
```
3535
@@ -46,7 +46,7 @@ A conceptual overview of this feature is available in [Cluster connect - Azure A
4646
4747
- Replace the placeholders and run the below command to set the environment variables used in this document:
4848
49-
```console
49+
```azurecli
5050
CLUSTER_NAME=<cluster-name>
5151
RESOURCE_GROUP=<resource-group-name>
5252
ARM_ID_CLUSTER=$(az connectedk8s show -n $CLUSTER_NAME -g $RESOURCE_GROUP --query id -o tsv)
@@ -57,7 +57,7 @@ A conceptual overview of this feature is available in [Cluster connect - Azure A
5757
5858
You can enable the Cluster Connect on any Azure Arc-enabled Kubernetes cluster by running the following command on a machine where the `kubeconfig` file is pointed to the cluster of concern:
5959
60-
```console
60+
```azurecli
6161
az connectedk8s enable-features --features cluster-connect -n $CLUSTER_NAME -g $RESOURCE_GROUP
6262
```
6363

@@ -67,13 +67,13 @@ az connectedk8s enable-features --features cluster-connect -n $CLUSTER_NAME -g $
6767

6868
- For Azure AD user account:
6969

70-
```console
70+
```azurecli
7171
AAD_ENTITY_OBJECT_ID=$(az ad signed-in-user show --query objectId -o tsv)
7272
```
7373
7474
- For Azure AD application:
7575
76-
```console
76+
```azurecli
7777
AAD_ENTITY_OBJECT_ID=$(az ad sp show --id <id> --query objectId -o tsv)
7878
```
7979
@@ -87,7 +87,7 @@ az connectedk8s enable-features --features cluster-connect -n $CLUSTER_NAME -g $
8787
8888
- If you are using Azure RBAC for authorization checks on the cluster, you can create an Azure role assignment mapped to the Azure AD entity. Example:
8989
90-
```console
90+
```azurecli
9191
az role assignment create --role "Azure Arc Kubernetes Viewer" --assignee $AAD_ENTITY_OBJECT_ID --scope $ARM_ID_CLUSTER
9292
```
9393
@@ -121,13 +121,13 @@ az connectedk8s enable-features --features cluster-connect -n $CLUSTER_NAME -g $
121121
122122
- If using Azure Active Directory authentication option, after logging into Azure CLI using the Azure AD entity of interest, get the Cluster Connect `kubeconfig` needed to communicate with the cluster from anywhere (from even outside the firewall surrounding the cluster):
123123
124-
```console
124+
```azurecli
125125
az connectedk8s proxy -n $CLUSTER_NAME -g $RESOURCE_GROUP
126126
```
127127
128128
- If using the service account authentication option, get the Cluster Connect `kubeconfig` needed to communicate with the cluster from anywhere:
129129
130-
```console
130+
```azurecli
131131
az connectedk8s proxy -n $CLUSTER_NAME -g $RESOURCE_GROUP --token $TOKEN
132132
```
133133

articles/azure-arc/kubernetes/faq.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ The system assigned managed identity associated with your Azure Arc-enabled Kube
3636

3737
To check when the certificate is about to expire for any given cluster, run the following command:
3838

39-
```console
39+
```azurecli
4040
az connectedk8s show -n <name> -g <resource-group>
4141
```
4242

@@ -46,13 +46,13 @@ If the value of `managedIdentityCertificateExpirationTime` indicates a timestamp
4646

4747
1. Delete Azure Arc-enabled Kubernetes resource and agents on the cluster.
4848

49-
```console
49+
```azurecli
5050
az connectedk8s delete -n <name> -g <resource-group>
5151
```
5252
5353
1. Recreate the Azure Arc-enabled Kubernetes resource by deploying agents on the cluster.
5454
55-
```console
55+
```azurecli
5656
az connectedk8s connect -n <name> -g <resource-group>
5757
```
5858

articles/azure-arc/kubernetes/quickstart-connect-cluster.md

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ For a conceptual look at connecting clusters to Azure Arc, see [Azure Arc-enable
2525

2626
* Install the **connectedk8s** Azure CLI extension of version >= 1.2.0:
2727

28-
```
28+
```azurecli
2929
az extension add --name connectedk8s
3030
```
3131

@@ -39,7 +39,7 @@ For a conceptual look at connecting clusters to Azure Arc, see [Azure Arc-enable
3939
* Self-managed Kubernetes cluster using [Cluster API](https://cluster-api.sigs.k8s.io/user/quick-start.html)
4040
* If you want to connect a OpenShift cluster to Azure Arc, execute the following command one time on your cluster before running `az connectedk8s connect`:
4141

42-
```
42+
```bash
4343
oc adm policy add-scc-to-user privileged system:serviceaccount:azure-arc:azure-arc-kube-aad-proxy-sa
4444
```
4545

@@ -76,7 +76,7 @@ For a conceptual look at connecting clusters to Azure Arc, see [Azure Arc-enable
7676
* Self-managed Kubernetes cluster using [Cluster API](https://cluster-api.sigs.k8s.io/user/quick-start.html)
7777
* If you want to connect a OpenShift cluster to Azure Arc, you need to execute the following command just once on your cluster before running `New-AzConnectedKubernetes`:
7878
79-
```
79+
```bash
8080
oc adm policy add-scc-to-user privileged system:serviceaccount:azure-arc:azure-arc-kube-aad-proxy-sa
8181
```
8282
@@ -162,7 +162,7 @@ az group create --name AzureArcTest --location EastUS --output table
162162

163163
Output:
164164

165-
```
165+
```output
166166
Location Name
167167
---------- ------------
168168
eastus AzureArcTest
@@ -176,7 +176,7 @@ New-AzResourceGroup -Name AzureArcTest -Location EastUS
176176

177177
Output:
178178

179-
```
179+
```output
180180
ResourceGroupName : AzureArcTest
181181
Location : eastus
182182
ProvisioningState : Succeeded
@@ -201,7 +201,7 @@ az connectedk8s connect --name AzureArcTest1 --resource-group AzureArcTest
201201

202202
Output:
203203

204-
```
204+
```output
205205
Helm release deployment succeeded
206206
207207
{
@@ -247,7 +247,7 @@ New-AzConnectedKubernetes -ClusterName AzureArcTest1 -ResourceGroupName AzureArc
247247

248248
Output:
249249

250-
```
250+
```output
251251
Location Name Type
252252
-------- ---- ----
253253
eastus AzureArcTest1 microsoft.kubernetes/connectedclusters
@@ -311,7 +311,7 @@ az connectedk8s list --resource-group AzureArcTest --output table
311311

312312
Output:
313313

314-
```
314+
```output
315315
Name Location ResourceGroup
316316
------------- ---------- ---------------
317317
AzureArcTest1 eastus AzureArcTest
@@ -325,7 +325,7 @@ Get-AzConnectedKubernetes -ResourceGroupName AzureArcTest
325325

326326
Output:
327327

328-
```
328+
```output
329329
Location Name Type
330330
-------- ---- ----
331331
eastus AzureArcTest1 microsoft.kubernetes/connectedclusters
@@ -342,15 +342,15 @@ Azure Arc-enabled Kubernetes deploys a few agents into the `azure-arc` namespace
342342

343343
1. View these deployments and pods using:
344344

345-
```
345+
```bash
346346
kubectl get deployments,pods -n azure-arc
347347
```
348348

349349
1. Verify all pods are in a `Running` state.
350350

351351
Output:
352352

353-
```
353+
```output
354354
NAME READY UP-TO-DATE AVAILABLE AGE
355355
deployment.apps/cluster-metadata-operator 1/1 1 1 13d
356356
deployment.apps/clusterconnect-agent 1/1 1 1 13d

0 commit comments

Comments
 (0)