Skip to content

Commit 367cc9f

Browse files
authored
Merge pull request #109006 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 1d63d17 + dd31cf4 commit 367cc9f

File tree

13 files changed

+62
-38
lines changed

13 files changed

+62
-38
lines changed

articles/active-directory/managed-identities-azure-resources/services-support-managed-identities.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,8 +27,8 @@ The following Azure services support managed identities for Azure resources:
2727

2828
| Managed identity type | All Generally Available<br>Global Azure Regions | Azure Government | Azure Germany | Azure China 21Vianet |
2929
| --- | :-: | :-: | :-: | :-: |
30-
| System assigned | ![Available][check] | Preview | Preview | Preview |
31-
| User assigned | ![Available][check] | Preview | Preview | Preview |
30+
| System assigned | ![Available][check] | ![Available][check] | Preview | Preview |
31+
| User assigned | ![Available][check] | ![Available][check] | Preview | Preview |
3232

3333
Refer to the following list to configure managed identity for Azure Virtual Machines (in regions where available):
3434

articles/aks/node-auto-repair.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ ms.date: 03/10/2020
1111
AKS continuously checks the health state of worker nodes and performs automatic repair of the nodes if they become unhealthy. This documentation describes how Azure Kubernetes Service (AKS) monitors worker nodes, and repairs unhealthy worker nodes. The documentation is to inform AKS operators on the behavior of node repair functionality. It is also important to note that Azure platform [performs maintenance on Virtual Machines][vm-updates] that experience issues. AKS and Azure work together to minimize service disruptions for your clusters.
1212

1313
> [!Important]
14-
> Noe auto-repair functionality isn't currently supported for Windows Server node pools.
14+
> Node auto-repair functionality isn't currently supported for Windows Server node pools.
1515
1616
## How AKS checks for unhealthy nodes
1717

@@ -51,4 +51,4 @@ Use [Availability Zones][availability-zones] to increase high availability with
5151

5252
<!-- LINKS - Internal -->
5353
[availability-zones]: ./availability-zones.md
54-
[vm-updates]: ../virtual-machines/maintenance-and-updates.md
54+
[vm-updates]: ../virtual-machines/maintenance-and-updates.md

articles/application-gateway/ssl-overview.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ Secure Sockets Layer (SSL) is the standard security technology for establishing
1717

1818
Application Gateway supports SSL termination at the gateway, after which traffic typically flows unencrypted to the backend servers. There are a number of advantages of doing SSL termination at the application gateway:
1919

20-
- **Improved performance** – The biggest performance hit when doing SSL decryption is the initial handshake. To improve performance, the server doing the decryption caches SSL session IDs and manages TLS session tickets. If this is done at the application gateway, all requests from the same client can use the cached values. If it’s done on the backend servers, then each time the client’s requests go to a different server the client has to re‑authenticate. The use of TLS tickets can help mitigate this issue, but they are not supported by all clients and can be difficult to configure and manage.
20+
- **Improved performance** – The biggest performance hit when doing SSL decryption is the initial handshake. To improve performance, the server doing the decryption caches SSL session IDs and manages TLS session tickets. If this is done at the application gateway, all requests from the same client can use the cached values. If it’s done on the backend servers, then each time the client’s requests go to a different server the client must re‑authenticate. The use of TLS tickets can help mitigate this issue, but they are not supported by all clients and can be difficult to configure and manage.
2121
- **Better utilization of the backend servers** – SSL/TLS processing is very CPU intensive, and is becoming more intensive as key sizes increase. Removing this work from the backend servers allows them to focus on what they are most efficient at, delivering content.
2222
- **Intelligent routing** – By decrypting the traffic, the application gateway has access to the request content, such as headers, URI, and so on, and can use this data to route requests.
2323
- **Certificate management** – Certificates only need to be purchased and installed on the application gateway and not all backend servers. This saves both time and money.
@@ -38,7 +38,7 @@ For the SSL connection to work, you need to ensure that the SSL certificate meet
3838
Application gateway supports the following types of certificates:
3939

4040
- CA (Certificate Authority) certificate: A CA certificate is a digital certificate issued by a certificate authority (CA)
41-
- EV (Extended Validation) certificate: An EV certificate is an industry standard certificate guidelines. This will turn the browser locator bar green and publish company name as well.
41+
- EV (Extended Validation) certificate: An EV certificate is a certificate that conforms to industry standard certificate guidelines. This will turn the browser locator bar green and publish the company name as well.
4242
- Wildcard Certificate: This certificate supports any number of subdomains based on *.site.com, where your subdomain would replace the *. It doesn’t, however, support site.com, so in case the users are accessing your website without typing the leading "www", the wildcard certificate will not cover that.
4343
- Self-Signed certificates: Client browsers do not trust these certificates and will warn the user that the virtual service’s certificate is not part of a trust chain. Self-signed certificates are good for testing or environments where administrators control the clients and can safely bypass the browser’s security alerts. Production workloads should never use self-signed certificates.
4444

