Skip to content

Commit f0905ab

Browse files
authored
Merge pull request #189336 from MicrosoftDocs/main
2/22 AM Publish
2 parents 61d958d + 9f17c53 commit f0905ab

File tree

153 files changed

+1554
-884
lines changed

Some content is hidden

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

153 files changed

+1554
-884
lines changed

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

Lines changed: 24 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,5 @@
11
{
22
"redirections": [
3-
{
4-
"source_path_from_root": "/articles/defender-for-iot/organizations/how-to-configure-with-sentinel.md",
5-
"redirect_url": "/azure/sentinel/iot-solution",
6-
"redirect_document_id": false
7-
},
83
{
94
"source_path_from_root": "/articles/defender-for-iot/device-builders/quickstart-building-the-defender-micro-agent-from-source.md",
105
"redirect_url": "/azure/defender-for-iot/device-builders/overview",
@@ -240,11 +235,6 @@
240235
"redirect_url": "/azure/defender-for-iot/organizations/how-to-track-sensor-activity",
241236
"redirect_document_id": false
242237
},
243-
{
244-
"source_path_from_root": "/articles/defender-for-iot/how-to-configure-with-sentinel.md",
245-
"redirect_url": "/azure/defender-for-iot/organizations/how-to-configure-with-sentinel",
246-
"redirect_document_id": false
247-
},
248238
{
249239
"source_path_from_root": "/articles/defender-for-iot/how-to-troubleshoot-the-sensor-and-on-premises-management-console.md",
250240
"redirect_url": "/azure/defender-for-iot/organizations/how-to-troubleshoot-the-sensor-and-on-premises-management-console",
@@ -574,6 +564,29 @@
574564
"source_path_from_root": "/articles/defender-for-iot/organizations/references-horizon-sdk.md",
575565
"redirect_url": "/azure/defender-for-iot/organizations",
576566
"redirect_document_id": false
567+
},
568+
{
569+
"source_path_from_root": "/articles/device-builders/how-to-configure-with-sentinel.md",
570+
"redirect_url": "/azure/sentinel/iot-solution?toc=%2Fazure%2Fdefender-for-iot%2Forganizations%2Ftoc.json&bc=%2Fazure%2Fdefender-for-iot%2Fbreadcrumb%2Ftoc.json&tabs=use-out-of-the-box-analytics-rules-recommended",
571+
"redirect_document_id": false
572+
},
573+
{
574+
"source_path_from_root": "/articles/defender-for-iot/organizations/how-to-configure-with-sentinel.md",
575+
"redirect_url": "/azure/sentinel/iot-solution?toc=%2Fazure%2Fdefender-for-iot%2Forganizations%2Ftoc.json&bc=%2Fazure%2Fdefender-for-iot%2Fbreadcrumb%2Ftoc.json&tabs=use-out-of-the-box-analytics-rules-recommended",
576+
"redirect_document_id": false
577+
},
578+
{
579+
"source_path_from_root": "/articles/defender-for-iot/how-to-configure-with-sentinel.md",
580+
"redirect_url": "/azure/sentinel/iot-solution?toc=%2Fazure%2Fdefender-for-iot%2Forganizations%2Ftoc.json&bc=%2Fazure%2Fdefender-for-iot%2Fbreadcrumb%2Ftoc.json&tabs=use-out-of-the-box-analytics-rules-recommended",
581+
"redirect_document_id": false
582+
},
583+
{
584+
"source_path_from_root": "/articles/defender-for-iot/device-builders/concept-security-agent-authentication.md",
585+
"redirect_url": "/azure/defender-for-iot/device-builders/tutorial-standalone-agent-binary-installation",
586+
"redirect_document_id": false
577587
}
578588
]
579-
}
589+
}
590+
591+
592+

articles/active-directory/authentication/how-to-certificate-based-authentication.md

Lines changed: 30 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -69,6 +69,36 @@ Only one CRL Distribution Point (CDP) for a trusted CA is supported. The CDP can
6969

