Skip to content

Commit 3bebb44

Browse files
authored
Merge pull request #310773 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 0d152ef + d0f1896 commit 3bebb44

2 files changed

Lines changed: 8 additions & 6 deletions

File tree

articles/managed-grafana/how-to-data-source-plugins-managed-identity.md

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -43,8 +43,10 @@ Azure Managed Grafana supports many popular data sources. The table below lists
4343
| [Microsoft SQL Server](https://grafana.com/docs/grafana/latest/datasources/mssql/) | - ||
4444
| [MySQL](https://grafana.com/docs/grafana/latest/datasources/mysql/) | - ||
4545
| [OpenTSDB](https://grafana.com/docs/grafana/latest/datasources/opentsdb/) | - ||
46+
| [Parca](https://grafana.com/docs/grafana/latest/datasources/parca/) | - ||
4647
| [PostgreSQL](https://grafana.com/docs/grafana/latest/datasources/postgres/) | - ||
4748
| [Prometheus](https://grafana.com/docs/grafana/latest/datasources/prometheus/) |||
49+
| [Pyroscope](https://grafana.com/docs/grafana/latest/datasources/pyroscope/) | - ||
4850
| [Tempo](https://grafana.com/docs/grafana/latest/datasources/tempo/) | - ||
4951
| [TestData](https://grafana.com/docs/grafana/latest/datasources/testdata/) |||
5052
| [Zipkin](https://grafana.com/docs/grafana/latest/datasources/zipkin/) | - ||

articles/oracle/oracle-db/oracle-database-regions.md

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -25,8 +25,8 @@ The list below mentions the Azure and corresponding OCI regions with the regiona
2525

2626
| Azure region | OCI region | Oracle Exadata Database@Azure | Oracle Autonomous Database@Azure | Oracle Database Autonomous Recovery Service@Azure | Exadata Database Service on Exascale Infrastructure@Azure | BaseDB | Golden Gate | Regional Availability |
2727
| -------------- | ----------------------- | ----------------------------- | -------------------------------- | -------- |---------|---------|---------|-----|
28-
| Australia East | Australia East (Sydney) | | ||| Preview available || Dual |
29-
| Australia Southeast | Australia Southeast (Melbourne) | || | | | | Dual |
28+
| Australia East | Australia East (Sydney) ||||| || Dual |
29+
| Australia Southeast | Australia Southeast (Melbourne) ||| | | | | Dual |
3030
| Central India | India West (Mumbai) ||| | | | | Single |
3131
| Japan East | Japan East (Tokyo) ||||||| Dual |
3232
| Japan West | Japan Central (Osaka) ||| | | | | Single |
@@ -47,13 +47,13 @@ The list below mentions the Azure and corresponding OCI regions with the regiona
4747
|Azure region |OCI region | Oracle Exadata Database@Azure | Oracle Autonomous Database@Azure | Oracle Database Autonomous Recovery Service@Azure| Exadata Database Service on Exascale Infrastructure@Azure | BaseDB | Golden Gate | Regional Availability |
4848
|------------|--|--------------------------|------------------------------| ------| ---- | ---- |----|-------|
4949
| France Central |France central (Paris) ||||| | | Dual |
50-
| France South | France South (Marseille) ||| | | | | Single |
51-
| Germany North |Germany Central (Frankfurt) ||| || | | Single |
50+
| France South | France South (Marseille) ||| | | | | Single |
51+
| Germany North |Germany Central (Frankfurt) ||| || | | Single |
5252
| Germany West Central |Germany Central (Frankfurt) ||||||| Dual |
5353
| Italy North | Italy North (Milan) ||||||| Dual |
5454
| North Europe | Ireland (Dublin) ||| | | || Dual |
5555
| Spain Central | Spain Central (Madrid) ||| | | | | Dual |
56-
| Sweden Central | Sweden Central (Stockholm) ||| || | | Dual |
56+
| Sweden Central | Sweden Central (Stockholm) ||| || | | Dual |
5757
| Switzerland North | Switzerland North (Zurich) ||| | | | | Single |
5858
| UAE Central | UAE Central (Abu Dhabi) ||| | | | | Single |
5959
| UAE North | UAE North (Dubai) |||| | || Dual |
@@ -73,7 +73,7 @@ The list below mentions the Azure and corresponding OCI regions with the regiona
7373
| East US 2 | US East (Ashburn) ||||| | | Dual |
7474
| North Central US | US Midwest (Chicago) ||| | | | | Single |
7575
| South Central US | US South (Dallas)||| | | | | Dual |
76-
| West US | US West (San Jose) ||||| Preview available | | Single |
76+
| West US | US West (San Jose) ||||| Preview available | | Single |
7777
| West US 2 | US West (Quincy) |||| | | | Dual |
7878
| West US 3 | US West (Phoenix) || || | | | Dual |
7979

0 commit comments

Comments
 (0)