Skip to content

Commit 32e26c2

Browse files
authored
Merge pull request #90658 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 e8826ac + 8489df3 commit 32e26c2

File tree

5 files changed

+14
-10
lines changed

5 files changed

+14
-10
lines changed

articles/azure-monitor/app/ip-addresses.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -218,7 +218,7 @@ Note: *.loganalytics.io domain is owned by the Log Analytics team.
218218

219219
| Purpose | URI | IP | Ports |
220220
| --- | --- | --- | --- |
221-
| Agent | agent.azureserviceprofiler.net<br/>*.agent.azureserviceprofiler.net | 20.190.60.38<br/>20.190.60.32<br/>52.173.196.230<br/>52.173.196.209<br/>23.102.44.211<br/>23.102.45.216<br/>13.69.51.218<br/>13.69.51.175<br/>138.91.32.98<br/>138.91.37.93<br/>40.121.61.208<br/>40.121.57.2<br/>51.140.60.235<br/>51.140.180.52<br/>52.138.31.112<br/>52.138.31.127<br/>104.211.90.234<br/>104.211.91.254<br/>13.70.124.27<br/>13.75.195.15<br/>52.185.132.101<br/>52.185.132.170<br/>20.188.36.28<br/>40.89.153.171<br/>52.141.22.239<br/>52.141.22.149<br/>102.133.162.233<br/>102.133.161.73 | 443
221+
| Agent | agent.azureserviceprofiler.net<br/>*.agent.azureserviceprofiler.net | 20.190.60.38<br/>20.190.60.32<br/>52.173.196.230<br/>52.173.196.209<br/>23.102.44.211<br/>23.102.45.216<br/>13.69.51.218<br/>13.69.51.175<br/>138.91.32.98<br/>138.91.37.93<br/>40.121.61.208<br/>40.121.57.2<br/>51.140.60.235<br/>51.140.180.52<br/>52.138.31.112<br/>52.138.31.127<br/>104.211.90.234<br/>104.211.91.254<br/>13.70.124.27<br/>13.75.195.15<br/>52.185.132.101<br/>52.185.132.170<br/>20.188.36.28<br/>40.89.153.171<br/>52.141.22.239<br/>52.141.22.149<br/>102.133.162.233<br/>102.133.161.73<br/>191.232.214.6<br/>191.232.213.239 | 443
222222
| Portal | gateway.azureserviceprofiler.net | dynamic | 443
223223
| Storage | *.core.windows.net | dynamic | 443
224224

@@ -229,6 +229,6 @@ Note: *.loganalytics.io domain is owned by the Log Analytics team.
229229
230230
| Purpose | URI | IP | Ports |
231231
| --- | --- | --- | --- |
232-
| Agent | ppe.azureserviceprofiler.net<br/>*.ppe.azureserviceprofiler.net | 20.190.60.38<br/>20.190.60.32<br/>52.173.196.230<br/>52.173.196.209<br/>23.102.44.211<br/>23.102.45.216<br/>13.69.51.218<br/>13.69.51.175<br/>138.91.32.98<br/>138.91.37.93<br/>40.121.61.208<br/>40.121.57.2<br/>51.140.60.235<br/>51.140.180.52<br/>52.138.31.112<br/>52.138.31.127<br/>104.211.90.234<br/>104.211.91.254<br/>13.70.124.27<br/>13.75.195.15<br/>52.185.132.101<br/>52.185.132.170<br/>20.188.36.28<br/>40.89.153.171<br/>52.141.22.239<br/>52.141.22.149<br/>102.133.162.233<br/>102.133.161.73 | 443
232+
| Agent | ppe.azureserviceprofiler.net<br/>*.ppe.azureserviceprofiler.net | 20.190.60.38<br/>20.190.60.32<br/>52.173.196.230<br/>52.173.196.209<br/>23.102.44.211<br/>23.102.45.216<br/>13.69.51.218<br/>13.69.51.175<br/>138.91.32.98<br/>138.91.37.93<br/>40.121.61.208<br/>40.121.57.2<br/>51.140.60.235<br/>51.140.180.52<br/>52.138.31.112<br/>52.138.31.127<br/>104.211.90.234<br/>104.211.91.254<br/>13.70.124.27<br/>13.75.195.15<br/>52.185.132.101<br/>52.185.132.170<br/>20.188.36.28<br/>40.89.153.171<br/>52.141.22.239<br/>52.141.22.149<br/>102.133.162.233<br/>102.133.161.73<br/>191.232.214.6<br/>191.232.213.239 | 443
233233
| Portal | ppe.gateway.azureserviceprofiler.net | dynamic | 443
234234
| Storage | *.core.windows.net | dynamic | 443

articles/virtual-network/virtual-network-nsg-manage-log.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -19,8 +19,8 @@ ms.author: kumud
1919

2020
A network security group (NSG) includes rules that allow or deny traffic to a virtual network subnet, network interface, or both. When you enable diagnostic logging for an NSG, you can log the following categories of information:
2121

22-
* **Event:** Entries are logged for which NSG rules are applied to VMs, based on MAC address. The status for these rules is collected every 60 seconds.
23-
* **Rule counter:** Contains entries for how many times each NSG rule is applied to deny or allow traffic.
22+
* **Event:** Entries are logged for which NSG rules are applied to VMs, based on MAC address.
23+
* **Rule counter:** Contains entries for how many times each NSG rule is applied to deny or allow traffic. The status for these rules is collected every 60 seconds.
2424