@@ -90,7 +90,7 @@ Authentication Certificates have been deprecated and replaced by Trusted Root Ce
9090

9191
> [!NOTE]
9292
>
93-
> In order for an SSL certificate to be trusted, that certificate of the backend server must have been issued by a CA that is included in the trusted store of the Application Gateway.If the certificate was not issued by a trusted CA, the Application Gateway will then check to see if the certificate of the issuing CA was issued by a trusted CA, and so on until either a trusted CA is found (at which point a trusted, secure connection will be established) or no trusted CA can be found (at which point the Application Gateway will mark the backend unhealthy). Therefore, it is recommended the backend server certificate contain both the root and intermidiate CAs.
93+
> In order for an SSL certificate to be trusted, that certificate of the backend server must have been issued by a CA that is included in the trusted store of the Application Gateway.If the certificate was not issued by a trusted CA, the Application Gateway will then check to see if the certificate of the issuing CA was issued by a trusted CA, and so on until either a trusted CA is found (at which point a trusted, secure connection will be established) or no trusted CA can be found (at which point the Application Gateway will mark the backend unhealthy). Therefore, it is recommended the backend server certificate contain both the root and intermediate CAs.
9494
9595
- If the certificate is self-signed, or signed by unknown intermediaries, then to enable end to end SSL in v2 SKU a trusted root certificate must be defined. Application Gateway will only communicate with backends whose Server certificate’s root certificate matches one of the list of trusted root certificates in the backend http setting associated with the pool.
9696

articles/azure-functions/functions-create-first-azure-function-azure-cli.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ Before you begin, you must have the following:
3131
::: zone-end
3232

