Skip to content

Commit 5a64281

Browse files
authored
Merge pull request #216656 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 2ba88bb + 71af029 commit 5a64281

File tree

6 files changed

+12
-16
lines changed

6 files changed

+12
-16
lines changed

articles/active-directory/reports-monitoring/reference-azure-ad-sla-performance.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,7 @@ For each month, we truncate the SLA attainment at three places after the decimal
6161
| June | 99.999% | 99.999% |
6262
| July | 99.999% | 99.999% |
6363
| August | 99.999% | 99.999% |
64-
| September | 99.999% | |
64+
| September | 99.999% | 99.998% |
6565
| October | 99.999% | |
6666
| November | 99.998% | |
6767
| December | 99.978% | |

articles/azure-vmware/deploy-disaster-recovery-using-jetstream.md

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ ms.custom: references_regions
99

1010
# Deploy disaster recovery using JetStream DR software
1111

12-
[JetStream DR](https://www.jetstreamsoft.com/product-portfolio/jetstream-dr/) is a cloud-native disaster recovery solution designed to minimize downtime of virtual machines (VMs) if there was a disaster. Instances of JetStream DR are deployed at both the protected and recovery sites.
12+
[JetStream DR](https://www.jetstreamsoft.com/product-portfolio/jetstream-dr/) is a cloud-native disaster recovery solution designed to minimize downtime of virtual machines (VMs) if there is a disaster. Instances of JetStream DR are deployed at both the protected and recovery sites.
1313

1414
JetStream is built on the foundation of Continuous Data Protection (CDP), using [VMware vSphere API for I/O filtering (VAIO) framework](https://core.vmware.com/resource/vmware-vsphere-apis-io-filtering-vaio), which enables minimal or close to no data loss. JetStream DR provides the level of protection wanted for business and mission-critical applications. It also enables cost-effective DR by using minimal resources at the DR site and using cost-effective cloud storage, such as [Azure Blob Storage](https://azure.microsoft.com/services/storage/blobs/).
1515

@@ -27,11 +27,11 @@ To learn more about JetStream DR, see:
2727

2828
| Items | Description |
2929
| --- | --- |
30-
| **JetStream Management Server Virtual Appliance (MSA)** | MSA enables both Day 0 and Day 2 configuration, such as primary sites, protection domains, and recovering VMs. MSA is installed on a vSphere node by the cloud admin. The MSA implements a vCenter Server plugin that allows you to manage JetStream DR natively from vCenter Server. The MSA doesn't handle replication data of protected VMs. |
31-
| **JetStream DR Virtual Appliance (DRVA)** | Linux-based Virtual Machine appliance receives protected VMs replication data from the source ESXi host. It's responsible for storing the replication data at the DR site, typically in an object store such as Azure Blob Storage. Depending on the number of protected VMs and the amount of storage to replicate, the private cloudadmin can create one or more DRVA instances. |
32-
| **JetStream ESXi host components (IO Filter packages)** | JetStream software installed on each ESXi host configured for JetStream DR. The host driver intercepts the vSphere VMs IO and sends the replication data to the DRVA. |
33-
| **JetStream protection domain** | Logical group of VMs that will be protected together using the same policies and run book. The data for all VMs in a protection domain is stored in the same Azure Blob container instance. The same DRVA instance handles replication to remote DR storage for all VMs in a protection domain. |
34-
| **Azure Blob Storage containers** | The protected VMs replicated data is stored in Azure Blobs. JetStream software creates one Azure Blob container instance for each JetStream protection domain. |
30+
| **JetStream Management Server Virtual Appliance (MSA)** | MSA enables both Day 0 and Day 2 configuration, such as primary sites, protection domains, and recovering VMs. The MSA is deployed from an OVA on a vSphere node by the cloud admin. The MSA collects and maintains statistics relevant to VM protection and implements a vCenter plugin that allows you to manage JetStream DR natively with the vSphere Client. The MSA doesn't handle replication data of protected VMs. |
31+
| **JetStream DR Virtual Appliance (DRVA)** | Linux-based Virtual Machine appliance receives protected VMs replication data from the source ESXi host. It maintains the replication log and manages the transfer of the VMs and their data to the object store such as Azure Blob Storage. Depending on the number of protected VMs and the amount of VM data to replicate, the private cloud admin can create one or more DRVA instances. |
32+
| **JetStream ESXi host components (IO Filter packages)** | JetStream software installed on each ESXi host configured for JetStream DR. The host driver intercepts the vSphere VMs IO and sends the replication data to the DRVA. The IO filters also monitor relevant events, such as vMotion, Storage vMotion, snapshots, etc. |
33+
| **JetStream Protected Domain** | Logical group of VMs that will be protected together using the same policies and runbook. The data for all VMs in a protection domain is stored in the same Azure Blob container instance. A single DRVA instance handles replication to remote DR storage for all VMs in a Protected Domain. |
34+
| **Azure Blob Storage containers** | The protected VMs replicated data is stored in Azure Blobs. JetStream software creates one Azure Blob container instance for each JetStream Protected Domain. |
3535

3636

3737

@@ -70,7 +70,7 @@ To install JetStream DR in the on-premises data center and in the Azure VMware S
7070
- Configure the cluster with the IO filter package (install JetStream VIB).
7171
- Provision Azure Blob (Azure Storage Account) in the same region as the DR Azure VMware Solution cluster.
7272
- Deploy the disaster recovery virtual appliance (DRVA) and assign a replication log volume (VMDK from existing datastore or shared iSCSI storage).
73-
- Create protected domains (groups of related VMs) and assign DRVAs and the Azure Blob Storage/ANF.
73+
- Create Protected Domains (groups of related VMs) and assign DRVAs and the Azure Blob Storage/ANF.
7474
- Start protection.
7575

7676
- Install JetStream DR in the Azure VMware Solution private cloud:

articles/azure-vmware/includes/disk-capabilities-of-the-host.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,8 +15,8 @@ Azure VMware Solution clusters are based upon hyper-converged infrastructure. Th
1515

1616
| Host Type | CPU (GHz) | RAM (GB) | vSAN Cache Tier (TB, raw) | vSAN Capacity Tier (TB, raw) | Network Interface Cards | Regional availability |
1717
| :--- | :---: | :---: | :---: | :---: | :---: | :---: |
18-
| AV36 | Dual Intel Xeon Gold 6140 Skylake CPUs with 18 cores/CPU @ 2.3 GHz, Total 38 physical cores (72 logical cores with hyperthreading) | 576 | 3.2 (NVMe) | 15.20 (SSD) | 4x 25 Gb/s NICs (2 for management & control plane, 2 for customer traffic) | All product regions |
19-
| AV36P | Dual Intel Xeon Gold 6240 Cascade Lake CPUs with 18 cores/CPU @ 2.6 GHz / 3.9 GHz Turbo, Total 38 physical cores (72 logical cores with hyperthreading) | 768 | 1.5 (Intel Optane Cache) | 19.20 (NVMe) | 4x 25 Gb/s NICs (2 for management & control plane, 2 for customer traffic) | Selected regions (*) |
18+
| AV36 | Dual Intel Xeon Gold 6140 Skylake CPUs with 18 cores/CPU @ 2.3 GHz, Total 36 physical cores (72 logical cores with hyperthreading) | 576 | 3.2 (NVMe) | 15.20 (SSD) | 4x 25 Gb/s NICs (2 for management & control plane, 2 for customer traffic) | All product regions |
19+
| AV36P | Dual Intel Xeon Gold 6240 Cascade Lake CPUs with 18 cores/CPU @ 2.6 GHz / 3.9 GHz Turbo, Total 36 physical cores (72 logical cores with hyperthreading) | 768 | 1.5 (Intel Optane Cache) | 19.20 (NVMe) | 4x 25 Gb/s NICs (2 for management & control plane, 2 for customer traffic) | Selected regions (*) |
2020
| AV52 | Dual Intel Xeon Platinum 8270 Cascade Lake CPUs with 26 cores/CPU @ 2.7 GHz / 4.0 GHz Turbo, Total 52 physical cores (104 logical cores with hyperthreading) | 1,536 | 1.5 (Intel Optane Cache) | 38.40 (NVMe) | 4x 25 Gb/s NICs (2 for management & control plane, 2 for customer traffic) | Selected regions (*) |
2121

2222
An Azure VMware Solution cluster requires a minimum number of three hosts. You can only use hosts of the same type in a single Azure VMware Solution private cloud.

articles/sentinel/quickstart-onboard.md

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -46,9 +46,6 @@ Microsoft Sentinel comes with many connectors for Microsoft products, for exampl
4646

4747
- Single-region data residency is currently provided only in the Southeast Asia (Singapore) region of the Asia Pacific geography, and in the Brazil South (Sao Paulo State) region of the Brazil geography.
4848

49-
> [!IMPORTANT]
50-
> - By enabling certain rules that make use of the machine learning (ML) engine, **you give Microsoft permission to copy relevant ingested data outside of your Microsoft Sentinel workspace's geography** as may be required by the machine learning engine to process these rules.
51-
5249
## Enable Microsoft Sentinel <a name="enable"></a>
5350

5451
1. Sign in to the Azure portal. Make sure that the subscription in which Microsoft Sentinel is created is selected.
@@ -103,4 +100,4 @@ For more information, see:
103100
- **Get started**:
104101
- [Get started with Microsoft Sentinel](get-visibility.md)
105102
- [Create custom analytics rules to detect threats](detect-threats-custom.md)
106-
- [Connect your external solution using Common Event Format](connect-common-event-format.md)
103+
- [Connect your external solution using Common Event Format](connect-common-event-format.md)

articles/spring-apps/vnet-customer-responsibilities.md

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,6 @@ The following list shows the resource requirements for Azure Spring Apps service
3737

3838
| Destination Endpoint | Port | Use | Note |
3939
|-------------------------------------------------------------------------------------------------------------------------------------------------------------------------|------------------|-------------------------------------------|-----------------------------------------------------------------------------------------------------------------------------------------------------------------|
40-
| \*:1194 *or* [ServiceTag](../virtual-network/service-tags-overview.md#available-service-tags) - AzureCloud:1194 | UDP:1194 | Underlying Kubernetes Cluster management. | |
4140
| \*:443 *or* [ServiceTag](../virtual-network/service-tags-overview.md#available-service-tags) - AzureCloud:443 | TCP:443 | Azure Spring Apps Service Management. | Information of service instance "requiredTraffics" could be known in resource payload, under "networkProfile" section. |
4241
| \*:123 *or* ntp.ubuntu.com:123 | UDP:123 | NTP time synchronization on Linux nodes. | |
4342
| \*.azurecr.io:443 *or* [ServiceTag](../virtual-network/service-tags-overview.md#available-service-tags) - AzureContainerRegistry:443 | TCP:443 | Azure Container Registry. | Can be replaced by enabling *Azure Container Registry* [service endpoint in virtual network](../virtual-network/virtual-network-service-endpoints-overview.md). |

articles/storage/common/storage-use-azcopy-blobs-download.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -107,7 +107,7 @@ You can download specific blobs by using complete file names, partial names with
107107
108108
#### Specify multiple complete blob names
109109

110-
Use the [azcopy copy](storage-ref-azcopy-copy.md) command with the `--include-path` option. Separate individual blob names by using a semicolin (`;`).
110+
Use the [azcopy copy](storage-ref-azcopy-copy.md) command with the `--include-path` option. Separate individual blob names by using a semicolon (`;`).
111111

112112
**Syntax**
113113

0 commit comments

Comments
 (0)