Skip to content

Commit 44fe52c

Browse files
authored
Merge branch 'main' into eflow-diagnose-nw
2 parents f0f4d0d + b698ec3 commit 44fe52c

File tree

347 files changed

+6565
-2562
lines changed

Some content is hidden

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

347 files changed

+6565
-2562
lines changed

.openpublishing.publish.config.json

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -978,6 +978,7 @@
978978
".openpublishing.redirection.app-service.json",
979979
".openpublishing.redirection.key-vault.json",
980980
".openpublishing.redirection.sql-database.json",
981+
".openpublishing.redirection.machine-configuration.json",
981982
".openpublishing.redirection.security-benchmark.json",
982983
"articles/synapse-analytics/.openpublishing.redirection.synapse-analytics.json",
983984
".openpublishing.redirection.azure-web-pubsub.json",

.openpublishing.redirection.json

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7641,6 +7641,16 @@
76417641
"redirect_url": "/azure/azure-monitor/app/overview-dashboard",
76427642
"redirect_document_id": true
76437643
},
7644+
{
7645+
"source_path_from_root": "/articles/azure-monitor/agents/azure-monitor-agent-overview.md",
7646+
"redirect_url": "/azure/azure-monitor/agents/agents-overview",
7647+
"redirect_document_id": true
7648+
},
7649+
{
7650+
"source_path_from_root": "/azure/azure-monitor/agents/agents-overview.md#log-analytics-agent",
7651+
"redirect_url": "/azure/azure-monitor/agents/log-analytics-agent",
7652+
"redirect_document_id": true
7653+
},
76447654
{
76457655
"source_path_from_root": "/articles/cognitive-services/Computer-vision/deploy-computer-vision-on-container-instances.md",
76467656
"redirect_url": "/azure/cognitive-services/containers/azure-container-instance-recipe",
Lines changed: 69 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,69 @@
1+
{
2+
"redirections": [
3+
{
4+
"source_path_from_root": "/articles/governance/policy/concepts/guest-configuration.md",
5+
"redirect_url": "/azure/governance/machine-configuration/overview",
6+
"redirect_document_id": false
7+
},
8+
{
9+
"source_path_from_root": "/articles/governance/policy/concepts/guest-configuration-policy-effects.md",
10+
"redirect_url": "/azure/governance/machine-configuration/machine-configuration-policy-effects",
11+
"redirect_document_id": false
12+
},
13+
{
14+
"source_path_from_root": "/articles/governance/policy/how-to/guest-configuration-desired-state-configuration-extension-migration.md",
15+
"redirect_url": "/azure/governance/machine-configuration/machine-configuration-dsc-extension-migration",
16+
"redirect_document_id": false
17+
},
18+
{
19+
"source_path_from_root": "/articles/governance/policy/concepts/guest-configuration-custom.md",
20+
"redirect_url": "/azure/governance/machine-configuration/machine-configuration-custom",
21+
"redirect_document_id": false
22+
},
23+
{
24+
"source_path_from_root": "/articles/governance/policy/how-to/guest-configuration-create.md",
25+
"redirect_url": "/azure/governance/machine-configuration/machine-configuration-create",
26+
"redirect_document_id": false
27+
},
28+
{
29+
"source_path_from_root": "/articles/governance/policy/how-to/guest-configuration-create-test.md",
30+
"redirect_url": "/azure/governance/machine-configuration/machine-configuration-create-test",
31+
"redirect_document_id": false
32+
},
33+
{
34+
"source_path_from_root": "/articles/governance/policy/how-to/guest-configuration-create-signing.md",
35+
"redirect_url": "/azure/governance/machine-configuration/machine-configuration-create-signing",
36+
"redirect_document_id": false
37+
},
38+
{
39+
"source_path_from_root": "/articles/governance/policy/how-to/guest-configuration-create-setup.md",
40+
"redirect_url": "/azure/governance/machine-configuration/machine-configuration-create-setup",
41+
"redirect_document_id": false
42+
},
43+
{
44+
"source_path_from_root": "/articles/governance/policy/how-to/guest-configuration-create-publish.md",
45+
"redirect_url": "/azure/governance/machine-configuration/machine-configuration-create-publish",
46+
"redirect_document_id": false
47+
},
48+
{
49+
"source_path_from_root": "/articles/governance/policy/how-to/guest-configuration-create-definition.md",
50+
"redirect_url": "/azure/governance/machine-configuration/machine-configuration-create-definition",
51+
"redirect_document_id": false
52+
},
53+
{
54+
"source_path_from_root": "/articles/governance/policy/how-to/guest-configuration-create-assignment.md",
55+
"redirect_url": "/azure/governance/machine-configuration/machine-configuration-create-assignment",
56+
"redirect_document_id": false
57+
},
58+
{
59+
"source_path_from_root": "/articles/governance/policy/how-to/guest-configuration-azure-automation-migration.md",
60+
"redirect_url": "/azure/governance/machine-configuration/machine-configuration-azure-automation-migration",
61+
"redirect_document_id": false
62+
},
63+
{
64+
"source_path_from_root": "/articles/governance/policy/concepts/guest-configuration-assignments.md",
65+
"redirect_url": "/azure/governance/machine-configuration/machine-configuration-assignments",
66+
"redirect_document_id": false
67+
},
68+
]
69+
}

.whatsnew/.azure-monitor.json

Lines changed: 77 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,77 @@
1+
{
2+
"$schema": "https://whatsnewapi.azurewebsites.net/schema",
3+
"docSetProductName": "Azure Monitor",
4+
"rootDirectory": "articles/azure-monitor/",
5+
"docLinkSettings": {
6+
"linkFormat": "relative",
7+
"relativeLinkPrefix": "/azure/azure-monitor/"
8+
},
9+
"inclusionCriteria": {
10+
"labels": [
11+
"label:whats-new"
12+
],
13+
"minAdditionsToFile": 1
14+
},
15+
"areas": [
16+
{
17+
"names": ["."],
18+
"heading": "General"
19+
},
20+
{
21+
"names":["agents"],
22+
"heading": "Agents"
23+
},
24+
{
25+
"names":["alters"],
26+
"heading": "Alerts"
27+
},
28+
{
29+
"names":["app"],
30+
"heading": "Application Insights"
31+
},
32+
{
33+
"names":["autoscale"],
34+
"heading": "Autoscale"
35+
},
36+
{
37+
"names":["change"],
38+
"heading": "Change Analysis"
39+
},
40+
{
41+
"names":["containers"],
42+
"heading": "Containers"
43+
},
44+
{
45+
"names":["essentials"],
46+
"heading": "Essentials"
47+
},
48+
{
49+
"names":["insights"],
50+
"heading": "Insights"
51+
},
52+
{
53+
"names":["logs"],
54+
"heading": "Logs"
55+
},
56+
{
57+
"names":["media"],
58+
"heading": "Media"
59+
},
60+
{
61+
"names":["profiler"],
62+
"heading": "Profiler"
63+
},
64+
{
65+
"names":["snapshot-debugger"],
66+
"heading": "Snapshot Debugger"
67+
},
68+
{
69+
"names":["visualize"],
70+
"heading": "Visualize"
71+
},
72+
{
73+
"names":["vm"],
74+
"heading": "VMs"
75+
}
76+
]
77+
}

articles/active-directory-b2c/force-password-reset.md

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ manager: CelesteDG
99
ms.service: active-directory
1010
ms.workload: identity
1111
ms.topic: how-to
12-
ms.date: 01/24/2022
12+
ms.date: 08/04/2022
1313
ms.author: kengaderdus
1414
ms.subservice: B2C
1515
zone_pivot_groups: b2c-policy-type
@@ -98,15 +98,18 @@ Get the example of the force password reset policy on [GitHub](https://github.co
9898

9999
## Force password reset on next login
100100

101-
To force reset the password on next login, update the account password profile using MS Graph [Update user](/graph/api/user-update) operation. The following example updates the password profile [forceChangePasswordNextSignIn](user-profile-attributes.md#password-profile-property) attribute to `true`, which forces the user to reset the password on next login.
101+
To force reset the password on next login, update the account password profile using MS Graph [Update user](/graph/api/user-update) operation. To do this, you need to assign your [Microsoft Graph application](microsoft-graph-get-started.md) the [User administrator](../active-directory/roles/permissions-reference.md#user-administrator) role. Follow the steps in [Grant user administrator role](microsoft-graph-get-started.md?tabs=app-reg-ga#optional-grant-user-administrator-role) to assign your Microsoft Graph application a User administrator role.
102+
103+
The following example updates the password profile [forceChangePasswordNextSignIn](user-profile-attributes.md#password-profile-property) attribute to `true`, which forces the user to reset the password on next login.
102104

103105
```http
104106
PATCH https://graph.microsoft.com/v1.0/users/<user-object-ID>
105107
Content-type: application/json
106108
107109
{
108-
"passwordProfile": {
109-
"forceChangePasswordNextSignIn": true
110+
"passwordProfile": {
111+
"forceChangePasswordNextSignIn": true
112+
}
110113
}
111114
```
112115

articles/active-directory-domain-services/manage-group-policy.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ This article shows you how to install the Group Policy Management tools, then ed
2424
If you are interested in server management strategy, including machines in Azure and
2525
[hybrid connected](../azure-arc/servers/overview.md),
2626
consider reading about the
27-
[guest configuration](../governance/policy/concepts/guest-configuration.md)
27+
[guest configuration](../governance/machine-configuration/overview.md)
2828
feature of
2929
[Azure Policy](../governance/policy/overview.md).
3030

articles/active-directory/enterprise-users/groups-settings-cmdlets.md

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -320,6 +320,10 @@ This step removes settings at directory level, which apply to all Office groups
320320

321321
## Cmdlet syntax reference
322322
You can find more Azure Active Directory PowerShell documentation at [Azure Active Directory Cmdlets](/powershell/azure/active-directory/install-adv2).
323+
324+
## Manage group settings using Microsoft Graph
325+
326+
To configure and manage group settings using Microsoft Graph, see the [groupSetting resource type](/graph/api/resources/groupsetting?view=graph-rest-1.0&preserve-view=true) and its associated methods.
323327

324328
## Additional reading
325329

articles/active-directory/index.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ metadata:
1313
author: rolyon
1414
ms.author: rolyon
1515
manager: CelesteDG
16-
ms.date: 06/01/2022
16+
ms.date: 08/03/2022
1717

1818
highlightedContent:
1919
# itemType: architecture | concept | deploy | download | get-started | how-to-guide | learn | overview | quickstart | reference | tutorial | whats-new
@@ -27,9 +27,9 @@ highlightedContent:
2727
- title: Azure AD feature deployment guide
2828
itemType: concept
2929
url: ./fundamentals/active-directory-deployment-checklist-p2.md
30-
- title: Workload identities
31-
itemType: concept
32-
url: ./develop/workload-identities-overview.md
30+
- title: Microsoft Entra
31+
itemType: get-started
32+
url: https://docs.microsoft.com/entra
3333

3434
conceptualContent:
3535
# itemType: architecture | concept | deploy | download | get-started | how-to-guide | learn | overview | quickstart | reference | sample | tutorial | video | whats-new

articles/active-directory/saas-apps/google-apps-tutorial.md

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ ms.service: active-directory
99
ms.subservice: saas-app-tutorial
1010
ms.workload: identity
1111
ms.topic: tutorial
12-
ms.date: 12/27/2021
12+
ms.date: 08/04/2022
1313
ms.author: jeedes
1414
---
1515

@@ -53,7 +53,11 @@ To test the steps in this tutorial, you should follow these recommendations:
5353

5454
4. **Q: Can I enable single sign-on for only a subset of my Google Cloud / G Suite Connector by Microsoft users?**
5555

56-
A: No, turning on single sign-on immediately requires all your Google Cloud / G Suite Connector by Microsoft users to authenticate with their Azure AD credentials. Because Google Cloud / G Suite Connector by Microsoft doesn't support having multiple identity providers, the identity provider for your Google Cloud / G Suite Connector by Microsoft environment can either be Azure AD or Google -- but not both at the same time.
56+
A: Yes, the SSO profiles can be selected per User, Organizational Unit or Group in the Google Workspace.
57+
58+
![Screenshot for SSO profile assignment.](./media/google-apps-tutorial/profile-assignment.png)
59+
60+
Select the SSO profile as "none" for the Google Workspace group. This prevents members of this (Google Workspace group) from being redirected to Azure AD for logon.
5761

5862
5. **Q: If a user is signed in through Windows, are they automatically authenticate to Google Cloud / G Suite Connector by Microsoft without getting prompted for a password?**
5963

96 KB
Loading

0 commit comments

Comments
 (0)