Skip to content

Commit 594a8f7

Browse files
authored
Merge pull request #212108 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 12ccbbd + d51d7b9 commit 594a8f7

File tree

8 files changed

+23
-9
lines changed

8 files changed

+23
-9
lines changed

articles/azure-resource-manager/bicep/modules.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -59,6 +59,7 @@ The following example concatenates the deployment name to the module name. If yo
5959
module stgModule 'storageAccount.bicep' = {
6060
name: '${deployment().name}-storageDeploy'
6161
scope: resourceGroup('demoRG')
62+
}
6263
```
6364

6465
If you need to **specify a scope** that is different than the scope for the main file, add the scope property. For more information, see [Set module scope](#set-module-scope).

articles/azure-vmware/concepts-storage.md

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,8 @@ vSAN datastores use data-at-rest encryption by default using keys stored in Azur
4949

5050
## Azure storage integration
5151

52-
You can use Azure storage services in workloads running in your private cloud. The Azure storage services include Storage Accounts, Table Storage, and Blob Storage. The connection of workloads to Azure storage services doesn't traverse the internet. This connectivity provides more security and enables you to use SLA-based Azure storage services in your private cloud workloads. You can also connect Azure disk pools or [Azure NetApp Files datastores](attach-azure-netapp-files-to-azure-vmware-solution-hosts.md) to expand the storage capacity.
52+
You can use Azure storage services in workloads running in your private cloud. The Azure storage services include Storage Accounts, Table Storage, and Blob Storage. The connection of workloads to Azure storage services doesn't traverse the internet. This connectivity provides more security and enables you to use SLA-based Azure storage services in your private cloud workloads.
53+
You can expand the datastore capacity by connecting Azure disk pools or [Azure NetApp Files datastores](attach-azure-netapp-files-to-azure-vmware-solution-hosts.md). Azure NetApp Files is available in Ultra, [Premium and Standard performance tiers](/azure/azure-netapp-files/azure-netapp-files-service-levels) to allow adjusting the performance and cost to the requirements of the workloads.
5354

5455
## Alerts and monitoring
5556

articles/azure-vmware/enable-public-ip-nsx-edge.md

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -38,6 +38,9 @@ With this capability, you have the following features:
3838
The architecture shows Internet access to and from your Azure VMware Solution private cloud using a Public IP directly to the NSX Edge.
3939
:::image type="content" source="media/public-ip-nsx-edge/architecture-internet-access-avs-public-ip.png" alt-text="Diagram that shows architecture of Internet access to and from your Azure VMware Solution Private Cloud using a Public IP directly to the NSX Edge." border="false" lightbox="media/public-ip-nsx-edge/architecture-internet-access-avs-public-ip-expanded.png":::
4040

41+
>[!IMPORTANT]
42+
>The use of Public IP down to the NSX Edge is not compatible with reverse DNS Lookup.
43+
4144
## Configure a Public IP in the Azure portal
4245
1. Log on to the Azure portal.
4346
1. Search for and select Azure VMware Solution.

articles/azure-vmware/enable-sql-azure-hybrid-benefit.md

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -8,26 +8,26 @@ ms.date: 06/14/2022
88

99
# Enable SQL Azure hybrid benefit for Azure VMware Solution (Preview)
1010

11-
In this article, you’ll learn how to apply SQL Azure hybrid benefits to an Azure VMware Solution private cloud by configuring a placement policy. The placement policy defines the number of hosts that are running SQL.
11+
In this article, you’ll learn how to configure SQL Azure hybrid benefits to an Azure VMware Solution private cloud by configuring a placement policy. The placement policy defines the hosts that are running SQL as well as the virtual machines on that host.
1212
>[!IMPORTANT]
1313
> It is important to note that SQL benefits are applied at the host level.
1414
15-
For example, if each host in Azure VMware Solution has 36 cores and you signal that two hosts run SQL, then SQL Azure hybrid benefit will apply to 72 cores.
15+
For example, if each host in Azure VMware Solution has 36 cores and you signal that two hosts run SQL, then SQL Azure hybrid benefit will apply to 72 cores irrespective of the number of SQL or other virtual machines on that host.
1616

1717
## Configure host-VM placement policy
1818
1. From your Azure VMware Solution private cloud, select Azure hybrid benefit, then Create host-VM placement policy.
1919
:::image type="content" source="media/sql-azure-hybrid-benefit/azure-hybrid-benefit.png" alt-text="Diagram that shows how to create a host new virtual machine placement policy.":::
2020

2121
1. Fill in the required fields for creating the placement policy.
2222
1. **Name** – Select the name that identifies this policy.
23-
2. **Type** – Select the type of policy. This type must be VM-Host affinity only.
23+
2. **Type** – Select the type of policy. This type must be a VM-Host affinity rule only.
2424
3. **Azure hybrid benefit** – Select the checkbox to apply the SQL Azure hybrid benefit.
25-
4. **Cluster** – Select the necessary cluster. The policy is applicable per cluster only.
25+
4. **Cluster** – Select the correct cluster. The policy is scoped to host in this cluster only.
2626
1. **Enabled** – Select enabled to apply the policy immediately once created.
2727

2828
:::image type="content" source="media/sql-azure-hybrid-benefit/create-placement-policy.png" alt-text="Diagram that shows how to create a host virtual machine placement policy using the host VM affinity.":::
2929
3. Select the hosts and VMs that will be applied to the VM-Host affinity policy.
30-
1. **Add Hosts** – Select the hosts that will be running SQL.
30+
1. **Add Hosts** – Select the hosts that will be running SQL. When hosts are replaced, policies are re-created on the new hosts automatically.
3131
2. **Add VMs** – Select the VMs that should run on the selected hosts.
3232
3. **Review and Create** the policy.
3333
:::image type="content" source="media/sql-azure-hybrid-benefit/select-policy-host.png" alt-text="Diagram that shows how to create a host virtual machine affinity.":::

articles/data-factory/connector-azure-sql-database.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -919,7 +919,7 @@ When you copy data from/to Azure SQL Database with [Always Encrypted](/sql/relat
919919
920920
1. Store the [Column Master Key (CMK)](/sql/relational-databases/security/encryption/create-and-store-column-master-keys-always-encrypted?view=sql-server-ver15&preserve-view=true) in an [Azure Key Vault](../key-vault/general/overview.md). Learn more on [how to configure Always Encrypted by using Azure Key Vault](/azure/azure-sql/database/always-encrypted-azure-key-vault-configure?tabs=azure-powershell)
921921
922-
2. Make sure to great access to the key vault where the [Column Master Key (CMK)](/sql/relational-databases/security/encryption/create-and-store-column-master-keys-always-encrypted?view=sql-server-ver15&preserve-view=true) is stored. Refer to this [article](/sql/relational-databases/security/encryption/create-and-store-column-master-keys-always-encrypted?view=sql-server-ver15&preserve-view=true#key-vaults) for required permissions.
922+
2. Make sure to get access to the key vault where the [Column Master Key (CMK)](/sql/relational-databases/security/encryption/create-and-store-column-master-keys-always-encrypted?view=sql-server-ver15&preserve-view=true) is stored. Refer to this [article](/sql/relational-databases/security/encryption/create-and-store-column-master-keys-always-encrypted?view=sql-server-ver15&preserve-view=true#key-vaults) for required permissions.
923923
924924
3. Create linked service to connect to your SQL database and enable 'Always Encrypted' function by using either managed identity or service principal.
925925

articles/industrial-iot/overview-what-is-industrial-iot.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ Azure IIoT solutions are built from specific components:
4040

4141
The [Azure IoT Hub](https://azure.microsoft.com/services/iot-hub/) acts as a central message hub for secure, bi-directional communications between any IoT application and the devices it manages. It's an open and flexible cloud platform as a service (PaaS) that supports open-source SDKs and multiple protocols.
4242

43-
Gathering your industrial and business data onto an IoT Hub lets you store your data securely, perform business and efficiency analyses on it, and generate reports from it. You can also apply Microsoft Azure services and tools, such as [Power BI](https://powerbi.microsoft.com), on your combined data.
43+
Gathering your industrial and business data onto an IoT Hub lets you store your data securely, perform business and efficiency analyses on it, and generate reports from it. You can process your combined data with Microsoft Azure services and tools, for example [Azure Stream Analytics](https://docs.microsoft.com/azure/stream-analytics), or visualize in your Business Intelligence platform of choice such as [Power BI](https://powerbi.microsoft.com).
4444

4545
### IoT Edge devices
4646

articles/security/fundamentals/services-technologies.md

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,7 @@ Over time, this list will change and grow, just as Azure does. Make sure to chec
2929
|Service|Description|
3030
|--------|--------|
3131
|[Microsoft Defender for Cloud](../../security-center/security-center-introduction.md)| A cloud workload protection solution that provides security management and advanced threat protection across hybrid cloud workloads.|
32+
|[Microsoft Sentinel](../../sentinel/overview.md)| A scalable, cloud-native solution that delivers intelligent security analytics and threat intelligence across the enterprise.|
3233
|[Azure Key Vault](../../key-vault/general/overview.md)| A secure secrets store for the passwords, connection strings, and other information you need to keep your apps working. |
3334
|[Azure Monitor logs](../../azure-monitor/logs/log-query-overview.md)|A monitoring service that collects telemetry and other data, and provides a query language and analytics engine to deliver operational insights for your apps and resources. Can be used alone or with other services such as Defender for Cloud. |
3435
|[Azure Dev/Test Labs](../../devtest-labs/devtest-lab-overview.md)|A service that helps developers and testers quickly create environments in Azure while minimizing waste and controlling cost. |
@@ -81,7 +82,7 @@ Over time, this list will change and grow, just as Azure does. Make sure to chec
8182
| [Network Security Groups](../../virtual-network/virtual-network-vnet-plan-design-arm.md)| A network-based access control feature using a 5-tuple to make allow or deny decisions. |
8283
| [Azure VPN Gateway](../../vpn-gateway/vpn-gateway-about-vpngateways.md)| A network device used as a VPN endpoint to allow cross-premises access to Azure Virtual Networks. |
8384
| [Azure Application Gateway](../../application-gateway/overview.md)|An advanced web application load balancer that can route based on URL and perform SSL-offloading. |
84-
|[Web application firewall](../../web-application-firewall/afds/afds-overview.md) (WAF)|A feature of Application Gateway that provides centralized protection of your web applications from common exploits and vulnerabilities|
85+
|[Web application firewall](../../web-application-firewall/overview.md) (WAF)|A feature that provides centralized protection of your web applications from common exploits and vulnerabilities|
8586
| [Azure Load Balancer](../../load-balancer/load-balancer-overview.md)|A TCP/UDP application network load balancer. |
8687
| [Azure ExpressRoute](../../expressroute/expressroute-introduction.md)| A dedicated WAN link between on-premises networks and Azure Virtual Networks. |
8788
| [Azure Traffic Manager](../../traffic-manager/traffic-manager-overview.md)| A global DNS load balancer.|
@@ -90,3 +91,7 @@ Over time, this list will change and grow, just as Azure does. Make sure to chec
9091
|[Azure DDoS protection](../../ddos-protection/ddos-protection-overview.md)|Combined with application design best practices, provides defense against DDoS attacks.|
9192
|[Virtual Network service endpoints](../../virtual-network/virtual-network-service-endpoints-overview.md)|Extends your virtual network private address space and the identity of your VNet to the Azure services, over a direct connection.|
9293
|[Azure Private Link](../../private-link/private-link-overview.md)|Provides private connectivity from a virtual network to Azure platform as a service (PaaS), customer-owned, or Microsoft partner services.|
94+
|[Azure Bastion](../../bastion/bastion-overview.md)|A service you deploy that lets you connect to a virtual machine using your browser and the Azure portal.|
95+
|[Azure Front Door](../../frontdoor/front-door-application-security.md)|Provides web application protection capability to safeguard your web applications from network attacks and common web vulnerabilities exploits like SQL Injection or Cross Site Scripting (XSS).|
96+
97+

articles/sentinel/sap/reference-systemconfig.md

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -179,6 +179,10 @@ extractuseremail = <True/False>
179179
apiretry = <True/False>
180180
auditlogforcexal = <True/False>
181181
auditlogforcelegacyfiles = <True/False>
182+
azure_resource_id = <Azure _ResourceId>
183+
# Used to force a specific resource group for the SAP tables in Log Analytics, useful for applying RBAC on SAP data
184+
# example - /subscriptions/1234568-qwer-qwer-qwer-123456789/resourcegroups/RESOURCE_GROUP_NAME/providers/microsoft.compute/virtualmachines/VIRTUAL_MACHINE_NAME
185+
# for more information - https://learn.microsoft.com/azure/azure-monitor/logs/log-standard-columns#_resourceid.
182186

183187
timechunk = <value>
184188
# Default timechunk value is 60 (minutes). For certain tables, the data connector retrieves data from the ABAP server using timechunks (collecting all events that occurred within a certain timestamp). On busy systems this may result in large datasets, so to reduce memory and CPU utilization footprint, consider configuring to a smaller value.

0 commit comments

Comments
 (0)