Skip to content

Commit 1d4a8ef

Browse files
authored
Merge pull request #211497 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 e753538 + 6339f69 commit 1d4a8ef

File tree

5 files changed

+60
-5
lines changed

5 files changed

+60
-5
lines changed

articles/active-directory/develop/msal-node-migration.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,7 @@ const msal = require('@azure/msal-node');
7171

7272
const pca = new msal.PublicClientApplication({
7373
auth: {
74-
clientId = "YOUR_CLIENT_ID"
74+
clientId: "YOUR_CLIENT_ID"
7575
}
7676
});
7777
```
@@ -86,8 +86,8 @@ const msal = require('@azure/msal-node');
8686

8787
const cca = new msal.ConfidentialClientApplication({
8888
auth: {
89-
clientId = "YOUR_CLIENT_ID",
90-
clientSecret = "YOUR_CLIENT_SECRET"
89+
clientId: "YOUR_CLIENT_ID",
90+
clientSecret: "YOUR_CLIENT_SECRET"
9191
}
9292
});
9393
```

articles/azure-vmware/includes/azure-vmware-solutions-limits.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ The following table describes the maximum limits for Azure VMware Solution.
2222
| HCX site pairings | 25 (any edition) |
2323
| Azure VMware Solution ExpressRoute max linked private clouds | 4<br />The virtual network gateway used determines the actual max linked private clouds. For more details, see [About ExpressRoute virtual network gateways](../../expressroute/expressroute-about-virtual-network-gateways.md) |
2424
| Azure VMware Solution ExpressRoute port speed | 10 Gbps<br />The virtual network gateway used determines the actual bandwidth. For more details, see [About ExpressRoute virtual network gateways](../../expressroute/expressroute-about-virtual-network-gateways.md) |
25-
| Public IPs exposed via vWAN | 100 |
25+
| Public IPs down to NSX-T | 2000 |
2626
| vSAN capacity limits | 75% of total usable (keep 25% available for SLA) |
2727
| VMware Site Recovery Manager - Number of protected Virtual Machines | 3,000 |
2828
| VMware Site Recovery Manager - Number of Virtual Machines per recovery plan | 2,000 |

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

Lines changed: 55 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -210,6 +210,61 @@ This setting can be configured during CI creation or for existing CIs via the fo
210210
}
211211
```
212212
213+
### Azure policy support
214+
Administrators can use a built-in [Azure Policy](./../governance/policy/overview.md) definition to enfore auto-stop on all compute instances in a given subscription/resource-group.
215+
216+
1. Navigate to Azure Policy in the Azure portal.
217+
2. Under "Definitions", look for the idle shutdown policy.
218+
219+
:::image type="content" source="media/how-to-create-attach-studio/idle-shutdown-policy.png" alt-text="Screenshot for the idle shutdown policy in Azure Portal.":::
220+
221+
3. Assign policy to the necessary scope.
222+
223+
You can also create your own custom Azure policy. For example, if the below policy is assigned, all new compute instances will have auto-stop configured with a 60 minute inactivity period.
224+
225+
```json
226+
{
227+
"mode": "All",
228+
"policyRule": {
229+
"if": {
230+
"allOf": [
231+
{
232+
"field": "type",
233+
"equals": "Microsoft.MachineLearningServices/workspaces/computes"
234+
},
235+
{
236+
"field": "Microsoft.MachineLearningServices/workspaces/computes/computeType",
237+
"equals": "ComputeInstance"
238+
},
239+
{
240+
"anyOf": [
241+
{
242+
"field": "Microsoft.MachineLearningServices/workspaces/computes/idleTimeBeforeShutdown",
243+
"exists": false
244+
},
245+
{
246+
"value": "[empty(field('Microsoft.MachineLearningServices/workspaces/computes/idleTimeBeforeShutdown'))]",
247+
"equals": true
248+
}
249+
]
250+
}
251+
]
252+
},
253+
"then": {
254+
"effect": "append",
255+
"details": [
256+
{
257+
"field": "Microsoft.MachineLearningServices/workspaces/computes/idleTimeBeforeShutdown",
258+
"value": "PT60M"
259+
}
260+
]
261+
}
262+
},
263+
"parameters": {}
264+
}
265+
```
266+
267+
213268
## Create on behalf of (preview)
214269

215270
As an administrator, you can create a compute instance on behalf of a data scientist and assign the instance to them with:
77.4 KB
Loading

articles/storage/blobs/data-lake-storage-best-practices.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ Use the following pattern as you configure your account to use Blob storage feat
3535

3636
#### Understand the terms used in documentation
3737

38-
As you move between content sets, you'll notice some slight terminology differences. For example, content featured in the [Blob storage documentation](storage-blobs-introduction.md), will use the term *blob* instead of *file*. Technically, the files that you ingest to your storage account become blobs in your account. Therefore, the term is correct. However, this can cause confusion if you're use to the term *file*. You'll also see the term *container* used to refer to a *file system*. Consider these terms as synonymous.
38+
As you move between content sets, you'll notice some slight terminology differences. For example, content featured in the [Blob storage documentation](storage-blobs-introduction.md), will use the term *blob* instead of *file*. Technically, the files that you ingest to your storage account become blobs in your account. Therefore, the term is correct. However, this can cause confusion if you're used to the term *file*. You'll also see the term *container* used to refer to a *file system*. Consider these terms as synonymous.
3939

4040
## Consider premium
4141

0 commit comments

Comments
 (0)