Skip to content

Commit 7a3acfc

Browse files
authored
Merge pull request #292871 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 6c0d63a + 4572f2e commit 7a3acfc

9 files changed

+30
-19
lines changed

articles/application-gateway/application-gateway-probe-overview.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ Once the probe detects a failed response, the counter for "Unhealthy threshold"
4646

4747
An application gateway automatically configures a default health probe when you don't set up any custom probe configuration. The monitoring behavior works by making an HTTP GET request to the IP addresses or FQDN configured in the backend pool. For default probes if the backend http settings are configured for HTTPS, the probe uses HTTPS to test health of the backend servers.
4848

49-
For example: You configure your application gateway to use backend servers A, B, and C to receive HTTP network traffic on port 80. The default health monitoring tests the three servers every 30 seconds for a healthy HTTP response with a 30-second-timeout for each request. A healthy HTTP response has a [status code](/troubleshoot/developer/webapps/iis/www-administration-management/http-status-code) between 200 and 399. In this case, the HTTP GET request for the health probe looks like `http://127.0.0.1/`. Also see [HTTP response codes in Application Gateway](http-response-codes.md).
49+
For example: You configure your application gateway to use backend servers A, B, and C to receive HTTP network traffic on port 80. The default health monitoring tests the three servers every 30 seconds for a healthy HTTP response with a 30-second-timeout for each request. A healthy HTTP response has a [status code](/troubleshoot/developer/webapps/iis/www-administration-management/http-status-code) between 200 and 399. In this case, the HTTP GET host header for the health probe looks like `http://127.0.0.1/`. Also see [HTTP response codes in Application Gateway](http-response-codes.md).
5050

5151
If the default probe check fails for server A, the application gateway stops forwarding requests to this server. The default probe still continues to check for server A every 30 seconds. When server A responds successfully to one request from a default health probe, application gateway starts forwarding the requests to the server again.
5252

