Skip to content

Commit 6bfa7f0

Browse files
committed
Merge branch 'main' of https://github.com/MicrosoftDocs/azure-docs-pr into rolyon-mto-sync-graph-troubleshooting
2 parents 9b65dbd + cc5fadd commit 6bfa7f0

19 files changed

+238
-2696
lines changed

articles/aks/learn/tutorial-kubernetes-workload-identity.md

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -67,13 +67,13 @@ The following output example resembles successful creation of the resource group
6767

6868
To install the aks-preview extension, run the following command:
6969

70-
```azurecli
70+
```azurecli-interactive
7171
az extension add --name aks-preview
7272
```
7373

7474
Run the following command to update to the latest version of the extension released:
7575

76-
```azurecli
76+
```azurecli-interactive
7777
az extension update --name aks-preview
7878
```
7979

@@ -112,7 +112,7 @@ After a few minutes, the command completes and returns JSON-formatted informatio
112112
113113
To get the OIDC Issuer URL and save it to an environmental variable, run the following command. Replace the default value for the arguments `-n`, which is the name of the cluster and `-g`, the resource group name:
114114

115-
```bash
115+
```azurecli-interactive
116116
export AKS_OIDC_ISSUER="$(az aks show -n myAKSCluster -g myResourceGroup --query "oidcIssuerProfile.issuerUrl" -otsv)"
117117
```
118118

@@ -146,7 +146,7 @@ export FICID="fic-test-fic-name"
146146

147147
Use the Azure CLI [az keyvault create][az-keyvault-create] command to create a Key Vault in the resource group created earlier.
148148

149-
```azurecli
149+
```azurecli-interactive
150150
az keyvault create --resource-group "${RESOURCE_GROUP}" --location "${LOCATION}" --name "${KEYVAULT_NAME}"
151151
```
152152

@@ -159,7 +159,7 @@ At this point, your Azure account is the only one authorized to perform any oper
159159

160160
To add a secret to the vault, you need to run the Azure CLI [az keyvault secret set][az-keyvault-secret-set] command to create it. The password is the value you specified for the environment variable `KEYVAULT_SECRET_NAME` and stores the value of **Hello!** in it.
161161

162-
```azurecli
162+
```azurecli-interactive
163163
az keyvault secret set --vault-name "${KEYVAULT_NAME}" --name "${KEYVAULT_SECRET_NAME}" --value 'Hello!'
164164
```
165165

@@ -173,29 +173,29 @@ export KEYVAULT_URL="$(az keyvault show -g ${RESOURCE_GROUP} -n ${KEYVAULT_NAME}
173173

174174
Use the Azure CLI [az account set][az-account-set] command to set a specific subscription to be the current active subscription. Then use the [az identity create][az-identity-create] command to create a managed identity.
175175

176-
```azurecli
176+
```azurecli-interactive
177177
az account set --subscription "${SUBSCRIPTION}"
178178
```
179179

180-
```azurecli
180+
```azurecli-interactive
181181
az identity create --name "${UAID}" --resource-group "${RESOURCE_GROUP}" --location "${LOCATION}" --subscription "${SUBSCRIPTION}"
182182
```
183183

184184
Next, you need to set an access policy for the managed identity to access the Key Vault secret by running the following commands:
185185

186-
```bash
186+
```azurecli-interactive
187187
export USER_ASSIGNED_CLIENT_ID="$(az identity show --resource-group "${RESOURCE_GROUP}" --name "${UAID}" --query 'clientId' -otsv)"
188188
```
189189

190-
```azurecli
190+
```azurecli-interactive
191191
az keyvault set-policy --name "${KEYVAULT_NAME}" --secret-permissions get --spn "${USER_ASSIGNED_CLIENT_ID}"
192192
```
193193

194194
### Create Kubernetes service account
195195

196196
Create a Kubernetes service account and annotate it with the client ID of the Managed Identity created in the previous step. Use the [az aks get-credentials][az-aks-get-credentials] command and replace the default value for the cluster name and the resource group name.
197197

198-
```azurecli
198+
```azurecli-interactive
199199
az aks get-credentials -n myAKSCluster -g "${RESOURCE_GROUP}"
200200
```
201201