2525
Diagnostic logs are only available for NSGs deployed through the Azure Resource Manager deployment model. You cannot enable diagnostic logging for NSGs deployed through the classic deployment model. For a better understanding of the two models, see [Understanding Azure deployment models](../resource-manager-deployment-model.md?toc=%2fazure%2fvirtual-network%2ftoc.json).
2626

@@ -207,4 +207,4 @@ To learn how to view diagnostic log data, see [Azure Diagnostic Logs overview](.
207207
- Microsoft.ClassicNetwork/networkSecurityGroups/securityRules
208208
- Microsoft.Network/networkSecurityGroups
209209
- Microsoft.Network/networkSecurityGroups/securityRules
210-
- To learn how to log diagnostic information, to include the source IP address for each flow, see [NSG flow logging](../network-watcher/network-watcher-nsg-flow-logging-portal.md?toc=%2fazure%2fvirtual-network%2ftoc.json).
210+
- To learn how to log diagnostic information, to include the source IP address for each flow, see [NSG flow logging](../network-watcher/network-watcher-nsg-flow-logging-portal.md?toc=%2fazure%2fvirtual-network%2ftoc.json).

includes/azure-monitor-limits-app-insights.md

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -19,11 +19,11 @@ There are some limits on the number of metrics and events per application, that
1919
| Data retention | 90 days | This resource is for [Search](../articles/azure-monitor/app/diagnostic-search.md), [Analytics](../articles/azure-monitor/app/analytics.md), and [Metrics Explorer](../articles/azure-monitor/app/metrics-explorer.md).
2020
| [Availability multi-step test](../articles/azure-monitor/app/availability-multistep.md) detailed results retention | 90 days | This resource provides detailed results of each step.
2121
| Maximum event size | 64,000 |
22-
| Property and metric name length | 150 | See [type schemas](https://github.com/Microsoft/ApplicationInsights-Home/blob/master/EndpointSpecs/Schemas/Docs/).
23-
| Property value string length | 8,192 | See [type schemas](https://github.com/Microsoft/ApplicationInsights-Home/blob/master/EndpointSpecs/Schemas/Docs/).
24-
| Trace and exception message length | 32,768 | See [type schemas](https://github.com/Microsoft/ApplicationInsights-Home/blob/master/EndpointSpecs/Schemas/Docs/).
22+
| Property and metric name length | 150 | See [type schemas](https://github.com/Microsoft/ApplicationInsights-Home/tree/master/EndpointSpecs/Schemas/Bond/).
23+
| Property value string length | 8,192 | See [type schemas](https://github.com/Microsoft/ApplicationInsights-Home/tree/master/EndpointSpecs/Schemas/Bond/).
24+
| Trace and exception message length | 32,768 | See [type schemas](https://github.com/Microsoft/ApplicationInsights-Home/tree/master/EndpointSpecs/Schemas/Bond/).
2525
| [Availability tests](../articles/azure-monitor/app/monitor-web-app-availability.md) count per app | 100 |
2626
| [Profiler](../articles/azure-monitor/app/profiler.md) data retention | 5 days |
2727
| [Profiler](../articles/azure-monitor/app/profiler.md) data sent per day | 10 GB |
2828

29-
For more information, see [About pricing and quotas in Application Insights](../articles/azure-monitor/app/pricing.md).
29+
For more information, see [About pricing and quotas in Application Insights](../articles/azure-monitor/app/pricing.md).

includes/firewall-limits.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
|Rules|10,000, all rule types combined.|
1717
|Minimum AzureFirewallSubnet size |/26|
1818
|Port range in network and application rules|0-64,000. Work is in progress to relax this limitation.|
19-
|Public IP addresses|100 maximum|
19+
|Public IP addresses|100 maximum (Currently, SNAT ports are added only for the first five public IP addresses.)|
2020
|Route table|By default, AzureFirewallSubnet has a 0.0.0.0/0 route with the NextHopType value set to **Internet**.<br><br>Azure Firewall must have direct Internet connectivity. If your AzureFirewallSubnet learns a default route to your on-premises network via BGP, you must override that with a 0.0.0.0/0 UDR with the **NextHopType** value set as **Internet** to maintain direct Internet connectivity. By default, Azure Firewall doesn't support forced tunneling to an on-premises network.<br><br>However, if your configuration requires forced tunneling to an on-premises network, Microsoft will support it on a case by case basis. Contact Support so that we can review your case. If accepted, we'll allow your subscription and ensure the required firewall Internet connectivity is maintained.|
2121

2222
<sup>1</sup>If you need to increase these limits, contact Azure Support.

includes/virtual-machines-faq-for-disks.md

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -289,6 +289,10 @@ Yes
289289

290290
Yes.
291291

292+
**Is the boot volume encrypted by default on a managed disk?**
293+
294+
Yes. By default, all managed disks are encrypted, including the OS disk.
295+
292296
**Who manages the encryption keys?**
293297

294298
Microsoft manages the encryption keys.

0 commit comments

Comments
 (0)