Skip to content

Commit 6a39314

Browse files
authored
Merge pull request #90499 from MicrosoftDocs/repo_sync_working_branch
Confirm merge from repo_sync_working_branch to master to sync with https://github.com/Microsoft/azure-docs (branch master)
2 parents ef9fc1a + 21dccec commit 6a39314

File tree

7 files changed

+466
-465
lines changed

7 files changed

+466
-465
lines changed

articles/azure-monitor/insights/container-insights-log-search.md

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -64,6 +64,7 @@ It's often useful to build queries that start with an example or two and then mo
6464
| ContainerImageInventory<br> &#124; summarize AggregatedValue = count() by Image, ImageTag, Running | Image inventory |
6565
| **Select the Line chart display option**:<br> Perf<br> &#124; where ObjectName == "K8SContainer" and CounterName == "cpuUsageNanoCores" &#124; summarize AvgCPUUsageNanoCores = avg(CounterValue) by bin(TimeGenerated, 30m), InstanceName | Container CPU |
6666
| **Select the Line chart display option**:<br> Perf<br> &#124; where ObjectName == "K8SContainer" and CounterName == "memoryRssBytes" &#124; summarize AvgUsedRssMemoryBytes = avg(CounterValue) by bin(TimeGenerated, 30m), InstanceName | Container memory |
67+
| InsightsMetrics<br> &#124; where Name == "requests_count"<br> &#124; summarize Val=any(Val) by TimeGenerated=bin(TimeGenerated, 1m)<br> &#124; sort by TimeGenerated asc<br> &#124; project RequestsPerMinute = Val - prev(Val), TimeGenerated <br> &#124; render barchart | Requests Per Minute with Custom Metrics |
6768

6869
The following example is a Prometheus metrics query. The metrics collected are counts and in order to determine how many errors occurred within a specific time period, we have to subtract from the count. The dataset is partitioned by *partitionKey*, meaning for each unique set of *Name*, *HostName*, and *OperationType*, we run a subquery on that set that orders the logs by *TimeGenerated*, a process that makes it possible to find the previous *TimeGenerated* and the count recorded for that time, to determine a rate.
6970

@@ -99,4 +100,4 @@ The output will show results similar to the following:
99100

100101
## Next steps
101102

102-
Azure Monitor for containers does not include a predefined set of alerts. Review the [Create performance alerts with Azure Monitor for containers](container-insights-alerts.md) to learn how to create recommended alerts for high CPU and memory utilization to support your DevOps or operational processes and procedures.
103+
Azure Monitor for containers does not include a predefined set of alerts. Review the [Create performance alerts with Azure Monitor for containers](container-insights-alerts.md) to learn how to create recommended alerts for high CPU and memory utilization to support your DevOps or operational processes and procedures.

articles/governance/management-groups/create.md

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -32,9 +32,13 @@ can't use Resource Manager templates to create management groups.
3232

3333
1. Log into the [Azure portal](https://portal.azure.com).
3434

35-
1. Select **All services** > **Management groups**.
35+
1. Select **All services** > **Management + governance**.
3636

37-
1. On the main page, select **New Management group**.
37+
1. Select **Cost Management + Billing**
38+
39+
1. On the Cost Management + Billing - Management groups page, select **Management Groups**
40+
41+
1. Select **+ Add management group**.
3842

3943
![Page for working with management groups](./media/main.png)
4044

@@ -100,4 +104,4 @@ To learn more about management groups, see:
100104
- [How to change, delete, or manage your management groups](manage.md)
101105
- [Review management groups in Azure PowerShell Resources Module](/powershell/module/az.resources#resources)
102106
- [Review management groups in REST API](/rest/api/resources/managementgroups)
103-
- [Review management groups in Azure CLI](/cli/azure/account/management-group)
107+
- [Review management groups in Azure CLI](/cli/azure/account/management-group)

articles/key-vault/key-vault-subscription-move-fix.md

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -41,6 +41,8 @@ Because this vault was in tenant A before the move, the original value of **$vau
4141

4242
Now that your vault is associated with the correct tenant ID and old access policy entries are removed, set new access policy entries with [Set-AzKeyVaultAccessPolicy](https://docs.microsoft.com/powershell/module/az.keyvault/Set-azKeyVaultAccessPolicy).
4343

44+
If you are using MSI, you'll also have to update the MSI identity since the old identity will no longer be in the correct AAD tenant.
45+
4446
## Next steps
4547

4648
If you have questions about Azure Key Vault, visit the [Azure Key Vault Forums](https://social.msdn.microsoft.com/forums/azure/home?forum=AzureKeyVault).

articles/role-based-access-control/role-assignments-template.md

Lines changed: 4 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -154,6 +154,9 @@ New-AzDeployment -Location centralus -TemplateFile rbac-test.json -principalId $
154154
az deployment create --location centralus --template-file rbac-test.json --parameters principalId=$userid builtInRoleType=Reader
155155
```
156156

157+
> [!NOTE]
158+
> This template is not idempotent unless the same `roleNameGuid` value is provided as a parameter for each deployment of the template. If no `roleNameGuid` is provided, by default a new GUID is generated on each deployment and subsequent deployments will fail with a `Conflict: RoleAssignmentExists` error.
159+
157160
## Create a role assignment at a resource scope
158161

159162
If you need to create a role assignment at the level of a resource, the format of the role assignment is different. You provide the resource provider namespace and resource type of the resource to assign the role to. You also include the name of the resource in the name of the role assignment.
@@ -175,8 +178,6 @@ To use the template, you must specify the following inputs:
175178

176179
- The unique identifier of a user, group, or application to assign the role to
177180
- The role to assign
178-
- A unique identifier that will be used for the role assignment, or you can use the default identifier
179-
180181

181182
```json
182183
{
@@ -200,13 +201,6 @@ To use the template, you must specify the following inputs:
200201
"description": "Built-in role to assign"
201202
}
202203
},
203-
"roleNameGuid": {
204-
"type": "string",
205-
"defaultValue": "[newGuid()]",
206-
"metadata": {
207-
"description": "A new GUID used to identify the role assignment"
208-
}
209-
},
210204
"location": {
211205
"type": "string",
212206
"defaultValue": "[resourceGroup().location]"
@@ -233,7 +227,7 @@ To use the template, you must specify the following inputs:
233227
{
234228
"type": "Microsoft.Storage/storageAccounts/providers/roleAssignments",
235229
"apiVersion": "2018-09-01-preview",
236-
"name": "[concat(variables('storageName'), '/Microsoft.Authorization/', parameters('roleNameGuid'))]",
230+
"name": "[concat(variables('storageName'), '/Microsoft.Authorization/', guid(uniqueString(parameters('storageName'))))]",
237231
"dependsOn": [
238232
"[variables('storageName')]"
239233
],

0 commit comments

Comments
 (0)