articles/application-gateway/configuration-listeners.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ When you create a new listener, you choose between [*basic* and *multi-site*](./
2929

3030
For the v1 SKU, requests are matched according to the order of the rules and the type of listener. If a rule with basic listener comes first in the order, it's processed first and will accept any request for that port and IP combination. To avoid this, configure the rules with multi-site listeners first and push the rule with the basic listener to the last in the list.
3131

32-
For the v2 SKU, multi-site listeners are processed before basic listeners, unless rule priority is defined. If using rule priority, wildcard listeners should be defined a priority with a number greater than non-wildcard listeners, to ensure non-wildcard listeners execute prior to the wildcard listeners.
32+
For the v2 SKU, rule priority defines the order in which listeners are processed. Wildcard and basic listeners should be defined a priority with a number greater than site-specific and multi-site listeners, to ensure site-specific and multi-site listeners execute prior to the wildcard and basic listeners.
3333

3434
## Frontend IP address
3535

articles/application-gateway/ingress-controller-letsencrypt-certificate-application-gateway.md

Lines changed: 11 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ Use the following steps to install [cert-manager](https://docs.cert-manager.io)
3232
#!/bin/bash
3333

3434
# Install the CustomResourceDefinition resources separately
35-
kubectl apply -f https://github.com/cert-manager/cert-manager/releases/download/v1.10.1/cert-manager.crds.yaml
35+
kubectl apply -f https://github.com/cert-manager/cert-manager/releases/download/v1.16.1/cert-manager.crds.yaml
3636

3737
# Create the namespace for cert-manager
3838
kubectl create namespace cert-manager
@@ -51,7 +51,7 @@ Use the following steps to install [cert-manager](https://docs.cert-manager.io)
5151
helm install \
5252
cert-manager jetstack/cert-manager \
5353
--namespace cert-manager \
54-
--version v1.10.1 \
54+
--version v1.16.1 \
5555
# --set installCRDs=true
5656

5757
# To automatically install and manage the CRDs as part of your Helm release,
@@ -94,8 +94,12 @@ Use the following steps to install [cert-manager](https://docs.cert-manager.io)
9494
# file is present at the domain
9595
solvers:
9696
- http01:
97-
ingress:
98-
ingressclassName: azure/application-gateway
97+
ingress:
98+
# class: azure/application-gateway
99+
ingressTemplate:
100+
metadata:
101+
annotations:
102+
kubernetes.io/ingress.class: azure/application-gateway
99103
EOF
100104
```
101105
@@ -110,8 +114,8 @@ Use the following steps to install [cert-manager](https://docs.cert-manager.io)
110114
apiVersion: networking.k8s.io/v1
111115
kind: Ingress
112116
metadata:
113-
name: guestbook-letsencrypt-staging
114-
annotations:
117+
name: guestbook-letsencrypt-staging
118+
annotations:
115119
kubernetes.io/ingress.class: azure/application-gateway
116120
cert-manager.io/cluster-issuer: letsencrypt-staging
117121
spec:
@@ -135,7 +139,7 @@ Use the following steps to install [cert-manager](https://docs.cert-manager.io)
135139
136140
4. After you successfully set up your staging certificate, you can switch to a production ACME server:
137141
138-
1. Replace the staging annotation on your ingress resource with `certmanager.k8s.io/cluster-issuer: letsencrypt-prod`.
142+
1. Replace the staging annotation on your ingress resource with `cert-manager.io/cluster-issuer: letsencrypt-prod`.
139143
1. Delete the existing staging `ClusterIssuer` resource that you created earlier. Create a new staging resource by replacing the ACME server from the previous `ClusterIssuer` YAML with `https://acme-v02.api.letsencrypt.org/directory`.
140144
141145
Before the Let's Encrypt certificate expires, `cert-manager` automatically updates the certificate in the Kubernetes secret store. At that point, the Application Gateway Ingress Controller applies the updated secret referenced in the ingress resources that it's using to configure Application Gateway.

articles/application-gateway/redirect-external-site-cli.md

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -65,12 +65,13 @@ az network application-gateway create \
6565
--vnet-name myVNet \
6666
--subnet myAGsubnet \
6767
--capacity 2 \
68-
--sku Standard_Medium \
68+
--sku Standard_v2 \
6969
--http-settings-cookie-based-affinity Disabled \
7070
--frontend-port 8080 \
7171
--http-settings-port 80 \
7272
--http-settings-protocol Http \
73-
--public-ip-address myAGPublicIPAddress
73+
--public-ip-address myAGPublicIPAddress \
74+
--priority 10
7475
```
7576

7677
It may take several minutes for the application gateway to be created. After the application gateway is created, you can see these new features of it:
@@ -116,7 +117,9 @@ az network application-gateway rule create \
116117
--resource-group myResourceGroupAG \
117118
--http-listener redirectListener \
118119
--rule-type Basic \
119-
--redirect-config myredirect
120+
--redirect-config myredirect \
121+
--priority 11
122+
120123
```
121124

122125
## Test the application gateway

articles/application-gateway/tutorial-autoscale-ps.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -151,9 +151,9 @@ $listener02 = New-AzApplicationGatewayHttpListener -Name "HTTPListener" `
151151
$setting = New-AzApplicationGatewayBackendHttpSettings -Name "BackendHttpSetting1" `
152152
-Port 80 -Protocol Http -CookieBasedAffinity Disabled -PickHostNameFromBackendAddress
153153
$rule01 = New-AzApplicationGatewayRequestRoutingRule -Name "Rule1" -RuleType basic `
154-
-BackendHttpSettings $setting -HttpListener $listener01 -BackendAddressPool $pool
154+
-BackendHttpSettings $setting -HttpListener $listener01 -BackendAddressPool $pool -Priority 1
155155
$rule02 = New-AzApplicationGatewayRequestRoutingRule -Name "Rule2" -RuleType basic `
156-
-BackendHttpSettings $setting -HttpListener $listener02 -BackendAddressPool $pool
156+
-BackendHttpSettings $setting -HttpListener $listener02 -BackendAddressPool $pool -Priority 2
157157
```
158158

159159
## Specify autoscale

articles/dns/dns-traffic-log-how-to.md

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -239,7 +239,8 @@ Set up a local PowerShell repository and install the Az.DnsResolver PowerShell m
239239
$domainListName = "domainlist-$($nameSuffix)"
240240
$securityRuleName = "securityrule-$($nameSuffix)"
241241
$resolverPolicyLinkName = "dnsresolverpolicylink"
242-
$storageAccountName = "stor-$($name)" # Customize this, taking care that the name is not too long
242+
$storageAccountName = "stor$($name.ToLower())" # Customize this, taking care that the name is not too long
243+
$storageAccountName = $storageAccountName.Substring(0, [Math]::Min(24, $storageAccountName.Length)) # Storage account names must be 3-24 characters long
243244
$diagnosticSettingName = "diagnosticsetting-$($nameSuffix)"
244245
$vnetId = "/subscriptions/$subscriptionId/resourceGroups/$resourceGroupName/providers/Microsoft.Network/virtualNetworks/$virtualNetworkName"
245246
@@ -369,4 +370,4 @@ At line:1 char:1
369370

370371
- Review concepts related to [DNS security policy](dns-security-policy.md).
371372
- Review [Azure Private DNS zones scenarios](private-dns-scenarios.md).
372-
- Review [DNS resolution in virtual networks](../virtual-network/virtual-networks-name-resolution-for-vms-and-role-instances.md).
373+
- Review [DNS resolution in virtual networks](../virtual-network/virtual-networks-name-resolution-for-vms-and-role-instances.md).

articles/storage/common/storage-explorer-network.md

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,8 @@ Storage Explorer makes requests to various endpoints while in use. The following
3434
- `(blob|file|queue|table|dfs).core.windows.net` (global Azure)
3535
- `(blob|file|queue|table|dfs).core.chinacloudapi.cn` (Microsoft Azure operated by 21Vianet)
3636
- `(blob|file|queue|table|dfs).core.usgovcloudapi.net` (Azure US Government)
37-
- Storage Explorer updating: `storageexplorerpublish.blob.core.windows.net`
37+
- Storage Explorer updating:
38+
- `storage-explorer-publishing-feapcgfgbzc2cjek.b01.azurefd.net`
3839
- Microsoft link forwarding:
3940
- `aka.ms`
4041
- `go.microsoft.com`

articles/traffic-manager/traffic-manager-configure-weighted-routing-method.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -45,8 +45,8 @@ In this tutorial, you learn how to:
4545
| Protocol | Select a protocol for endpoint monitoring. *Options: HTTP, HTTPS, and TCP* |
4646
| Port | Specify the port number. |
4747
| Path | To monitor endpoints, you must specify a path and filename. A forward slash "/" is a valid entry for the relative path and implies that the file is in the root directory (default). |
48-
| Custom Header settings | Configure the Custom Headers in format host:contoso.com,newheader:newvalue. Maximum supported pair is 8. Applicable for Http and Https protocol. Applicable for all endpoints in the profile |
49-
| Expected Status Code Ranges (default: 200) | Configure the Status Code Ranges in format 200-299,301-301. Maximum supported range is 8. Applicable for Http and Https protocol. Applicable for all endpoints in the profile |
48+
| Custom Header settings | Configure the Custom Headers in format host:contoso.com,newheader:newvalue. Maximum supported pair is 8. Applicable for HTTP and HTTPS protocol. Applicable for all endpoints in the profile |
49+
| Expected Status Code Ranges (default: 200) | Configure the Status Code Ranges in format 200-299,301-301. Maximum supported range is 8. Applicable for HTTP and HTTPS protocol. Applicable for all endpoints in the profile |
5050
| Probing interval | Configure the time interval between endpoint health probes. You can choose 10 or 30 seconds. |
5151
| Tolerate number of failures | Configure the number of health probe failures tolerated before an endpoint failure is triggered. You can enter a number between 0 and 9. |
5252
| Probe timeout | Configure the time required before an endpoint health probe times out. This value must be at least 5 and smaller than the probing interval value. |

includes/dns-limits.md

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -99,10 +99,12 @@ ms.author: greglin
9999
| Resource | Limit |
100100
| --- | --- |
101101
| DNS private resolvers per subscription |15|
102+
| DNS private resolvers per virtual network |1|
102103
| Inbound endpoints per DNS private resolver |5|
103104
| Outbound endpoints per DNS private resolver |5|
104105
| Forwarding rules per DNS forwarding ruleset |1000|
105106
| Virtual network links per DNS forwarding ruleset |500|
107+
| DNS forwarding ruleset linked to a virtual network |1|
106108
| Outbound endpoints per DNS forwarding ruleset |2|
107109
| DNS forwarding rulesets per outbound endpoint |2|
108110
| Target DNS servers per forwarding rule |6|

0 commit comments

Comments
 (0)