7070
[!INCLUDE [New-AzureAD](../../../includes/active-directory-authentication-new-trusted-azuread.md)]
7171

72+
**AuthorityType**
73+
- Use 0 to indicate that this is a Root Certificate Authority
74+
- Use 1 to indicate that this is an Intermediate or Issuing Certificate Authority
75+
76+
**crlDistributionPoint**
77+
78+
You can validate the crlDistributionPoint value you provide in the above PowerShell example are valid for the Certificate Authority being added by downloading the CRL and comparing the CA certificate and the CRL Information.
79+
80+
The below table and graphic indicate how to map information from the CA Certificate to the attributes of the downloaded CRL.
81+
82+
| CA Certificate Info | |Downloaded CRL Info|
83+
|----|:-:|----|
84+
|Subject |=|Issuer |
85+
|Subject Key Identifier |=|Authority Key Identifier (KeyID) |
86+
87+
:::image type="content" border="false" source="./media/how-to-certificate-based-authentication/certificate-crl-compare.png" alt-text="Compare CA Certificate with CRL Information.":::
88+
89+
>[!TIP]
90+
>The value for crlDistributionPoint in the above is the http location for the CA’s Certificate Revocation List (CRL). This can be found in a few places.
91+
>
92+
>- In the CRL Distribution Point (CDP) attribute of a certificate issued from the CA
93+
>
94+
>If Issuing CA is Windows Server
95+
>
96+
>- On the [Properties](/windows-server/networking/core-network-guide/cncg/server-certs/configure-the-cdp-and-aia-extensions-on-ca1#to-configure-the-cdp-and-aia-extensions-on-ca1)
97+
of the CA in the Certificate Authority Microsoft Management Console (MMC)
98+
>- On the CA running [certutil](/windows-server/administration/windows-commands/certutil#-cainfo) -cainfo cdp
99+
100+
For additional details see: [Understanding the certificate revocation process](./concept-certificate-based-authentication-technical-deep-dive.md#understanding-the-certificate-revocation-process).
101+
72102
### Remove
73103

74104
[!INCLUDE [Remove-AzureAD](../../../includes/active-directory-authentication-remove-trusted-azuread.md)]
Loading

articles/active-directory/governance/entitlement-management-catalog-create.md

Lines changed: 19 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -165,7 +165,25 @@ To require attributes for access requests:
165165

166166
### Add a resource to a catalog programmatically
167167

168-
You can also add a resource to a catalog by using Microsoft Graph. A user in an appropriate role, or a catalog and resource owner, with an application that has the delegated `EntitlementManagement.ReadWrite.All` permission can call the API to [create an accessPackageResourceRequest](/graph/api/entitlementmanagement-post-accesspackageresourcerequests?view=graph-rest-beta&preserve-view=true). An application with application permissions can't yet programmatically add a resource without a user context at the time of the request, however.
168+
You can also add a resource to a catalog by using Microsoft Graph. A user in an appropriate role, or a catalog and resource owner, with an application that has the delegated `EntitlementManagement.ReadWrite.All` permission can call the API to [create an accessPackageResourceRequest](/graph/api/entitlementmanagement-post-accesspackageresourcerequests?view=graph-rest-beta&preserve-view=true). An application with the application permission `EntitlementManagement.ReadWrite.All` and permissions to change resources, such as `Group.ReadWrite.All`, can also add resources to the catalog.
169+
170+
### Add a resource to a catalog with PowerShell
171+
172+
You can also add a resource to a catalog in PowerShell with the `New-MgEntitlementManagementAccessPackageResourceRequest` cmdlet from the [Microsoft Graph PowerShell cmdlets for Identity Governance](https://www.powershellgallery.com/packages/Microsoft.Graph.Identity.Governance/) module version 1.6.0 or later. The following example shows how to add a group to a catalog as a resource.
173+
174+
```powershell
175+
Connect-MgGraph -Scopes "EntitlementManagement.ReadWrite.All,Group.ReadWrite.All"
176+
Select-MgProfile -Name "beta"
177+
$g = Get-MgGroup -Filter "displayName eq 'Marketing'"
178+
Import-Module Microsoft.Graph.Identity.Governance
179+
$catalog = Get-MgEntitlementManagementAccessPackageCatalog -Filter "displayName eq 'Marketing'"
180+
$nr = New-Object Microsoft.Graph.PowerShell.Models.MicrosoftGraphAccessPackageResource
181+
$nr.OriginId = $g.Id
182+
$nr.OriginSystem = "AadGroup"
183+
$rr = New-MgEntitlementManagementAccessPackageResourceRequest -CatalogId $catalog.Id -AccessPackageResource $nr
184+
$ar = Get-MgEntitlementManagementAccessPackageCatalog -AccessPackageCatalogId $catalog.Id -ExpandProperty accessPackageResources
185+
$ar.AccessPackageResources
186+
```
169187

170188
## Remove resources from a catalog
171189

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -168,7 +168,7 @@ Azure Active Directory (Azure AD) pod-managed identities use AKS primitives to a
168168
kubectl apply -f secretproviderclass.yaml
169169
```
170170
171-
1. Create a pod by using the following YAML, using the name of your identity:
171+
1. Create a pod by using the following YAML:
172172
173173
```yml
174174
# This is a sample pod definition for using SecretProviderClass and the user-assigned identity to access your key vault
@@ -270,7 +270,7 @@ Azure Active Directory (Azure AD) pod-managed identities use AKS primitives to a
270270
kubectl apply -f secretproviderclass.yaml
271271
```
272272
273-
1. Create a pod by using the following YAML, using the name of your identity:
273+
1. Create a pod by using the following YAML:
274274
275275
```yml
276276
# This is a sample pod definition for using SecretProviderClass and system-assigned identity to access your key vault

articles/app-service/webjobs-create.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -193,7 +193,7 @@ To learn more, see [Scheduling a triggered WebJob](webjobs-dotnet-deploy-vs.md#s
193193

194194
You can manage the running state individual WebJobs running in your site in the [Azure portal](https://portal.azure.com). Just go to **Settings** > **WebJobs**, choose the WebJob, and you can start and stop the WebJob. You can also view and modify the password of the webhook that runs the WebJob.
195195

196-
You can also [add an application setting](configure-common.md#configure-app-settings) named `WEBJOB_STOPPED` with a value of `1` to stop all WebJobs running on your site. This can be handy as a way to prevent conflicting WebJobs from running both in staging and production slots. You can similarly use a value of `1` for the `WEBJOBS_DISABLE_SCHEDULE` setting to disable triggered WebJobs in the site or a staging slot. For slots, remember to enable the **Deployment slot setting** option so that the setting itself doesn't get swapped.
196+
You can also [add an application setting](configure-common.md#configure-app-settings) named `WEBJOBS_STOPPED` with a value of `1` to stop all WebJobs running on your site. This can be handy as a way to prevent conflicting WebJobs from running both in staging and production slots. You can similarly use a value of `1` for the `WEBJOBS_DISABLE_SCHEDULE` setting to disable triggered WebJobs in the site or a staging slot. For slots, remember to enable the **Deployment slot setting** option so that the setting itself doesn't get swapped.
197197

198198
## <a name="ViewJobHistory"></a> View the job history
199199

articles/azure-functions/functions-reference-python.md

Lines changed: 19 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -351,25 +351,25 @@ First, the function.json file must be updated to include a `route` in the HTTP t
351351

352352
```json
353353
{
354-
"scriptFile": "__init__.py",
355-
"bindings": [
356-
{
357-
"authLevel": "anonymous",
358-
"type": "httpTrigger",
359-
"direction": "in",
360-
"name": "req",
361-
"methods": [
362-
"get",
363-
"post"
364-
],
365-
"route": "/{*route}"
366-
},
367-
{
368-
"type": "http",
369-
"direction": "out",
370-
"name": "$return"
371-
}
372-
]
354+
"scriptFile": "__init__.py",
355+
"bindings": [
356+
{
357+
"authLevel": "anonymous",
358+
"type": "httpTrigger",
359+
"direction": "in",
360+
"name": "req",
361+
"methods": [
362+
"get",
363+
"post"
364+
],
365+
"route": "/{*route}"
366+
},
367+
{
368+
"type": "http",
369+
"direction": "out",
370+
"name": "$return"
371+
}
372+
]
373373
}
374374
```
375375

articles/azure-monitor/alerts/alerts-common-schema-definitions.md

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -373,14 +373,17 @@ Any alert instance describes the resource that was affected and the cause of the
373373
```json
374374
{
375375
"alertContext": {
376-
"properties": null,
376+
"properties": {
377+
"name1": "value1",
378+
"name2": "value2"
379+
},
377380
"conditionType": "LogQueryCriteria",
378381
"condition": {
379382
"windowSize": "PT10M",
380383
"allOf": [
381384
{
382385
"searchQuery": "Heartbeat",
383-
"metricMeasure": null,
386+
"metricMeasureColumn": "CounterValue",
384387
"targetResourceTypes": "['Microsoft.Compute/virtualMachines']",
385388
"operator": "LowerThan",
386389
"threshold": "1",

articles/azure-monitor/alerts/alerts-log-api-switch.md

Lines changed: 14 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ description: Learn how to switch to the log alerts management to ScheduledQueryR
44
author: yanivlavi
55
ms.author: yalavi
66
ms.topic: conceptual
7-
ms.date: 01/25/2022
7+
ms.date: 02/22/2022
88
---
99
# Upgrade legacy rules management to the current Log Alerts API from legacy Log Analytics Alert API
1010

@@ -57,6 +57,12 @@ $switchJSON = '{"scheduledQueryRulesEnabled": true}'
5757
armclient PUT /subscriptions/<subscriptionId>/resourceGroups/<resourceGroupName>/providers/Microsoft.OperationalInsights/workspaces/<workspaceName>/alertsversion?api-version=2017-04-26-preview $switchJSON
5858
```
5959

60+
You can also use [Azure CLI](/cli/azure/reference-index#az-rest) tool:
61+
62+
```bash
63+
az rest --method post --url /subscriptions/<subscriptionId>/resourceGroups/<resourceGroupName>/providers/Microsoft.OperationalInsights/workspaces/<workspaceName>/alertsversion?api-version=2017-04-26-preview --body '{"scheduledQueryRulesEnabled": true}'
64+
```
65+
6066
If the switch is successful, the response is:
6167

6268
```json
@@ -80,6 +86,12 @@ You can also use [ARMClient](https://github.com/projectkudu/ARMClient) tool:
8086
armclient GET /subscriptions/<subscriptionId>/resourceGroups/<resourceGroupName>/providers/Microsoft.OperationalInsights/workspaces/<workspaceName>/alertsversion?api-version=2017-04-26-preview
8187
```
8288

89+
You can also use [Azure CLI](/cli/azure/reference-index#az-rest) tool:
90+
91+
```bash
92+
az rest --method get --url /subscriptions/<subscriptionId>/resourceGroups/<resourceGroupName>/providers/Microsoft.OperationalInsights/workspaces/<workspaceName>/alertsversion?api-version=2017-04-26-preview
93+
```
94+
8395
If the Log Analytics workspace was switched to [scheduledQueryRules API](/rest/api/monitor/scheduledqueryrule-2021-08-01/scheduled-query-rules), the response is:
8496

8597
```json
@@ -102,4 +114,4 @@ If the Log Analytics workspace wasn't switched, the response is:
102114
- Learn about the [Azure Monitor - Log Alerts](./alerts-unified-log.md).
103115
- Learn how to [manage your log alerts using the API](alerts-log-create-templates.md).
104116
- Learn how to [manage log alerts using PowerShell](./alerts-manage-alerts-previous-version.md#manage-log-alerts-using-powershell).
105-
- Learn more about the [Azure Alerts experience](./alerts-overview.md).
117+
- Learn more about the [Azure Alerts experience](./alerts-overview.md).

0 commit comments

Comments
 (0)