Skip to content

Commit 9e9d7a6

Browse files
authored
Merge pull request #286266 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 56a0f41 + 5230c9a commit 9e9d7a6

8 files changed

+19
-15
lines changed

articles/energy-data-services/how-to-enable-external-data-sources.md

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ External Data Sources (EDS) is a capability in [OSDU®](https://osduforum.org
1818
For more information about External Data Sources (EDS), see [The OSDU Forum 2Q 2022 Newsletter - EDS](https://osduforum.org/wp-content/uploads/2022/06/The-OSDU-Forum-2Q-2022-Newsletter.pdf).
1919

2020
> [!NOTE]
21-
> OSDU community shipped EDS as a preview feature in M18 Release, and it is available as a preview feature on Azure Data Manager for Energy in Developer tier only.
21+
> EDS M23 preview is now available on Azure Data Manager for Energy in Developer tier only.
2222
2323
> [!IMPORTANT]
2424
> Limit your Identity Provider (IdP) token to read operations only.
@@ -49,25 +49,25 @@ For more information about External Data Sources (EDS), see [The OSDU Forum 2Q 2
4949
To enable External Data Sources Preview on your Azure Data Manager for Energy, create an Azure support ticket with the following information:
5050
- Subscription ID
5151
- Azure Data Manager for Energy developer tier resource name
52-
- Data partition name (the data partition in which EDS needs to be enabled)
52+
- Data partition name (the data partition in which EDS needs to be enabled for automated triggering of EDS-Scheduler)
5353
- Key Vault name (created in [Prerequisites](#prerequisites))
5454

5555
> [!NOTE]
56-
> EDS does not have [multi data partition support](https://community.opengroup.org/osdu/platform/data-flow/ingestion/external-data-sources/core-external-data-workflow/-/issues/51)
56+
> Support for [multiple data partitions](https://community.opengroup.org/osdu/platform/data-flow/ingestion/external-data-sources/core-external-data-workflow/-/issues/51) is currently enabled for manual triggering of the EDS Ingest DAG, but this feature has not yet been implemented for the EDS Scheduler.
5757
5858
We notify you once EDS preview is enabled in your Azure Data Manager for Energy resource.
5959

6060
## Known issues
61-
- Below issues are specific to [OSDU®](https://osduforum.org/) M18 release:
61+
- Below issues are specific to [OSDU®](https://osduforum.org/) M23 release:
6262
- EDS ingest DAG results in failures when the data supplier’s wrapper Search service is unavailable.
6363
- EDS Dataset service response provides an empty response when data supplier’s Dataset wrapper service is unavailable.
6464
- Secret service responds with 5xx HTTP response code instead of 4xx in some cases. For example,
6565
- When an application tries to recover a deleted secret, which isn't deleted.
6666
- When an application tries to get an invalid deleted secret.
6767

6868
## Limitations
69-
Some EDS capabilities like **Naturalization, Reverse Naturalization, Reference data mapping** are unavailable in the M18 [OSDU®](https://osduforum.org/) release (available in later releases), and hence unavailable in Azure Data Manager for Energy M18 release. These features are available once we upgrade to subsequent [OSDU®](https://osduforum.org/) milestone release.
70-
69+
The Naturalization DAG workflow won't be included in the M23 release.
70+
7171
## FAQ
7272
See [External data sources FAQ.](faq-energy-data-services.yml#external-data-sources)
7373

articles/energy-data-services/how-to-register-external-data-sources.md

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,8 @@ Use **getRetrievalInstructions** API in `005: Dataset Service collection` to ret
5353
## References
5454
* [External data sources FAQ](faq-energy-data-services.yml#external-data-sources)
5555
* [EDS documentation 1.0](https://gitlab.opengroup.org/osdu/subcommittees/ea/projects/extern-data/docs/-/blob/master/Design%20Documents/Training/EDS_Documentation-1.0.docx)
56-
* [EDS M18 release notes](https://community.opengroup.org/osdu/governance/project-management-committee/-/wikis/M18-Release-Notes#external-data-sources-eds)
56+
* [OSDU EDS Documentation](https://osdu.pages.opengroup.org/platform/data-flow/ingestion/osdu-airflow-lib/)
57+
* [EDS M23 release notes](https://community.opengroup.org/osdu/governance/project-management-committee/-/wikis/M23-Release-Notes)
5758
* [EDS Postman collection](https://community.opengroup.org/osdu/platform/pre-shipping/-/blob/main/R3-M20/QA_Artifacts_M20/eds_testing_doc/EDS_Ingest_M20_Pre-Shipping_Setup_and_Testing.postman_collection.json?ref_type=heads)
5859
* [EDS supplier enablement guide](https://gitlab.opengroup.org/osdu/r3-program-activities/docs/-/raw/master/R3%20Document%20Snapshot/23-osdu-eds-data-supplier-enablement-guide.pdf)
59-
* [EDS issues](https://community.opengroup.org/osdu/platform/data-flow/ingestion/external-data-sources/core-external-data-workflow/-/issues)
60+
* [EDS issues](https://community.opengroup.org/osdu/platform/data-flow/ingestion/external-data-sources/core-external-data-workflow/-/issues)

articles/energy-data-services/osdu-services-on-adme.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ Azure Data Manager for Energy is currently compliant with the M23 OSDU® milesto
3737

3838
### Ingestion services
3939
- **EDS DMS [[Preview]](how-to-enable-external-data-sources.md)**: Pulls specified data (metadata) from OSDU-compliant data sources via scheduled jobs while leaving associated dataset files (LAS, SEG-Y, etc.) stored at the external source for retrieval on demand.
40-
- **EDS Fetch & Ingest DAG**: Facilitates fetching data from external providers and ingesting it into the OSDU platform. It involves steps like registering with providers, creating data jobs, and triggering ingestion.
40+
- **EDS Fetch & Ingest DAG**: Facilitates fetching data from external providers and ingesting it into the OSDU platform. It involves steps like registering with providers, creating data jobs, and triggering ingestion. With the M23 release, EDS Fetch and Ingest DAG includes new features like Parent and Reference data mapping.
4141
- **EDS Scheduler DAG**: Automates data fetching based on predefined schedules and sends emails to recipients as needed. It ensures data remains current without manual intervention
4242
- **Ingestion Workflow**: Initiates business processes within the system. During the prototype phase, it facilitates CRUD operations on workflow metadata and triggers workflows in Apache Airflow. Additionally, the service manages process startup records, acting as a wrapper around Airflow functions.
4343
- **Manifest Ingestion DAG**: Used for ingesting single or multiple metadata artifacts about datasets in Azure Data Manager for Energy instance. Learn more about [Manifest-based ingestion](concepts-manifest-ingestion.md).

articles/firewall/dns-settings.md

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -89,7 +89,10 @@ For example, to use FQDNs in network rule, DNS proxy should be enabled. But if a
8989
DNS proxy configuration requires three steps:
9090
1. Enable the DNS proxy in Azure Firewall DNS settings.
9191
2. Optionally, configure your custom DNS server or use the provided default.
92-
3. Configure the Azure Firewall private IP address as a custom DNS address in your virtual network DNS server settings. This setting ensures DNS traffic is directed to Azure Firewall.
92+
3. Configure the Azure Firewall private IP address as a custom DNS address in your virtual network DNS server settings to direct DNS traffic to the Azure Firewall.
93+
94+
> [!NOTE]
95+
> If you choose to use a custom DNS server, select any IP address within the virtual network, excluding those in the Azure Firewall subnet.
9396
9497
#### [Portal](#tab/browser)
9598

articles/virtual-network/accelerated-networking-overview.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ The following diagram illustrates how two VMs communicate with and without Accel
3131

3232
Accelerated Networking has the following benefits:
3333

34-
- **Lower latency and higher packets per second (pps)**. Removing the virtual switch from the data path eliminates the time that packets spend in the host for policy processing. It also increases the number of packets that the VM can process.
34+
- **Lower latency and higher packets per second**. Removing the virtual switch from the data path eliminates the time that packets spend in the host for policy processing. It also increases the number of packets that the VM can process.
3535

3636
- **Reduced jitter**. Processing time for virtual switches depends on the amount of policy to apply and the workload of the CPU that does the processing. Offloading policy enforcement to the hardware removes that variability by delivering packets directly to the VM. Offloading also removes the host-to-VM communication, all software interrupts, and all context switches.
3737

articles/virtual-network/virtual-machine-network-throughput.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -51,13 +51,13 @@ Today, the Azure networking stack supports 1M total flows (500k inbound and 500k
5151

5252
- VMs that belong to a virtual network can handle 500k ***active connections*** for all VM sizes with 500k ***active flows in each direction***.
5353

54-
- VMs with network virtual appliances (NVAs) such as gateway, proxy, firewall can handle 250k ***active connections*** with 500k ***active flows in each direction*** due to the forwarding and more new flow creation on new connection setup to the next hop as shown in the above diagram.
54+
- VMs with NVAs such as gateway, proxy, firewall can handle 250k ***active connections*** with 500k ***active flows in each direction*** due to the forwarding and more new flow creation on new connection setup to the next hop as shown in the above diagram.
5555

5656
Once this limit is hit, other connections are dropped. Connection establishment and termination rates can also affect network performance as connection establishment and termination shares CPU with packet processing routines. We recommend that you benchmark workloads against expected traffic patterns and scale out workloads appropriately to match your performance needs.
5757

5858
Metrics are available in [Azure Monitor](../azure-monitor/essentials/metrics-supported.md#microsoftcomputevirtualmachines) to track the number of network flows and the flow creation rate on your VM or Virtual Machine Scale Sets instances.
5959

60-
:::image type="content" source="./media/virtual-machine-network-throughput/azure-monitor-flow-metrics.png" alt-text="AScreenshot shows the Metrics page of Azure Monitor with a line chart and totals for inbound and outbound flows.":::
60+
:::image type="content" source="./media/virtual-machine-network-throughput/azure-monitor-flow-metrics.png" alt-text="A screenshot shows the Metrics page of Azure Monitor with a line chart and totals for inbound and outbound flows.":::
6161

6262
## Next steps
6363

articles/virtual-network/virtual-network-bandwidth-testing.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ This article describes how to use the free NTTTCP tool from Microsoft to test ne
2525
- Note the number of VM cores and the receiver VM IP address to use in the commands. Both the sender and receiver commands use the receiver's IP address.
2626

2727
>[!NOTE]
28-
>Testing by using a virtual IP (VIP) is possible, but is beyond the scope of this article.
28+
>Testing by using a virtual IP is possible, but is beyond the scope of this article.
2929
3030
**Examples used in this article**
3131

articles/web-application-firewall/ag/application-gateway-crs-rulegroups-rules.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -202,7 +202,7 @@ CRS 3.0 includes 13 rule groups, as shown in the following table. Each group con
202202
CRS 2.2.9 includes 10 rule groups, as shown in the following table. Each group contains multiple rules, which can be disabled.
203203

204204
> [!NOTE]
205-
> CRS 2.2.9 is no longer supported for new WAF policies. We recommend you upgrade to the latest CRS version. CRS 2.2.9 can't be used along with CRS 3.2/DRS 2.1 and greater versions.
205+
> CRS 2.2.9 is no longer supported for new WAF policies. We recommend you upgrade to the latest CRS 3.2/DRS 2.1 and greater versions.
206206
207207
|Rule group name|Description|
208208
|---|---|

0 commit comments

Comments
 (0)