@@ -225,7 +225,7 @@ Serviceaccount/workload-identity-sa created
225225

226226
Use the [az identity federated-credential create][az-identity-federated-credential-create] command to create the federated identity credential between the managed identity, the service account issuer, and the subject.
227227

228-
```azurecli
228+
```azurecli-interactive
229229
az identity federated-credential create --name ${FICID} --identity-name ${UAID} --resource-group ${RESOURCE_GROUP} --issuer ${AKS_OIDC_ISSUER} --subject system:serviceaccount:${SERVICE_ACCOUNT_NAMESPACE}:${SERVICE_ACCOUNT_NAME}
230230
```
231231

@@ -300,7 +300,7 @@ kubectl delete pod quick-start
300300
kubectl delete sa "${SERVICE_ACCOUNT_NAME}" --namespace "${SERVICE_ACCOUNT_NAMESPACE}"
301301
```
302302

303-
```azurecli
303+
```azurecli-interactive
304304
az group delete --name "${RESOURCE_GROUP}"
305305
```
306306

articles/app-service/deploy-zip.md

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,7 @@ Publish-AzWebApp -ResourceGroupName Default-Web-WestUS -Name MyApp -ArchivePath
6969
The following example uses the cURL tool to deploy a ZIP package. Replace the placeholders `<username>`, `<zip-package-path>`, and `<app-name>`. When prompted by cURL, type in the [deployment password](deploy-configure-credentials.md).
7070

7171
```bash
72-
curl -X POST -u <username:password> --data-binary "@<zip-package-path>" https://<app-name>.scm.azurewebsites.net/api/publish?type=zip
72+
curl -X POST -u <username:password> -T "@<zip-package-path>" https://<app-name>.scm.azurewebsites.net/api/publish?type=zip
7373
```
7474

7575
[!INCLUDE [deploying to network secured sites](../../includes/app-service-deploy-network-secured-sites.md)]
@@ -141,7 +141,7 @@ Publish-AzWebapp -ResourceGroupName <group-name> -Name <app-name> -ArchivePath <
141141
The following example uses the cURL tool to deploy a .war, .jar, or .ear file. Replace the placeholders `<username>`, `<file-path>`, `<app-name>`, and `<package-type>` (`war`, `jar`, or `ear`, accordingly). When prompted by cURL, type in the [deployment password](deploy-configure-credentials.md).
142142

143143
```bash
144-
curl -X POST -u <username> --data-binary @"<file-path>" https://<app-name>.scm.azurewebsites.net/api/publish?type=<package-type>
144+
curl -X POST -u <username> -T @"<file-path>" https://<app-name>.scm.azurewebsites.net/api/publish?type=<package-type>
145145
```
146146

147147
[!INCLUDE [deploying to network secured sites](../../includes/app-service-deploy-network-secured-sites.md)]
@@ -199,23 +199,23 @@ Not supported. See Azure CLI or Kudu API.
199199
The following example uses the cURL tool to deploy a startup file for their application.Replace the placeholders `<username>`, `<startup-file-path>`, and `<app-name>`. When prompted by cURL, type in the [deployment password](deploy-configure-credentials.md).
200200

201201
```bash
202-
curl -X POST -u <username> --data-binary @"<startup-file-path>" https://<app-name>.scm.azurewebsites.net/api/publish?type=startup
202+
curl -X POST -u <username> -T @"<startup-file-path>" https://<app-name>.scm.azurewebsites.net/api/publish?type=startup
203203
```
204204

205205
### Deploy a library file
206206

207207
The following example uses the cURL tool to deploy a library file for their application. Replace the placeholders `<username>`, `<lib-file-path>`, and `<app-name>`. When prompted by cURL, type in the [deployment password](deploy-configure-credentials.md).
208208

209209
```bash
210-
curl -X POST -u <username> --data-binary @"<lib-file-path>" https://<app-name>.scm.azurewebsites.net/api/publish?type=lib&path="/home/site/deployments/tools/my-lib.jar"
210+
curl -X POST -u <username> -T @"<lib-file-path>" https://<app-name>.scm.azurewebsites.net/api/publish?type=lib&path="/home/site/deployments/tools/my-lib.jar"
211211
```
212212

213213
### Deploy a static file
214214

215215
The following example uses the cURL tool to deploy a config file for their application. Replace the placeholders `<username>`, `<config-file-path>`, and `<app-name>`. When prompted by cURL, type in the [deployment password](deploy-configure-credentials.md).
216216

217217
```bash
218-
curl -X POST -u <username> --data-binary @"<config-file-path>" https://<app-name>.scm.azurewebsites.net/api/publish?type=static&path="/home/site/deployments/tools/my-config.json"
218+
curl -X POST -u <username> -T @"<config-file-path>" https://<app-name>.scm.azurewebsites.net/api/publish?type=static&path="/home/site/deployments/tools/my-config.json"
219219
```
220220

221221
# [Kudu UI](#tab/kudu-ui)

articles/bastion/connect-ip-address.md

Lines changed: 26 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ ms.author: cherylmc
1010

1111
---
1212

13-
# Connect to a VM via specified private IP address through the portal
13+
# Connect to a VM via specified private IP address
1414

1515
IP-based connection lets you connect to your on-premises, non-Azure, and Azure virtual machines via Azure Bastion over ExpressRoute or a VPN site-to-site connection using a specified private IP address. The steps in this article show you how to configure your Bastion deployment, and then connect to an on-premises resource using IP-based connection. For more information about Azure Bastion, see the [Overview](bastion-overview.md).
1616

@@ -48,7 +48,7 @@ Before you begin these steps, verify that you have the following environment set
4848

4949
1. Select **Apply** to apply the changes. It takes a few minutes for the Bastion configuration to complete.
5050

51-
## Connect to VM
51+
## Connect to VM - Azure portal
5252

5353
1. To connect to a VM using a specified private IP address, you make the connection from Bastion to the VM, not directly from the VM page. On your Bastion page, select **Connect** to open the Connect page.
5454

@@ -62,6 +62,29 @@ Before you begin these steps, verify that you have the following environment set
6262

6363
1. Select **Connect** to connect to your virtual machine.
6464

65+
## Connect to VM - native client
66+
67+
You can connect to VMs using a specified IP address with native client via SSH, RDP, or tunnelling. Note that this feature does not support Azure Active Directory authentication or custom port and protocol at the moment. To learn more about configuring native client support, see [Connect to a VM - native client](connect-native-client-windows.md). Use the following commands as examples:
68+
69+
**RDP:**
70+
71+
```azurecli
72+
az network bastion rdp --name "<BastionName>" --resource-group "<ResourceGroupName>" --target-ip-address "<VMIPAddress>
73+
```
74+
75+
**SSH:**
76+
77+
```azurecli
78+
az network bastion ssh --name "<BastionName>" --resource-group "<ResourceGroupName>" --target-ip-addres "<VMIPAddress>" --auth-type "ssh-key" --username "<Username>" --ssh-key "<Filepath>"
79+
```
80+
81+
**Tunnel:**
82+
83+
```azurecli
84+
az network bastion tunnel --name "<BastionName>" --resource-group "<ResourceGroupName>" --target-ip-address "<VMIPAddress>" --resource-port "<TargetVMPort>" --port "<LocalMachinePort>"
85+
```
86+
87+
6588
## Next steps
6689

67-
Read the [Bastion FAQ](bastion-faq.md) for additional information.
90+
Read the [Bastion FAQ](bastion-faq.md) for additional information.

articles/machine-learning/azure-machine-learning-ci-image-release-notes.md

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,22 @@ Azure Machine Learning checks and validates any machine learning packages that m
2020

2121
Main updates provided with each image version are described in the below sections.
2222

23+
## April 7, 2023
24+
Version: `23.04.07`
25+
26+
Main changes:
27+
28+
- `Azure Machine Learning SDK` to version `1.49.0`
29+
- `Certifi` updated to `2022.9.24`
30+
- `.Net` updated from `3.1` (EOL) to `6.0`
31+
- `Pyspark` update to `3.3.1` (mitigating log4j 1.2.17 and common-text-1.6 vulnerabilities)
32+
- Default `intellisense` to Python `3.10` on the CI
33+
- Bug fixes and stability improvements
34+
35+
Main environment specific updates:
36+
37+
- `Azureml_py38` environment is now the default.
38+
2339
## January 19, 2023
2440
Version: `23.01.19`
2541

articles/machine-learning/how-to-create-manage-compute-instance.md

Lines changed: 31 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -742,41 +742,44 @@ To create a compute instance, you'll need permissions for the following actions:
742742
* *Microsoft.MachineLearningServices/workspaces/computes/write*
743743
* *Microsoft.MachineLearningServices/workspaces/checkComputeNameAvailability/action*
744744

745-
### Audit and observe compute instance version
745+
## Audit and observe compute instance version
746746

747747
Once a compute instance is deployed, it does not get automatically updated. Microsoft [releases](azure-machine-learning-ci-image-release-notes.md) new VM images on a monthly basis. To understand options for keeping recent with the latest version, see [vulnerability management](concept-vulnerability-management.md#compute-instance).
748748

749-
To keep track of whether an instance's operating system version is current, you could query its version using the Studio UI. In your workspace in Azure Machine Learning studio, select Compute, then select compute instance on the top. Select a compute instance's compute name to see its properties including the current operating system. Enable 'audit and observe compute instance os version' under the previews management panel to see these preview properties.
749+
To keep track of whether an instance's operating system version is current, you could query its version using the CLI, SDK or Studio UI.
750750

751-
Administrators can use [Azure Policy](policy-reference.md) definitions to audit instances that are running on outdated operating system versions across workspaces and subscriptions. The following is a sample policy:
751+
# [Studio UI](#tab/azure-studio)
752752

753-
```json
754-
{
755-
"mode": "All",
756-
"policyRule": {
757-
"if": {
758-
"allOf": [
759-
{
760-
"field": "type",
761-
"equals": "Microsoft.MachineLearningServices/workspaces/computes"
762-
},
763-
{
764-
"field": "Microsoft.MachineLearningServices/workspaces/computes/computeType",
765-
"equals": "ComputeInstance"
766-
},
767-
{
768-
"field": "Microsoft.MachineLearningServices/workspaces/computes/osImageMetadata.isLatestOsImageVersion",
769-
"equals": "false"
770-
}
771-
]
772-
},
773-
"then": {
774-
"effect": "Audit"
775-
}
776-
}
777-
}
753+
In your workspace in Azure Machine Learning studio, select Compute, then select compute instance on the top. Select a compute instance's compute name to see its properties including the current operating system.
754+
755+
# [Python SDK](#tab/python)
756+
757+
[!INCLUDE [sdk v2](../../includes/machine-learning-sdk-v2.md)]
758+
759+
```python
760+
from azure.ai.ml.entities import ComputeInstance, AmlCompute
761+
762+
# Display operating system version
763+
instance = ml_client.compute.get("myci")
764+
print instance.os_image_metadata
778765
```
779766

