Skip to content

Commit 083efcb

Browse files
authored
Merge pull request #205063 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 fdde827 + 65ae5d1 commit 083efcb

File tree

6 files changed

+33
-15
lines changed

6 files changed

+33
-15
lines changed

articles/aks/learn/quick-windows-container-deploy-cli.md

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -162,6 +162,8 @@ When ready, refresh the registration of the *Microsoft.ContainerService* resourc
162162
```azurecli-interactive
163163
az provider register --namespace Microsoft.ContainerService
164164
```
165+
> [!NOTE]
166+
> Windows Server 2022 requires Kubernetes version "1.23.0" or higher.
165167
166168
Use `az aks nodepool add` command to add a Windows Server 2022 node pool:
167169

articles/azure-monitor/app/sdk-connection-string.md

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -90,7 +90,12 @@ See also: [Regions that require endpoint modification](./custom-endpoints.md#reg
9090
- [Profiler](./profiler-overview.md): `profiler`
9191
- [Snapshot](./snapshot-debugger.md): `snapshot`
9292

93+
#### Is Connection string a secret?
9394

95+
Connection string contains iKey which is a unique identifier used by the ingestion service to associate telemetry to a specific Application Insights resource. It is not to be considered a security token or key. The ingestion endpoint provides Azure AD-based authenticated telemetry ingestion options if you want to protect your AI resource from misuse.
96+
97+
> [!NOTE]
98+
> Application Insights JavaScript SDK requires the connection string to be passed in during initialization/configuration. This is viewable in plain text in client browsers. There is no easy way to use the Azure AD-based authentication for browser telemetry. It is recommended that customers consider creating a separate Application Insights resource for browser telemetry if they need to secure the service telemetry.
9499
95100
## Connection string examples
96101

@@ -297,4 +302,4 @@ Get started at development time with:
297302
* [ASP.NET Core](./asp-net-core.md)
298303
* [Java](./java-in-process-agent.md)
299304
* [Node.js](./nodejs.md)
300-
* [Python](./opencensus-python.md)
305+
* [Python](./opencensus-python.md)

articles/azure-vmware/includes/azure-vmware-solutions-limits.md

Lines changed: 10 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ title: Azure VMware Solution limits
33
description: Azure VMware Solution limitations.
44
ms.topic: include
55
ms.service: azure-vmware
6-
ms.date: 09/02/2021
6+
ms.date: 07/18/2022
77
author: suzizuber
88
ms.author: v-szuber
99
---
@@ -24,5 +24,13 @@ The following table describes the maximum limits for Azure VMware Solution.
2424
| Azure VMware Solution ExpressRoute port speed | 10 Gbps<br />The virtual network gateway used determines the actual bandwidth. For more details, see [About ExpressRoute virtual network gateways](../../expressroute/expressroute-about-virtual-network-gateways.md) |
2525
| Public IPs exposed via vWAN | 100 |
2626
| vSAN capacity limits | 75% of total usable (keep 25% available for SLA) |
27+
| VMware Site Recovery Manager - Number of protected Virtual Machines | 1,000 |
28+
| VMware Site Recovery Manager - Number of Virtual Machines per recovery plan | 1,000 |
29+
| VMware Site Recovery Manager - Number of protection groups per recovery plan | 250 |
30+
| VMware Site Recovery Manager - RPO Values | 5 min or higher * |
31+
| VMware Site Recovery Manager - Total number of virtual machines per protection group | 500 |
32+
| VMware Site Recovery Manager - Total number of recovery plans | 250 |
2733

28-
For other VMware-specific limits, use the [VMware configuration maximum tool!](https://configmax.vmware.com/).
34+
\* For information about Recovery Point Objective (RPO) lower than 15 minutes, see [How the 5 Minute Recovery Point Objective Works](https://docs.vmware.com/en/vSphere-Replication/8.3/com.vmware.vsphere.replication-admin.doc/GUID-9E17D567-A947-49CD-8A84-8EA2D676B55A.html) in the _vSphere Replication Administration guide_.
35+
36+
For other VMware-specific limits, use the [VMware configuration maximum tool](https://configmax.vmware.com/).

articles/container-instances/container-instances-managed-identity.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -102,7 +102,7 @@ spID=$(az identity show \
102102
resourceID=$(az identity show \
103103
--resource-group myResourceGroup \
104104
--name myACIId \
105-
--query id --output tsv)
105+
--query id --output none)
106106
```
107107

108108
### Grant user-assigned identity access to the key vault

articles/virtual-machines/workloads/sap/hana-onboarding-requirements.md

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -32,13 +32,14 @@ This article lists the requirements for running SAP HANA on Azure Large Instance
3232

3333
## Operating system
3434

35-
- Licenses for SUSE Linux Enterprise Server 12 for SAP Applications.
35+
- Licenses for SUSE Linux Enterprise Server 12 and SUSE Linux Enterprise Server 15 for SAP Applications.
3636

3737
> [!NOTE]
3838
> The operating system delivered by Microsoft isn't registered with SUSE. It isn't connected to a Subscription Management Tool instance.
3939
4040
- SUSE Linux Subscription Management Tool deployed in Azure on a VM. This tool provides the capability for SAP HANA on Azure (Large Instances) to be registered and respectively updated by SUSE. (There's no internet access within the HANA Large Instance data center.)
41-
- Licenses for Red Hat Enterprise Linux 6.7 or 7.x for SAP HANA.
41+
42+
- Licenses for Red Hat Enterprise Linux 7.9 and 8.2 for SAP HANA.
4243

4344
> [!NOTE]
4445
> The operating system delivered by Microsoft isn't registered with Red Hat. It isn't connected to a Red Hat Subscription Manager instance.
@@ -54,7 +55,7 @@ For the compatibility matrix of the operating system and HLI firmware/driver ver
5455

5556

5657
> [!IMPORTANT]
57-
> For Type II units only the SLES 12 SP2 OS version is supported at this point.
58+
> For Type II units SLES 12 SP5, SLES 15 SP2 and SLES 15 SP3 OS versions are supported at this point.
5859
5960

6061
## Database

articles/virtual-machines/workloads/sap/os-upgrade-hana-large-instance.md

Lines changed: 10 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -45,23 +45,25 @@ There are a couple of known issues with the upgrade:
4545
The OS configuration can drift from the recommended settings over time. This drift can occur because of patching, system upgrades, and other changes you may make. Microsoft identifies updates needed to ensure HANA Large Instances are optimally configured for the best performance and resiliency. The following instructions outline recommendations that address network performance, system stability, and optimal HANA performance.
4646

4747
### Compatible eNIC/fNIC driver versions
48-
To have proper network performance and system stability, ensure the appropriate OS-specific version of eNIC and fNIC drivers are installed per the following compatibility table. Servers are delivered to customers with compatible versions. However, drivers can get rolled back to default versions during OS/kernel patching. Ensure the appropriate driver version is running post OS/kernel patching operations.
48+
To have proper network performance and system stability, ensure the appropriate OS-specific version of eNIC and fNIC drivers are installed per the following compatibility table (This table has the latest compatible driver version). Servers are delivered to customers with compatible versions. However, drivers can get rolled back to default versions during OS/kernel patching. Ensure the appropriate driver version is running post OS/kernel patching operations.
4949

5050

5151
| OS Vendor | OS Package Version | Firmware Version | eNIC Driver | fNIC Driver |
5252
|---------------|-------------------------|--------------------|--------------|--------------|
53-
| SuSE | SLES 12 SP2 | 3.1.3h | 2.3.0.40 | 1.6.0.34 |
54-
| SuSE | SLES 12 SP3 | 3.1.3h | 2.3.0.44 | 1.6.0.36 |
5553
| SuSE | SLES 12 SP2 | 3.2.3i | 2.3.0.45 | 1.6.0.37 |
5654
| SuSE | SLES 12 SP3 | 3.2.3i | 2.3.0.43 | 1.6.0.36 |
57-
| SuSE | SLES 12 SP4 | 3.2.3i | 4.0.0.6 | 2.0.0.60 |
55+
| SuSE | SLES 12 SP4 | 3.2.3i | 4.0.0.14 | 2.0.0.63 |
56+
| SuSE | SLES 12 SP5 | 3.2.3i | 4.0.0.14 | 2.0.0.63 |
57+
| Red Hat | RHEL 7.6 | 3.2.3i | 3.1.137.5 | 2.0.0.50 |
5858
| SuSE | SLES 12 SP4 | 4.1.1b | 4.0.0.6 | 2.0.0.60 |
59-
| SuSE | SLES 12 SP5 | 3.2.3i | 4.0.0.8 | 2.0.0.60 |
6059
| SuSE | SLES 12 SP5 | 4.1.1b | 4.0.0.6 | 2.0.0.59 |
6160
| SuSE | SLES 15 SP1 | 4.1.1b | 4.0.0.8 | 2.0.0.60 |
62-
| Red Hat | RHEL 7.2 | 3.1.3h | 2.3.0.39 | 1.6.0.34 |
63-
| Red Hat | RHEL 7.6 | 3.2.3i | 3.1.137.5 | 2.0.0.50 |
61+
| SuSE | SLES 15 SP2 | 4.1.1b | 4.0.0.8 | 2.0.0.60 |
6462
| Red Hat | RHEL 7.6 | 4.1.1b | 4.0.0.8 | 2.0.0.60 |
63+
| SuSE | SLES 12 SP4 | 4.1.3d | 4.0.0.13 | 2.0.0.69 |
64+
| SuSE | SLES 12 SP5 | 4.1.3d | 4.0.0.13 | 2.0.0.69 |
65+
| SuSE | SLES 15 SP1 | 4.1.3d | 4.0.0.13 | 2.0.0.69 |
66+
6567

6668

6769
### Commands for driver upgrade and to clean old rpm packages
@@ -151,4 +153,4 @@ grub2-mkconfig -o /boot/grub2/grub.cfg
151153
Learn to set up an SMT server for SUSE Linux.
152154

153155
> [!div class="nextstepaction"]
154-
> [Set up SMT server for SUSE Linux](hana-setup-smt.md)
156+
> [Set up SMT server for SUSE Linux](hana-setup-smt.md)

0 commit comments

Comments
 (0)