Skip to content

Commit bb3473e

Browse files
authored
Merge pull request #278335 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 edc9476 + a78b1fd commit bb3473e

File tree

3 files changed

+4
-4
lines changed

3 files changed

+4
-4
lines changed

articles/azure-monitor/app/live-stream.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ Live Metrics is currently supported for ASP.NET, ASP.NET Core, Azure Functions,
4040

4141
Using OpenTelemetry (Recommended):
4242

43-
* [ASP.NET](opentelemetry-enable.md?tabs=net): Live Metrics is enabled by default.
43+
* [ASP.NET](opentelemetry-enable.md?tabs=net): Live Metrics is not supported.
4444
* [ASP.NET Core](opentelemetry-enable.md?tabs=aspnetcore): Live Metrics is enabled by default.
4545
* [Java](./opentelemetry-enable.md?tabs=java): Live Metrics is enabled by default.
4646
* [Node.js](opentelemetry-enable.md?tabs=nodejs): Live Metrics is enabled by default.

articles/container-apps/tutorial-dev-services-postgresql.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -446,7 +446,7 @@ Azure CLI commands and Bicep template fragments are featured in this tutorial. I
446446
447447
## Create an app to test the service
448448
449-
When you creat the app, you begin by creating a debug app to use the `psql` CLI to connect to the PostgreSQL instance.
449+
When you create the app, you begin by creating a debug app to use the `psql` CLI to connect to the PostgreSQL instance.
450450
451451
1. Create a `psql` app that binds to the PostgreSQL service.
452452

articles/virtual-machines/workloads/oracle/oracle-reference-architecture.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -106,9 +106,9 @@ The following diagram is a high availability architecture using Oracle Data Guar
106106

107107
:::image type="content" source="./media/oracle-reference-architecture/oracledb_dg_fs_az.png" alt-text="Diagram that shows Oracle database using availability zones with Data Guard Far Sync & Broker - FSFO." lightbox="./media/oracle-reference-architecture/oracledb_dg_fs_az.png":::
108108

109-
In the preceding architecture, there's a Far Sync instance deployed in the same availability zone as the database instance to reduce the latency between the two. In cases where the application is latency sensitive, consider deploying your database and Far Sync instance or instances in a [proximity placement group](../../../virtual-machines/linux/proximity-placement-groups.md).
109+
In the preceding architecture, there's a Far Sync instance deployed in a different availability zone as the database instance to ensure zero data loss and automatic failover in case of availability zone failure. In cases where the application is latency sensitive, consider deploying your database and Far Sync instance or instances in the same availability zone in a [proximity placement group](../../../virtual-machines/linux/proximity-placement-groups.md).
110110

111-
The following diagram is an architecture that uses Oracle Data Guard FSFO and Far Sync to achieve high availability and disaster recovery:
111+
The following diagram is an architecture that uses Oracle Data Guard FSFO and Far Sync to achieve high availability and disaster recovery:
112112

113113
:::image type="content" source="./media/oracle-reference-architecture/oracledb_dg_fs_az_dr.png" alt-text="Diagram that shows Oracle Database using availability zones for disaster recovery with Data Guard Far Sync and Broker - FSFO." lightbox="./media/oracle-reference-architecture/oracledb_dg_fs_az_dr.png":::
114114

0 commit comments

Comments
 (0)