767+
For more information on the classes, methods, and parameters used in this example, see the following reference documents:
768+
769+
* [`AmlCompute` class](/python/api/azure-ai-ml/azure.ai.ml.entities.amlcompute)
770+
* [`ComputeInstance` class](/python/api/azure-ai-ml/azure.ai.ml.entities.computeinstance)
771+
772+
# [Azure CLI](#tab/azure-cli)
773+
774+
[!INCLUDE [cli v2](../../includes/machine-learning-cli-v2.md)]
775+
776+
```azurecli
777+
az ml compute show --name "myci"
778+
```
779+
---
780+
781+
IT administrators can use [Azure Policy](./../governance/policy/overview.md) to monitor the inventory of instances across workspaces in Azure Policy compliance portal. Assign the built-in policy [Audit Azure Machine Learning Compute Instances with an outdated operating system](https://ms.portal.azure.com/#view/Microsoft_Azure_Policy/PolicyDetailBlade/definitionId/%2Fproviders%2FMicrosoft.Authorization%2FpolicyDefinitions%2Ff110a506-2dcb-422e-bcea-d533fc8c35e2) on an Azure subscription or Azure management group scope.
782+
780783
## Next steps
781784

782785
* [Access the compute instance terminal](how-to-access-terminal.md)

0 commit comments

Comments
 (0)