Skip to content

Commit 81147ca

Browse files
committed
Merge branch 'main' of https://github.com/MicrosoftDocs/azure-docs-pr into WI269315-compliance-standards
2 parents f4470bc + c2255cc commit 81147ca

File tree

323 files changed

+7259
-6918
lines changed

Some content is hidden

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

323 files changed

+7259
-6918
lines changed

.openpublishing.redirection.defender-for-cloud.json

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,25 @@
11
{
22
"redirections": [
3+
{
4+
"source_path_from_root": "/articles/defender-for-cloud/recommendations-reference.md",
5+
"redirect_url": "/azure/defender-for-cloud/security-policy-concept",
6+
"redirect_document_id": false
7+
},
8+
{
9+
"source_path_from_root": "/articles/defender-for-cloud/recommendations-reference-gcp.md",
10+
"redirect_url": "/azure/defender-for-cloud/security-policy-concept",
11+
"redirect_document_id": false
12+
},
13+
{
14+
"source_path_from_root": "/articles/defender-for-cloud/recommendations-reference-aws.md",
15+
"redirect_url": "/azure/defender-for-cloud/security-policy-concept",
16+
"redirect_document_id": false
17+
},
18+
{
19+
"source_path_from_root": "/articles/defender-for-cloud/upcoming-changes.md",
20+
"redirect_url": "/azure/defender-for-cloud/release-notes",
21+
"redirect_document_id": false
22+
},
323
{
424
"source_path_from_root": "/articles/defender-for-cloud/secret-scanning.md",
525
"redirect_url": "/azure/defender-for-cloud/secrets-scanning-servers",

articles/advisor/advisor-reference-performance-recommendations.md

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -455,25 +455,25 @@ Learn more about [Azure Database for PostgreSQL flexible server - Upscale Server
455455

456456
Our system shows that you have log_statement enabled, for better performance set it to NONE
457457

458-
Learn more about [Azure Database for PostgreSQL flexible server - Optimize log_statement settings for PostgreSQL on Azure Database](/azure/postgresql/flexible-server/concepts-logging.md).
458+
Learn more about [Azure Database for PostgreSQL flexible server - Optimize log_statement settings for PostgreSQL on Azure Database](/azure/postgresql/flexible-server/concepts-logging).
459459

460460
### Optimize log_duration settings for PostgreSQL on Azure Database
461461

462462
You may experience potential performance degradation due to logging settings. To optimize these settings, set the log_duration server parameter to OFF.
463463

464-
Learn more about [Learn more about Azure Database for PostgreSQL flexible server - Optimize log_duration settings for PostgreSQL on Azure Database](/azure/postgresql/flexible-server/concepts-logging.md).
464+
Learn more about [Learn more about Azure Database for PostgreSQL flexible server - Optimize log_duration settings for PostgreSQL on Azure Database](/azure/postgresql/flexible-server/concepts-logging).
465465

466466
### Optimize log_min_duration settings for PostgreSQL on Azure Database
467467

468468
Your log_min_duration server parameter is set to less than 60,000 ms (1 minute), which can lead to potential performance degradation. You can optimize logging settings by setting the log_min_duration_statement parameter to -1.
469469

470-
Learn more about [Azure Database for PostgreSQL flexible server - Optimize log_min_duration settings for PostgreSQL on Azure Database](/azure/postgresql/flexible-server/concepts-logging.md).
470+
Learn more about [Azure Database for PostgreSQL flexible server - Optimize log_min_duration settings for PostgreSQL on Azure Database](/azure/postgresql/flexible-server/concepts-logging).
471471

472472
### Optimize log_error_verbosity settings for PostgreSQL on Azure Database
473473

474474
Your server has been configured to output VERBOSE error logs. This can be useful for troubleshooting your database, but it can also result in reduced database performance. To improve performance, we recommend changing the log_error_verbosity server parameter to the DEFAULT setting.
475475

476-
Learn more about [Learn more about Azure Database for PostgreSQL flexible server - Optimize log_error_verbosity settings for PostgreSQL on Azure Database](/azure/postgresql/flexible-server/concepts-logging.md).
476+
Learn more about [Learn more about Azure Database for PostgreSQL flexible server - Optimize log_error_verbosity settings for PostgreSQL on Azure Database](/azure/postgresql/flexible-server/concepts-logging).
477477

478478
### Identify if checkpoints are happening too often to improve PostgreSQL - Flexible Server performance
479479

articles/aks/azure-csi-blob-storage-provision.md

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ author: tamram
77
ms.author: tamram
88
ms.topic: article
99
ms.subservice: aks-storage
10-
ms.date: 04/22/2024
10+
ms.date: 07/08/2024
1111
---
1212

1313
# Create and use a volume with Azure Blob storage in Azure Kubernetes Service (AKS)
@@ -270,7 +270,6 @@ The following table includes parameters you can use to define a persistent volum
270270
|--- | **Following parameters are only for feature: blobfuse<br> [Managed Identity and Service Principal Name authentication](https://github.com/Azure/azure-storage-fuse#environment-variables)** | --- | --- |--- |
271271
|volumeAttributes.AzureStorageAuthType | Specify the authentication type. | `Key`, `SAS`, `MSI`, `SPN` | No | `Key`|
272272
|volumeAttributes.AzureStorageIdentityClientID | Specify the Identity Client ID. | | No ||
273-
|volumeAttributes.AzureStorageIdentityObjectID | Specify the Identity Object ID. | | No ||
274273
|volumeAttributes.AzureStorageIdentityResourceID | Specify the Identity Resource ID. | | No ||
275274
|volumeAttributes.MSIEndpoint | Specify the MSI endpoint. | | No ||
276275
|volumeAttributes.AzureStorageSPNClientID | Specify the Azure Service Principal Name (SPN) Client ID. | | No ||

articles/azure-arc/vmware-vsphere/enable-guest-management-at-scale.md

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
title: Install Arc agent at scale for your VMware VMs
33
description: Learn how to enable guest management at scale for Arc enabled VMware vSphere VMs.
44
ms.topic: how-to
5-
ms.date: 04/23/2024
5+
ms.date: 07/08/2024
66
ms.service: azure-arc
77
ms.subservice: azure-arc-vmware-vsphere
88
author: PriskeyJeronika-MS
@@ -158,20 +158,20 @@ Arc agents can be installed directly on machines without relying on VMware tools
158158

159159
- The following command scans all the Arc for Server machines that belong to the vCenter in the specified subscription and links the machines with that vCenter.
160160

161-
```azurecli
162-
az connectedvmware vm create-from-machines --subscription contoso-sub --vcenter-id /subscriptions/fedcba98-7654-3210-0123-456789abcdef/resourceGroups/contoso-rg-2/providers/Microsoft.HybridCompute/vcenters/contoso-vcenter
161+
```azurecli-interactive
162+
az connectedvmware vm create-from-machines --subscription contoso-sub --vcenter-id /subscriptions/999998ee-cd13-9999-b9d4-55ca5c25496d/resourceGroups/allhands-demo/providers/microsoft.connectedvmwarevsphere/VCenters/ContosovCentervcenters/contoso-vcenter
163163
```
164164
165165
- The following command scans all the Arc for Server machines that belong to the vCenter in the specified Resource Group and links the machines with that vCenter.
166166
167-
```azurecli
168-
az connectedvmware vm create-from-machines --resource-group contoso-rg --vcenter-id /subscriptions/fedcba98-7654-3210-0123-456789abcdef/resourceGroups/contoso-rg-2/providers/Microsoft.HybridCompute/vcenters/contoso-vcenter.
167+
```azurecli-interactive
168+
az connectedvmware vm create-from-machines --resource-group contoso-rg --vcenter-id /subscriptions/999998ee-cd13-9999-b9d4-55ca5c25496d/resourceGroups/allhands-demo/providers/microsoft.connectedvmwarevsphere/VCenters/ContosovCentervcenters/contoso-vcenter
169169
```
170170
171171
- The following command can be used to link an individual Arc for Server resource to vCenter.
172172
173-
```azurecli
174-
az connectedvmware vm create-from-machines --resource-group contoso-rg --name contoso-vm --vcenter-id /subscriptions/fedcba98-7654-3210-0123-456789abcdef/resourceGroups/contoso-rg-2/providers/Microsoft.HybridCompute/vcenters/contoso-vcenter
173+
```azurecli-interactive
174+
az connectedvmware vm create-from-machines --subscription contoso-sub --vcenter-id /subscriptions/999998ee-cd13-9999-b9d4-55ca5c25496d/resourceGroups/allhands-demo/providers/microsoft.connectedvmwarevsphere/VCenters/ContosovCentervcenters/contoso-vcenter
175175
```
176176
177177
## Next steps

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

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -108,6 +108,9 @@ For sample alerts that use the common schema, see [Sample alert payloads](alerts
108108
| firedDateTime | The date and time when the alert instance was fired in Coordinated Universal Time (UTC). |
109109
| resolvedDateTime | The date and time when the monitor condition for the alert instance is set to **Resolved** in UTC. Currently only applicable for metric alerts.|
110110
| description | The description, as defined in the alert rule. |
111+
| alertRuleID | The ID of the alert rule that generated the alert instance.|
112+
| resourceType | The resource type affected by the alert.|
113+
| resourceGroupName | Name of the resource group for the impacted resource.|
111114
|essentialsVersion| The version number for the essentials section.|
112115
|alertContextVersion | The version number for the `alertContext` section.|
113116
|investigationLink | Link to investigate the alert in Azure Monitor. Currently requires limited preview registration.|

articles/azure-monitor/logs/summary-rules.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -98,9 +98,9 @@ Instead of logging hundreds of similar entries within an hour, the destination t
9898

9999
## Pricing model
100100

101-
Summary rules don't have a direct cost, and you only pay for the query on the source table(s) and the ingestion to the destination table:
101+
There is no direct cost for Summary rules, and you only pay for the query on the source table and the results ingestion to the destination table:
102102

103-
| Source table plan | Query cost | Query results ingestion cost |
103+
| Source table plan | Query cost | Summary results ingestion cost |
104104
| --- | --- | --- |
105105
| Analytics | No cost | Analytics ingested GB |
106106
| Basic | Scanned GB | Analytics ingested GB |

0 commit comments

Comments
 (0)