Skip to content

Commit a63be0c

Browse files
Merge branch 'main' of https://github.com/MicrosoftDocs/azure-docs-pr into QSG
2 parents f2bbcff + 494160c commit a63be0c

18 files changed

+179
-44
lines changed

articles/app-service/environment/using-an-ase.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -139,7 +139,7 @@ To configure DNS in Azure DNS Private zones:
139139

140140
The DNS settings for your ASE default domain suffix do not restrict your apps to only being accessible by those names. You can set a custom domain name without any validation on your apps in an ILB ASE. If you then want to create a zone named *contoso.net*, you could do so and point it to the ILB IP address. The custom domain name works for app requests but doesn't for the scm site. The scm site is only available at *<appname>.scm.<asename>.appserviceenvironment.net*.
141141

142-
The zone named *.<asename>.appserviceenvironment.net* is globally unique. Before May 2019, customers were able to specify the domain suffix of the ILB ASE. If you wanted to use *.contoso.com* for the domain suffix, you were able do so and that would include the scm site. There were challenges with that model including; managing the default TLS/SSL certificate, lack of single sign-on with the scm site, and the requirement to use a wildcard certificate. The ILB ASE default certificate upgrade process was also disruptive and caused application restarts. To solve these problems, the ILB ASE behavior was changed to use a domain suffix based on the name of the ASE and with a Microsoft owned suffix. The change to the ILB ASE behavior only affects ILB ASEs made after May 2019. Pre-existing ILB ASEs must still manage the default certificate of the ASE and their DNS configuration.
142+
The zone named *.<asename>.appserviceenvironment.net* is globally unique. Before May 2019, customers were able to specify the domain suffix of the ILB ASE. If you wanted to use *.contoso.com* for the domain suffix, you were able do so and that would include the scm site. There were challenges with that model including; managing the default TLS/SSL certificate, lack of single sign-on with the scm site, and the requirement to use a wildcard certificate. The ILB ASE default certificate upgrade process was also disruptive and caused application restarts. To solve these problems, the ILB ASE behavior was changed to use a domain suffix based on the name of the ASE and with a Microsoft owned suffix. The change to the ILB ASE behavior only affects ILB ASEs made after May 2019. Pre-existing ILB ASEs must still manage the default certificate of the ASE and their DNS configuration. If your ILB ASE V2 was created after May 2019, you do not need to manage the ILB default certificate as it is managed by Microsoft.
143143

144144
## Publishing
145145

@@ -304,4 +304,4 @@ For more specific examples, use: az find "az appservice ase"
304304
[AppDeploy]: ../deploy-local-git.md
305305
[ASEWAF]: ./integrate-with-application-gateway.md
306306
[AppGW]: ../../web-application-firewall/ag/ag-overview.md
307-
[logalerts]: ../../azure-monitor/alerts/alerts-log.md
307+
[logalerts]: ../../azure-monitor/alerts/alerts-log.md
10.4 KB
Loading
30.1 KB
Loading
Loading
Loading
Loading
Loading

articles/azure-resource-manager/templates/template-tutorial-create-first-template.md

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

articles/cosmos-db/includes/cosmos-db-emulator-docdb-api.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,4 +19,4 @@ ms.reviewer: mjbrown
1919
ms.custom: "include file"
2020
---
2121

22-
You can [try Azure Cosmos DB for free](https://azure.microsoft.com/try/cosmosdb/), without an Azure subscription, and with no commitment required. Alternatively, you can create an [Azure Cosmos DB free tier account](../optimize-dev-test.md#azure-cosmos-db-free-tier), with the first 400 RU/s and 5 GB of storage for free. You can also use the [Azure Cosmos DB emulator](../local-emulator.md) with a URI of `https://localhost:8081`. For the key to use with the emulator, see [Authenticating requests](../local-emulator.md#authenticate-requests).
22+
You can [try Azure Cosmos DB for free](/azure/cosmos-db/try-free), without an Azure subscription, and with no commitment required. Alternatively, you can create an [Azure Cosmos DB free tier account](../optimize-dev-test.md#azure-cosmos-db-free-tier), with the first 400 RU/s and 5 GB of storage for free. You can also use the [Azure Cosmos DB emulator](../local-emulator.md) with a URI of `https://localhost:8081`. For the key to use with the emulator, see [Authenticating requests](../local-emulator.md#authenticate-requests).

articles/defender-for-cloud/export-to-siem.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -113,7 +113,7 @@ Each SIEM platform has a tool to enable it to receive alerts from Azure Event Hu
113113
| Tool | Hosted in Azure | Description |
114114
|:---|:---| :---|
115115
| IBM QRadar | No | The Microsoft Azure DSM and Microsoft Azure Event Hubs Protocol are available for download from [the IBM support website](https://www.ibm.com/docs/en/qsip/7.4?topic=microsoft-azure-platform). |
116-
| Splunk | No | [Splunk Add-on for Microsoft Cloud Services](https://splunkbase.splunk.com/app/3110/) is an open source project available in Splunkbase. <br><br> If you can't install an add-on in your Splunk instance, for example if you're using a proxy or running on Splunk Cloud, you can forward these events to the Splunk HTTP Event Collector using [Azure Function For Splunk](https://github.com/Microsoft/AzureFunctionforSplunkVS), which is triggered by new messages in the event hub. |
116+
| Splunk | No | [Splunk Add-on for Microsoft Cloud Services](https://splunkbase.splunk.com/app/3110/) is an open source project available in Splunkbase. <br><br> If you can't install an add-on in your Splunk instance, for example if you're using a proxy or running on Splunk Cloud, you can forward these events to the Splunk HTTP Event Collector using [Azure Function For Splunk](https://github.com/splunk/azure-functions-splunk), which is triggered by new messages in the event hub. |
117117

118118
## Stream alerts with continuous export
119119

0 commit comments

Comments
 (0)