Skip to content

Commit 32dffb9

Browse files
authored
Merge pull request #97694 from MicrosoftDocs/repo_sync_working_branch
Confirm merge from repo_sync_working_branch to master to sync with https://github.com/Microsoft/azure-docs (branch master)
2 parents 8734932 + 48f89e2 commit 32dffb9

File tree

7 files changed

+32
-15
lines changed

7 files changed

+32
-15
lines changed

articles/active-directory/authentication/active-directory-certificate-based-authentication-get-started.md

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -41,6 +41,9 @@ To configure certificate-based authentication, the following statements must be
4141
- Your client device must have access to at least one certificate authority that issues client certificates.
4242
- A client certificate for client authentication must have been issued to your client.
4343

44+
>[!IMPORTANT]
45+
>The maximum size of a CRL for Azure Active Directory to successfully download and cache is 20MB, and the time required to download the CRL must not exceed 10 seconds. If Azure Active Directory can't download a CRL, certificate based authentications using certificates issued by the corresponding CA will fail. Best practices to ensure CRL files are within size constraints are to keep certificate lifetimes to within reasonable limits and to clean up expired certificates.
46+
4447
## Step 1: Select your device platform
4548

4649
As a first step, for the device platform you care about, you need to review the following:

articles/azure-arc/servers/quickstart-onboard-powershell.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -169,15 +169,15 @@ Upon successful completion, your machine is connected to Azure. You can view you
169169
For **Linux**, if the server requires a proxy server, you can either:
170170

