Skip to content

Commit 9054a53

Browse files
authored
Merge pull request #224456 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 49b986d + 17b5e64 commit 9054a53

File tree

3 files changed

+26
-8
lines changed

3 files changed

+26
-8
lines changed

articles/active-directory/hybrid/how-to-connect-modify-group-writeback.md

Lines changed: 24 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -36,13 +36,28 @@ To configure directory settings to disable automatic writeback of newly created
3636
- PowerShell: Use the [Microsoft Graph PowerShell SDK](/powershell/microsoftgraph/installation?view=graph-powershell-1.0&preserve-view=true). For example:
3737

3838
```PowerShell
39-
# Import Module
40-
Import-Module Microsoft.Graph.Identity.DirectoryManagement
41-
42-
#Connect to MgGraph with necessary scope and select the Beta API Version
43-
Connect-MgGraph -Scopes Directory.ReadWrite.All
44-
Select-MgProfile -Name beta
45-
39+
# Import Module
40+
Import-Module Microsoft.Graph.Identity.DirectoryManagement
41+
42+
#Connect to MgGraph with necessary scope and select the Beta API Version
43+
Connect-MgGraph -Scopes Directory.ReadWrite.All
44+
Select-MgProfile -Name beta
45+
46+
# Verify if "Group.Unified" directory settings exist
47+
$DirectorySetting = Get-MgDirectorySetting | Where-Object {$_.DisplayName -eq "Group.Unified"}
48+
49+
# If "Group.Unified" directory settings exist, update the value for new unified group writeback default
50+
if ($DirectorySetting) {
51+
$DirectorySetting.Values | ForEach-Object {
52+
if ($_.Name -eq "NewUnifiedGroupWritebackDefault") {
53+
$_.Value = "false"
54+
}
55+
}
56+
Update-MgDirectorySetting -DirectorySettingId $DirectorySetting.Id -BodyParameter $DirectorySetting
57+
}
58+
else
59+
{
60+
# In case the directory setting doesn't exist, create a new "Group.Unified" directory setting
4661
# Import "Group.Unified" template values to a hashtable
4762
$Template = Get-MgDirectorySettingTemplate | Where-Object {$_.DisplayName -eq "Group.Unified"}
4863
$TemplateValues = @{}
@@ -52,6 +67,7 @@ To configure directory settings to disable automatic writeback of newly created
5267
5368
# Update the value for new unified group writeback default
5469
$TemplateValues["NewUnifiedGroupWritebackDefault"] = "false"
70+
5571
# Create a directory setting using the Template values hashtable including the updated value
5672
$params = @{}
5773
$params.Add("TemplateId", $Template.Id)
@@ -60,6 +76,7 @@ To configure directory settings to disable automatic writeback of newly created
6076
$params.Values += @(@{Name = $_; Value = $TemplateValues[$_]})
6177
}
6278
New-MgDirectorySetting -BodyParameter $params
79+
}
6380
```
6481

6582
> [!NOTE]

articles/aks/azure-cni-overlay.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ Ingress connectivity to the cluster can be achieved using an ingress controller
4141
Like Azure CNI Overlay, Kubenet assigns IP addresses to pods from an address space logically different from the VNet but has scaling and other limitations. The below table provides a detailed comparison between Kubenet and Azure CNI Overlay. If you do not want to assign VNet IP addresses to pods due to IP shortage, then Azure CNI Overlay is the recommended solution.
4242

4343
| Area | Azure CNI Overlay | Kubenet |
44-
| -- | :--: | -- |
44+
| -- | -- | -- |
4545
| Cluster scale | 1000 nodes and 250 pods/node | 400 nodes and 250 pods/node |
4646
| Network configuration | Simple - no additional configuration required for pod networking | Complex - requires route tables and UDRs on cluster subnet for pod networking |
4747
| Pod connectivity performance | Performance on par with VMs in a VNet | Additional hop adds minor latency |

articles/azure-monitor/essentials/prometheus-metrics-enable.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -114,6 +114,7 @@ The output will be similar to the following:
114114
### Prerequisites
115115

116116
- Register the `AKS-PrometheusAddonPreview` feature flag in the Azure Kubernetes clusters subscription with the following command in Azure CLI: `az feature register --namespace Microsoft.ContainerService --name AKS-PrometheusAddonPreview`.
117+
- If the Azure Managed Grafana instance is in a subscription other than the Azure Monitor Workspaces subscription, then please register the Azure Monitor Workspace subscription with the `Microsoft.Dashboard` resource provider following this [documentation](/azure-resource-manager/management/resource-providers-and-types#register-resource-provider.md#register-resource-provider).
117118
- The Azure Monitor workspace and Azure Managed Grafana workspace must already be created.
118119
- The template needs to be deployed in the same resource group as the Azure Managed Grafana workspace.
119120

0 commit comments

Comments
 (0)