3333
::: zone pivot="programming-language-python"
34-
+ [Python 3.8](https://www.python.org/downloads/release/python-382/), [Python 3.7](https://www.python.org/downloads/release/python-375/), [Python 3.6](https://www.python.org/downloads/release/python-368/), which are supported by Azure Functions.
34+
+ [Python 3.8](https://www.python.org/downloads/release/python-382/), [Python 3.7](https://www.python.org/downloads/release/python-375/), [Python 3.6](https://www.python.org/downloads/release/python-368/), which are supported by Azure Functions (x64).
3535
::: zone-end
3636
::: zone pivot="programming-language-powershell"
3737
+ [PowerShell Core](/powershell/scripting/install/installing-powershell-core-on-windows)

articles/azure-functions/functions-create-first-function-vs-code.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ Before you get started, make sure you have the following requirements in place:
2727
+ [Node.js](https://nodejs.org/), Active LTS and Maintenance LTS versions (10.14.1 recommended). Use the `npm --version` command to check your version.
2828
::: zone-end
2929
::: zone pivot="programming-language-python"
30-
+ [Python 3.8](https://www.python.org/downloads/release/python-381/), [Python 3.7](https://www.python.org/downloads/release/python-375/), [Python 3.6](https://www.python.org/downloads/release/python-368/) are supported by Azure Functions.
30+
+ [Python 3.8](https://www.python.org/downloads/release/python-381/), [Python 3.7](https://www.python.org/downloads/release/python-375/), [Python 3.6](https://www.python.org/downloads/release/python-368/) are supported by Azure Functions (x64).
3131
::: zone-end
3232
::: zone pivot="programming-language-powershell"
3333
+ [PowerShell Core](/powershell/scripting/install/installing-powershell-core-on-windows)

articles/azure-monitor/app/asp-net-core.md

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ The [Application Insights SDK for ASP.NET Core](https://nuget.org/packages/Micro
2424
* **IDE**: Visual Studio, VS Code, or command line.
2525

2626
> [!NOTE]
27-
> If you are using ASP.NET Core 3.0 along with Application Insights, please use the [2.8.0](https://www.nuget.org/packages/Microsoft.ApplicationInsights.AspNetCore/2.8.0) version or higher. This is the only version that supports ASP.NET Core 3.0.
27+
> If you are using ASP.NET Core 3.X along with Application Insights, please use the [2.8.0](https://www.nuget.org/packages/Microsoft.ApplicationInsights.AspNetCore/2.8.0) version or higher. This is the only version that supports ASP.NET Core 3.X.
2828
2929
## Prerequisites
3030

@@ -137,7 +137,7 @@ Support for [performance counters](https://azure.microsoft.com/documentation/art
137137

138138
### EventCounter
139139

140-
`EventCounterCollectionModule` is enabled by default, and it will collect a default set of counters from .NET Core 3.0 apps. The [EventCounter](eventcounters.md) tutorial lists the default set of counters collected. It also has instructions on customizing the list.
140+
`EventCounterCollectionModule` is enabled by default, and it will collect a default set of counters from .NET Core 3.X apps. The [EventCounter](eventcounters.md) tutorial lists the default set of counters collected. It also has instructions on customizing the list.
141141

142142
## Enable client-side telemetry for web applications
143143

@@ -360,11 +360,11 @@ The above does not prevent any auto collection modules from collecting telemetry
360360

361361
## Frequently asked questions
362362

363-
### Does Application Insights support ASP.NET Core 3.0?
363+
### Does Application Insights support ASP.NET Core 3.X?
364364

365-
Yes. Update to [Application Insights SDK for ASP.NET Core](https://nuget.org/packages/Microsoft.ApplicationInsights.AspNetCore) version 2.8.0 or higher. Older versions of the SDK do not support ASP.NET Core 3.0.
365+
Yes. Update to [Application Insights SDK for ASP.NET Core](https://nuget.org/packages/Microsoft.ApplicationInsights.AspNetCore) version 2.8.0 or higher. Older versions of the SDK do not support ASP.NET Core 3.X.
366366

367-
Also, if you are using Visual Studio based instructions from [here](#enable-application-insights-server-side-telemetry-visual-studio), update to the latest version of Visual Studio 2019 (16.3.0) to onboard. Previous versions of Visual Studio do not support automatic onboarding for ASP.NET Core 3.0 apps.
367+
Also, if you are using Visual Studio based instructions from [here](#enable-application-insights-server-side-telemetry-visual-studio), update to the latest version of Visual Studio 2019 (16.3.0) to onboard. Previous versions of Visual Studio do not support automatic onboarding for ASP.NET Core 3.X apps.
368368

369369
### How can I track telemetry that's not automatically collected?
370370

@@ -397,7 +397,7 @@ For more information about custom data reporting in Application Insights, see [A
397397
398398
### Some Visual Studio templates used the UseApplicationInsights() extension method on IWebHostBuilder to enable Application Insights. Is this usage still valid?
399399

400-
While the extension method `UseApplicationInsights()` is still supported, it is marked obsolete in Application Insights SDK version 2.8.0 onwards. It will be removed in the next major version of the SDK. The recommended way to enable Application Insights telemetry is by using `AddApplicationInsightsTelemetry()` because it provides overloads to control some configuration. Also, in ASP.NET Core 3.0 apps, `services.AddApplicationInsightsTelemetry()` is the only way to enable application insights.
400+
While the extension method `UseApplicationInsights()` is still supported, it is marked obsolete in Application Insights SDK version 2.8.0 onwards. It will be removed in the next major version of the SDK. The recommended way to enable Application Insights telemetry is by using `AddApplicationInsightsTelemetry()` because it provides overloads to control some configuration. Also, in ASP.NET Core 3.X apps, `services.AddApplicationInsightsTelemetry()` is the only way to enable application insights.
401401

402402
### I'm deploying my ASP.NET Core application to Web Apps. Should I still enable the Application Insights extension from Web Apps?
403403

@@ -444,9 +444,9 @@ using Microsoft.ApplicationInsights.WindowsServer.TelemetryChannel;
444444
}
445445
```
446446

447-
### Is this SDK supported for the new .NET Core 3.0 Worker Service template applications?
447+
### Is this SDK supported for the new .NET Core 3.X Worker Service template applications?
448448

449-
This SDK requires `HttpContext`, and hence does not work in any non-HTTP applications, including the .NET Core 3.0 Worker Service applications. Refer to [this](worker-service.md) document for enabling application insights in such applications, using the newly released Microsoft.ApplicationInsights.WorkerService SDK.
449+
This SDK requires `HttpContext`, and hence does not work in any non-HTTP applications, including the .NET Core 3.X Worker Service applications. Refer to [this](worker-service.md) document for enabling application insights in such applications, using the newly released Microsoft.ApplicationInsights.WorkerService SDK.
450450

451451
## Open-source SDK
452452

articles/azure-monitor/app/ilogger.md

Lines changed: 5 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -322,22 +322,20 @@ The following examples apply filter rules to ApplicationInsightsLoggerProvider.
322322

323323
### Create filter rules in configuration with appsettings.json
324324

325-
For ApplicationInsightsLoggerProvider, the provider alias is `ApplicationInsights`. The following section of *appsettings.json* configures logs for *Warning* and above from all categories and *Error* and above from categories that start with "Microsoft" to be sent to `ApplicationInsightsLoggerProvider`.
325+
For ApplicationInsightsLoggerProvider, the provider alias is `ApplicationInsights`. The following section of *appsettings.json* instructs logging providers generally to log at level *Warning* and above. It then overrides the `ApplicationInsightsLoggerProvider` to log categories that start with "Microsoft" at level *Error* and above.
326326

327327
```json
328328
{
329329
"Logging": {
330+
"LogLevel": {
331+
"Default": "Warning"
332+
},
330333
"ApplicationInsights": {
331334
"LogLevel": {
332-
"Default": "Warning",
333335
"Microsoft": "Error"
334336
}
335-
},
336-
"LogLevel": {
337-
"Default": "Warning"
338337
}
339-
},
340-
"AllowedHosts": "*"
338+
}
341339
}
342340
```
343341

articles/azure-resource-manager/templates/toc.yml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -242,17 +242,17 @@
242242
- name: InvalidTemplate
243243
href: error-invalid-template.md
244244
- name: Linux deployment issues
245-
href: ../../virtual-machines/linux/troubleshoot-deploy-vm.md
245+
href: ../../virtual-machines/troubleshooting/troubleshoot-deploy-vm-linux.md
246246
- name: NoRegisteredProviderFound
247247
href: error-register-resource-provider.md
248248
- name: NotFound
249249
href: error-not-found.md
250250
- name: ParentResourceNotFound
251251
href: error-parent-resource.md
252252
- name: Provisioning and allocation issues for Linux
253-
href: ../../virtual-machines/linux/troubleshoot-deployment-new-vm.md
253+
href: ../../virtual-machines/troubleshooting/troubleshoot-deployment-new-vm-linux.md
254254
- name: Provisioning and allocation issues for Windows
255-
href: ../../virtual-machines/windows/troubleshoot-deployment-new-vm.md
255+
href: ../../virtual-machines/troubleshooting/troubleshoot-deployment-new-vm-windows.md
256256
- name: RequestDisallowedByPolicy
257257
href: error-policy-requestdisallowedbypolicy.md
258258
- name: ReservedResourceName
@@ -262,7 +262,7 @@
262262
- name: SkuNotAvailable
263263
href: error-sku-not-available.md
264264
- name: Windows deployment issues
265-
href: ../../virtual-machines/windows/troubleshoot-deploy-vm.md
265+
href: ../../virtual-machines/troubleshooting/troubleshoot-deploy-vm-windows.md
266266
- name: Reference
267267
items:
268268
- name: Template reference
@@ -308,4 +308,4 @@
308308
- name: Stack Overflow
309309
href: https://stackoverflow.com/questions/tagged/azure-resource-manager
310310
- name: Videos
311-
href: https://azure.microsoft.com/documentation/videos/index/?services=azure-resource-manager
311+
href: https://azure.microsoft.com/documentation/videos/index/?services=azure-resource-manager

articles/container-registry/container-registry-health-error-reference.md

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -92,6 +92,10 @@ This error means that the CLI was unable to find the login server of the given r
9292

9393
*Potential solutions*: Verify that the spelling is correct and that the registry exists; verify that user has the right permissions on the registry, and that the clouds of the registry and the CLI environment match; update Azure CLI to the latest version.
9494

95+
## NOTARY_VERSION_ERROR
96+
97+
This error means that the CLI is not compatible with the currently installed version of Docker/Notary. Try downgrading your notary.exe version to a version earlier than 0.6.0 by replacing your Docker installation's Notary client manually to resolve this issue.
98+
9599
## Next steps
96100

97101
For options to check the health of a registry, see [Check the health of an Azure container registry](container-registry-check-health.md).

articles/private-link/create-private-endpoint-webapp-portal.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -167,7 +167,7 @@ In this section, you will connect privately to the Web App using the Private End
167167
168168
1. Copy the Private IP of your Private Endpoint and the FQDN of your Web App, in our case webappdemope.azurewebsites.net 10.10.2.4
169169

170-
1. In the myVM, verify that the Web App is not accessible through the public IP. Open a browser and copy the Web App name, you must have a 403 forbidden error page
170+
1. In the myVM, verify that the Web App is not accessible through the public IP. Open a browser and paste the Web App name, you must have a 403 forbidden error page
171171

172172
> [!div class="mx-imgBorder"]
173173
>![Forbidden][17]

0 commit comments

Comments
 (0)