Skip to content

Commit 4971c95

Browse files
committed
Merge branch 'main' of https://github.com/MicrosoftDocs/azure-docs-pr into vnet-old-review
2 parents 4a1a24d + 89b8284 commit 4971c95

File tree

8 files changed

+98
-81
lines changed

8 files changed

+98
-81
lines changed

articles/azure-monitor/app/app-insights-overview.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ To understand the number of Application Insights resources required to cover you
3434

3535
## How do I use Application Insights?
3636

37-
Application Insights is enabled through either [autoinstrumentation](codeless-overview.md) (agent) or by adding the [Application Insights SDK](sdk-support-guidance.md) to your application code. [Many languages](#supported-languages) are supported. The applications could be on Azure, on-premises, or hosted by another cloud. To figure out which type of instrumentation is best for you, see [How do I instrument an application?](#how-do-i-instrument-an-application).
37+
Application Insights is enabled through either [autoinstrumentation](codeless-overview.md) (agent) or by adding the [Application Insights SDK](sdk-support-guidance.md) or [Azure Monitor OpenTelemetry Distro](opentelemetry-enable.md) to your application code. [Many languages](#supported-languages) are supported. The applications could be on Azure, on-premises, or hosted by another cloud. To figure out which type of instrumentation is best for you, see [How do I instrument an application?](#how-do-i-instrument-an-application).
3838

3939
The Application Insights agent or SDK preprocesses telemetry and metrics before sending the data to Azure. Then it's ingested and processed further before it's stored in Azure Monitor Logs (Log Analytics). For this reason, an Azure account is required to use Application Insights.
4040

articles/cosmos-db/nosql/quickstart-nodejs.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ ms.service: cosmos-db
77
ms.subservice: nosql
88
ms.devlang: javascript
99
ms.topic: quickstart
10-
ms.date: 02/21/2023
10+
ms.date: 05/08/2023
1111
ms.custom: devx-track-js, mode-api, ignite-2022, devguide-js, cosmos-db-dev-journey, passwordless-js, devx-track-azurecli
1212
---
1313

@@ -244,7 +244,7 @@ Add the following code to create a container with the [``Database.Containers.cre
244244

245245
### Create an item
246246

247-
Add the following code to provide your data set. Each _product_ has a unique ID, name, category name (used as partition key) and other fields.
247+
Add the following code to provide your data set. Each _product_ has a unique ID, name, category id (used as partition key) and other fields.
248248

249249
:::code language="javascript" source="~/cosmos-db-sql-api-javascript-samples/001-quickstart/index.js" range="37-84":::
250250

@@ -256,7 +256,7 @@ Create a few items in the container by calling [``Container.Items.create``](/jav
256256

257257
In Azure Cosmos DB, you can perform a point read operation by using both the unique identifier (``id``) and partition key fields. In the SDK, call [``Container.item().read``](/javascript/api/@azure/cosmos/item#@azure-cosmos-item-read) passing in both values to return an item.
258258

259-
The partition key is specific to a container. In this Contoso Products container, the category name, `categoryName`, is used as the partition key.
259+
The partition key is specific to a container. In this Contoso Products container, the category id, `categoryId`, is used as the partition key.
260260

261261
:::code language="javascript" source="~/cosmos-db-sql-api-javascript-samples/001-quickstart/index.js" range="93-95":::
262262

articles/load-balancer/outbound-rules.md

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -100,12 +100,12 @@ If an NSG blocks health probe requests from the AZURE_LOADBALANCER default tag,
100100
## Outbound rules scenarios
101101

102102

103-
* Configure outbound connections to a specific set of public IPs or prefix.
104-
* Modify [SNAT](load-balancer-outbound-connections.md) port allocation.
105-
* Enable outbound only.
106-
* Outbound NAT for VMs only (no inbound).
107-
* Outbound NAT for internal standard load balancer.
108-
* Enable both TCP & UDP protocols for outbound NAT with a public standard load balancer.
103+
* [Configure outbound connections to a specific set of public IPs or prefix](#scenario1out).
104+
* [Modify SNAT port allocation](#scenario2out).
105+
* [Enable outbound only](#scenario3out).
106+
* [Outbound NAT for VMs only (no inbound)](#scenario4out).
107+
* [Outbound NAT for internal standard load balancer](#scenario5out).
108+
* [Enable both TCP & UDP protocols for outbound NAT with a public standard load balancer](#scenario6out).
109109

110110

111111
### <a name="scenario1out"></a>Scenario 1: Configure outbound connections to a specific set of public IPs or prefix

articles/postgresql/TOC.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -524,10 +524,10 @@
524524
displayName: query store, performance, optimize
525525
- name: Query Store best practices
526526
href: flexible-server/concepts-query-store-best-practices.md
527-
- name: Intelligent tuning
528-
href: flexible-server/concepts-intelligent-tuning.md
529527
- name: Query Performance Insight
530528
href: flexible-server/concepts-query-performance-insight.md
529+
- name: Intelligent tuning
530+
href: flexible-server/concepts-intelligent-tuning.md
531531
- name: Replication
532532
items:
533533
- name: Read replicas

articles/postgresql/flexible-server/concepts-server-parameters.md

Lines changed: 8 additions & 8 deletions
Large diffs are not rendered by default.

articles/site-recovery/move-from-classic-to-modernized-vmware-disaster-recovery.md

Lines changed: 22 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -19,19 +19,19 @@ This article provides information about the architecture, necessary infrastructu
1919

2020
The components involved in the migration of replicated items of a VMware machine are summarized in the following table: 
2121

22-
|Component|Requirement|
23-
|---------|-----------|
24-
|Replicated items in a classic Recovery Services vault| One or more replicated items that are protected using the classic architecture and a healthy configuration server.<br></br>The replicated item should be in a noncritical state and must be replicated from on-premises to Azure with the mobility agent running on version 9.50 or later.|
25-
|Configuration server used by the replicated items|The configuration server, used by the replicated items, should be in a noncritical state and its components should be upgraded to the latest version (9.50 or later).| 
26-
|A Recovery Services vault with modernized experience|A Recovery Services vault with modernized experience.|
27-
|A healthy Azure Site Recovery replication appliance|A noncritical Azure Site Recovery replication appliance, which can discover on-premises machines, with all its components upgraded to the latest version (9.50 or later). The exact required versions are as follows:<br></br>Process server: 9.50<br>Proxy server: 1.35.8419.34591<br>Recovery services agent: 2.0.9249.0<br>Replication service: 1.35.8433.24227|
22+
| **Component** | **Requirement**
23+
|---------|-----------
24+
|Replicated items in a classic Recovery Services vault| One or more replicated items that are protected using the classic architecture and a healthy configuration server.<br></br>The replicated item should be in a noncritical state and must be replicated from on-premises to Azure with the mobility agent running on version 9.50 or later.
25+
|Configuration server used by the replicated items|The configuration server, used by the replicated items, should be in a noncritical state and its components should be upgraded to the latest version (9.50 or later).
26+
|A Recovery Services vault with modernized experience|A Recovery Services vault with modernized experience.
27+
|A healthy Azure Site Recovery replication appliance|A non-critical Azure Site Recovery replication appliance, which can discover on-premises machines, with all its components upgraded to the latest version (9.50 or later). The exact required versions are as follows:<br></br>Process server: 9.50<br>Proxy server: 1.35.8419.34591<br>Recovery services agent: 2.0.9249.0<br>Replication service: 1.35.8433.24227
2828

2929
## Required infrastructure 
3030

3131
Ensure the following for a successful movement of replicated item:
3232
- A Recovery Services vault using the modernized experience.  
3333
>[!Note]
34-
>Any new Recovery Services vault created will have the modernized experience switched on by default. You can [switch to the classic experience](./vmware-azure-common-questions.md#how-do-i-use-the-classic-experience-in-the-recovery-services-vault-rather-than-the-modernized-experience) but once done, you can’t switch again.  
34+
>Any new Recovery Services vault created will have the modernized experience switched on by default. You can not switch to the classic experience, as its deprecation has already been [announced](./vmware-physical-azure-classic-deprecation.md).  
3535
- An [Azure Site Recovery replication appliance](./deploy-vmware-azure-replication-appliance-modernized.md), which has been successfully registered to the vault, and all its components are in a noncritical state.  
3636
- The version of the appliance must be 9.50 or later. For a detailed version description, check [here](#architecture).
3737
- The vCenter server or vSphere host’s details, where the existing replicated machines reside, are added to the appliance for the on-premises discovery to be successful.  
@@ -121,20 +121,21 @@ Site Recovery will start charging license fee on replicated items in the moderni
121121
It is important to note that the classic architecture for disaster recovery will be phased out, so users should make sure to switch to the latest and modernized version. The following table provides a comparison of the two architectures to help you choose the right option for securing your machines in the event of a disaster.
122122

123123

124-
|Classic architecture| Modernized architecture [New]|
125-
|---------------------|-----------------------------|
126-
|Multiple setups required for discovering on-premises data.|**Central discovery** of on-premises data center using discovery service.|
127-
|Extensive number of steps required for initial onboarding.|**Simplified the onboarding experience** by automating artifact creation and introduced defaults to reduce required inputs.| 
128-
|Utilizes a manually downloaded file to obtain cloud context.|**Introduced replication key** for obtaining cloud context when setting up the appliance.|
129-
|Extensive number of steps required for a simple enable replication process.|**Simplified the enable replication experience** by reducing the number of required inputs and redefining each blade.|
130-
|Configuration server continues to be an on-premises infrastructure with extensive setup for various components.|Enhanced the appliance by converting all components into Azure hosted microservices. This **simplifies appliance scaling, monitoring, and troubleshooting.**|
131-
|Need for scale-out process server and master target server in Azure for Linux machines is a hindering requirement.|**Removed** the need to maintain separate **process server and master target server**.|
132-
|Used a static passphrase for authentication, which interfered with customer’s business requirements of periodic password rotation.|Introduced **certificate-based authentication**, which is more secure and resolves customer’s security concerns.|
133-
|Upgrading to an updated version should be done manually and is a cumbersome process.|Introduced **automatic upgrades** for both appliance components and Mobility service.|
134-
|The configuration server doesn't have high availability and might be at the risk of collapsing.|Implemented **high availability of appliance** to ensure resiliency.|
135-
|Root credentials should be regularly updated to ensure an error-free upgrade experience.|**Eliminated the requirement to maintain machine’s root credentials** for performing automatic upgrades.|
136-
|Static IP address should be assigned to configuration server to maintain connectivity.|Introduced **FQDN based connectivity** between appliance and on-premises machines.|
137-
|Only that virtual network, which has Site-to-Site VPN or Express Route enabled, should be used.|Removed the need to maintain a Site-to-Site VPN or Express Route for reverse replication.|
124+
|**Classic architecture** | **Modernized architecture [New]**
125+
|---------------------|-----------------------------
126+
|Multiple setups required for discovering on-premises data.|**Central discovery** of on-premises data center using discovery service.
127+
|Extensive number of steps required for initial onboarding.|**Simplified the onboarding experience** by automating artifact creation and introduced defaults to reduce required inputs.
128+
|Utilizes a manually downloaded file to obtain cloud context.|**Introduced replication key** for obtaining cloud context when setting up the appliance.
129+
|Extensive number of steps required for a simple enable replication process.|**Simplified the enable replication experience** by reducing the number of required inputs and redefining each blade.
130+
|Configuration server continues to be an on-premises infrastructure with extensive setup for various components.|Enhanced the appliance by converting all components into Azure hosted microservices. This **simplifies appliance scaling, monitoring, and troubleshooting.**
131+
|Need for scale-out process server and master target server in Azure for Linux machines is a hindering requirement.|**Removed** the need to maintain separate **process server and master target server**.
132+
|Used a static passphrase for authentication, which interfered with customer’s business requirements of periodic password rotation.|Introduced **certificate-based authentication**, which is more secure and resolves customer’s security concerns.
133+
|Upgrading to an updated version should be done manually and is a cumbersome process.|Introduced **automatic upgrades** for both appliance components and Mobility service.
134+
|The configuration server doesn't have high availability and might be at the risk of collapsing.|Implemented **high availability of appliance** to ensure resiliency.
135+
|Root credentials should be regularly updated to ensure an error-free upgrade experience.|**Eliminated the requirement to maintain machine’s root credentials** for performing automatic upgrades.
136+
|Static IP address should be assigned to configuration server to maintain connectivity.|Introduced **FQDN based connectivity** between appliance and on-premises machines.
137+
|Only that virtual network, which has Site-to-Site VPN or Express Route enabled, should be used.|Removed the need to maintain a Site-to-Site VPN or Express Route for reverse replication.
138+
| Third party tool, MySQL, also needs to be setup. |Removed the dependency on any third party tools.
138139

139140
### What machines should be migrated to the modernized architecture?
140141

articles/spring-apps/how-to-deploy-powershell.md

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -76,10 +76,11 @@ New-AzSpringCloudApp -ResourceGroupName <resource group name> -ServiceName <serv
7676

7777
To create a new app Deployment, you use the
7878
[New-AzSpringCloudAppDeployment](/powershell/module/az.springcloud/new-azspringcloudappdeployment)
79-
cmdlet. The following example creates an app deployment in Azure Spring Apps named `default`, for the `gateway` app.
79+
cmdlet. The following example creates an app deployment in Azure Spring Apps named `default` with an empty welcome application, for the `gateway` app.
8080

8181
```azurepowershell-interactive
82-
New-AzSpringCloudAppDeployment -ResourceGroupName <resource group name> -Name <service instance name> -AppName gateway -DeploymentName default
82+
$welcomeApplication = New-AzSpringCloudAppDeploymentJarUploadedObject -RuntimeVersion "Java_11"
83+
New-AzSpringCloudAppDeployment -ResourceGroupName <resource group name> -ServiceName <service instance name> -AppName gateway -Name default -Source $welcomeApplication
8384
```
8485

8586
## Get a service and its properties

0 commit comments

Comments
 (0)