171171
* Run the `install_linux_hybrid_agent.sh` script from the [Install the Agent](#download-and-install-the-agent) section above, with `--proxy`.
172-
* If you have already installed the agent, execute the command `/opt/azcmagent/bin/hybridrp_proxy add https://{proxy-url}:{proxy-port}`, which configures the proxy and restarts the agent.
172+
* If you have already installed the agent, execute the command `/opt/azcmagent/bin/hybridrp_proxy add http://{proxy-url}:{proxy-port}`, which configures the proxy and restarts the agent.
173173

174174
#### Windows
175175

176176
For **Windows**, if the server requires proxy server for access to internet resources, you should run the command below to set the proxy server environment variable. This allows the agent to use proxy server for internet access.
177177

178178
```powershell
179179
# If a proxy server is needed, execute these commands with actual proxy URL
180-
[Environment]::SetEnvironmentVariable("https_proxy", "{https:\\proxy-url:proxyport}", "Machine")
180+
[Environment]::SetEnvironmentVariable("https_proxy", "http://{proxy-url}:{proxy-port}", "Machine")
181181
$env:https_proxy = [System.Environment]::GetEnvironmentVariable("https_proxy","Machine")
182182
# The agent service needs to be restarted after the proxy environment variable is set in order for the changes to take effect.
183183
Restart-Service -Name himds

articles/azure-monitor/app/java-trace-logs.md

Lines changed: 22 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -18,28 +18,41 @@ If you're using Logback or Log4J (v1.2 or v2.0) for tracing, you can have your t
1818
1919
## Using the Application Insights Java agent
2020

21-
You can configure the Application Insights Java agent to automatically capture your logs,
22-
by enabling the feature in the `AI-Agent.xml` file:
21+
By default, the Application Insights Java agent automatically captures logging performed at `WARN` level and above.
22+
23+
You can change the threshold of logging that is captured using the `AI-Agent.xml` file:
24+
25+
```xml
26+
<?xml version="1.0" encoding="utf-8"?>
27+
<ApplicationInsightsAgent>
28+
<Instrumentation>
29+
<BuiltIn>
30+
<Logging threshold="info"/>
31+
</BuiltIn>
32+
</Instrumentation>
33+
</ApplicationInsightsAgent>
34+
```
35+
36+
You can disable the Java agent's logging capture using the `AI-Agent.xml` file:
2337

2438
```xml
2539
<?xml version="1.0" encoding="utf-8"?>
2640
<ApplicationInsightsAgent>
2741
<Instrumentation>
28-
<BuiltIn enabled="true">
29-
<Logging enabled="true" />
42+
<BuiltIn>
43+
<Logging enabled="false"/>
3044
</BuiltIn>
3145
</Instrumentation>
32-
<AgentLogger />
3346
</ApplicationInsightsAgent>
3447
```
3548

36-
Alternatively, you can follow the instructions below.
49+
## Alternatively (as opposed to using the Java agent), you can follow the instructions below
3750

38-
## Install the Java SDK
51+
### Install the Java SDK
3952

4053
Follow the instructions to install [Application Insights SDK for Java][java], if you haven't already done that.
4154

42-
## Add logging libraries to your project
55+
### Add logging libraries to your project
4356
*Choose the appropriate way for your project.*
4457

4558
#### If you're using Maven...
@@ -120,7 +133,7 @@ Follow the guidelines to manually install Application Insights Java SDK, downloa
120133
| Log4j v1.2 |[Log4J v1.2 appender Jar](https://search.maven.org/#search%7Cga%7C1%7Ca%3A%22applicationinsights-logging-log4j1_2%22) |applicationinsights-logging-log4j1_2 |
121134

122135

123-
## Add the appender to your logging framework
136+
### Add the appender to your logging framework
124137
To start getting traces, merge the relevant snippet of code to the Log4J or Logback configuration file:
125138

126139
*Logback*

articles/frontdoor/front-door-faq.md

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -175,6 +175,8 @@ The following are the current cipher suites supported by Azure Front Door Servic
175175
- TLS_RSA_WITH_AES_128_CBC_SHA256
176176
- TLS_RSA_WITH_AES_256_CBC_SHA
177177
- TLS_RSA_WITH_AES_128_CBC_SHA
178+
- TLS_DHE_RSA_WITH_AES_128_GCM_SHA256
179+
- TLS_DHE_RSA_WITH_AES_256_GCM_SHA384
178180

179181
### Does Azure Front Door Service also support re-encryption of traffic to the backend?
180182

articles/frontdoor/front-door-http-headers-protocol.md

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,6 +38,7 @@ Front Door Service includes headers from an incoming request unless removed beca
3838
| X-Forwarded-For | X-Forwarded-For: 127.0.0.1 </br> The X-Forwarded-For (XFF) HTTP header field often identifies the originating IP address of a client connecting to a web server through an HTTP proxy or load balancer. If there's an existing XFF header, then Front Door appends the client socket IP to it or adds the XFF header with the client socket IP. |
3939
| X-Forwarded-Host | X-Forwarded-Host: contoso.azurefd.net </br> The X-Forwarded-Host HTTP header field is a common method used to identify the original host requested by the client in the Host HTTP request header. This is because the host name from Front Door may differ for the backend server handling the request. |
4040
| X-Forwarded-Proto | X-Forwarded-Proto: http </br> The X-Forwarded-Proto HTTP header field is often used to identify the originating protocol of an HTTP request because Front Door, based on configuration, might communicate with the backend by using HTTPS. This is true even if the request to the reverse proxy is HTTP. |
41+
| X-FD-HealthProbe | X-FD-HealthProbe HTTP header field is used to identify the health probe from Front Door. If this header set to 1, the request is health probe. You can use when want to strict access from paticular Front Door with X-Forwarded-Host header field. |
4142

4243
## Front Door Service to client
4344

@@ -53,4 +54,4 @@ Any headers sent to Front Door from the backend are also passed through to the c
5354
- [How Front Door works](front-door-routing-architecture.md)
5455

5556
<!--Image references-->
56-
[1]: ./media/front-door-http-headers-protocol/front-door-protocol-summary.png
57+
[1]: ./media/front-door-http-headers-protocol/front-door-protocol-summary.png

articles/marketplace/marketplace-commercial-transaction-capabilities-and-considerations.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,7 @@ Depending on the transaction option used, the publisher's software license fees
6363

6464
* Pay-as-you-go: Software license fees are presented as a per-hour, per-core (vCPU) pricing rate based on the Azure infrastructure used. This only applies to Virtual Machines and Azure Applications.
6565

66-
* Subscription pricing: Software license fees are presented as a monthly or annual, recurring fee billed as a flat rate or per-seat. This only applies to SaaS Apps and Azure Applications - Managed Apps.
66+
* Subscription pricing: Software license fees are presented as a monthly or annual, recurring fee billed as a flat rate or per-seat. This only applies to SaaS Apps and Azure Applications - Managed Apps.
6767

6868
* Free software trial: No charge for software licenses for 30-days or 90-days.
6969

includes/virtual-wan-faq-include.md

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -32,8 +32,6 @@ No. You can use any VPN-capable device that adheres to the Azure requirements fo
3232

3333
### How do Virtual WAN partners automate connectivity with Azure Virtual WAN?
3434

35-
Software-defined connectivity solutions typically manage their branch devices using a controller, or a device provisioning center. The controller can use Azure APIs to automate connectivity to the Azure Virtual WAN. For more information, see Virtual WAN partner automation.
36-
3735
Software-defined connectivity solutions typically manage their branch devices using a controller, or a device provisioning center. The controller can use Azure APIs to automate connectivity to the Azure Virtual WAN. The automation includes uploading branch information, downloading the Azure configuration, setting up IPSec tunnels into Azure Virtual hubs, and automatically setting up connectivity form the branch device to Azure Virtual WAN. When you have hundreds of branches, connecting using Virtual WAN CPE Partners is easy because the onboarding experience takes away the need to set up, configure, and manage large-scale IPsec connectivity. For more information, see [Virtual WAN partner automation](../articles/virtual-wan/virtual-wan-configure-automation-providers.md).
3836

3937
### Am I required to use a preferred partner device?

0 commit comments

Comments
 (0)