Merge branch 'main' of https://github.com/MicrosoftDocs/azure-docs-pr

Author: OWinfreyATL

.openpublishing.publish.config.json

@@ -947,7 +947,7 @@
     {
       "path_to_root": "azure-cosmos-mongodb-dotnet",
       "url": "https://github.com/Azure-Samples/cosmos-db-mongodb-api-dotnet-samples",
-      "branch": "quickstart-test",
+      "branch": "main",
       "branch_mapping": {}
     }
   ],

articles/active-directory/governance/entitlement-management-access-package-assignments.md

@@ -28,6 +28,7 @@ In Azure AD entitlement management, you can see who has been assigned to access
 
 To use Azure AD entitlement management and assign users to access packages, you must have one of the following licenses:
 
+
 - Azure AD Premium P2
 - Enterprise Mobility + Security (EMS) E5 license
 

articles/active-directory/managed-identities-azure-resources/how-to-assign-app-role-managed-identity-cli.md

@@ -3,7 +3,7 @@ title: Assign a managed identity to an application role using Azure CLI - Azure
 description: Step-by-step instructions for assigning a managed identity access to another application's role, using Azure CLI.
 services: active-directory
 documentationcenter: 
-author: christoc
+author: xstof
 manager:
 editor: 
 
@@ -64,7 +64,7 @@ In this article, you learn how to assign a managed identity to an application ro
 
     ```azurecli
     appName="{name for your application}"
-    serverSPOID=$(az ad sp list --filter "displayName eq 'My App'" --query '[0].objectId' -o tsv | tr -d '[:space:]')
+    serverSPOID=$(az ad sp list --filter "displayName eq '$appName'" --query '[0].id' -o tsv | tr -d '[:space:]')
     echo "object id for server service principal is: $serverSPOID"
     ```
 
@@ -75,7 +75,7 @@ In this article, you learn how to assign a managed identity to an application ro
 
     ```azurecli
     appID="{application id for your application}"
-    serverSPOID=$(az ad sp list --filter "appId eq '$appID'" --query '[0].objectId' -o tsv | tr -d '[:space:]')
+    serverSPOID=$(az ad sp list --filter "appId eq '$appID'" --query '[0].id' -o tsv | tr -d '[:space:]')
     echo "object id for server service principal is: $serverSPOID"
     ```
 

articles/app-service/tutorial-networking-isolate-vnet.md

@@ -57,15 +57,15 @@ The tutorial continues to use the following environment variables from the previ
 1. Create a subnet for the App Service virtual network integration.
 
     ```azurecli-interactive
-    az network vnet subnet create --resource-group $groupName --vnet-name $vnetName --name vnet-integration-subnet --address-prefixes 10.0.0.0/24 --delegations Microsoft.Web/serverfarms
+    az network vnet subnet create --resource-group $groupName --vnet-name $vnetName --name vnet-integration-subnet --address-prefixes 10.0.0.0/24 --delegations Microsoft.Web/serverfarms --disable-private-endpoint-network-policies false
     ```
 
     For App Service, the virtual network integration subnet is recommended to have a CIDR block of `/26` at a minimum (see [Virtual network integration subnet requirements](overview-vnet-integration.md#subnet-requirements)). `/24` is more than sufficient. `--delegations Microsoft.Web/serverfarms` specifies that the subnet is [delegated for App Service virtual network integration](../virtual-network/subnet-delegation-overview.md).
 
 1. Create another subnet for the private endpoints.
 
     ```azurecli-interactive
-    az network vnet subnet create --resource-group $groupName --vnet-name $vnetName --name private-endpoint-subnet --address-prefixes 10.0.1.0/24 --disable-private-endpoint-network-policies
+    az network vnet subnet create --resource-group $groupName --vnet-name $vnetName --name private-endpoint-subnet --address-prefixes 10.0.1.0/24 --disable-private-endpoint-network-policies true
     ```
 
     For private endpoint subnets, you must [disable private endpoint network policies](../private-link/disable-private-endpoint-network-policy.md).

articles/azure-arc/servers/onboard-ansible-playbooks.md

@@ -32,66 +32,80 @@ If you are onboarding machines to Azure Arc-enabled servers, copy the following
 ```yaml
 ---
 - name: Onboard Linux and Windows Servers to Azure Arc-enabled servers with public endpoint connectivity
-  hosts: <INSERT-HOSTS>
-  vars:
-    azure:
-      service_principal_id: 'INSERT-SERVICE-PRINCIPAL-CLIENT-ID'
-      service_principal_secret: 'INSERT-SERVICE-PRINCIPAL-SECRET'
-      resource_group: 'INSERT-RESOURCE-GROUP'
-      tenant_id: 'INSERT-TENANT-ID'
-      subscription_id: 'INSERT-SUBSCRIPTION-ID'
-      location: 'INSERT-LOCATION'
+  hosts: all
+  # vars:
+  #   azure:
+  #     service_principal_id: 'INSERT-SERVICE-PRINCIPAL-CLIENT-ID'
+  #     service_principal_secret: 'INSERT-SERVICE-PRINCIPAL-SECRET'
+  #     resource_group: 'INSERT-RESOURCE-GROUP'
+  #     tenant_id: 'INSERT-TENANT-ID'
+  #     subscription_id: 'INSERT-SUBSCRIPTION-ID'
+  #     location: 'INSERT-LOCATION'
   tasks:
-	- name: Check if the Connected Machine Agent has already been downloaded on Linux servers
-	  stat:
-	  	path: /usr/bin/azcmagent
-	  	get_attributes: False
-	  	get_checksum: False
-	  	get_mine: azcmagent_downloaded 
-        register: azcmagent_downloaded
-	  when: ansible_system == 'Linux'
-	- name: Check if the Connected Machine Agent has already been downloaded on Windows servers
-	  stat:
-	  	path: C:\Program Files\AzureConnectedMachineAgent
-	  	get_attributes: False
-	  	get_checksum: False
-	  	get_mine: azcmagent_downloaded 
-        register: azcmagent_downloaded
-	  when: ansible_system == 'Windows'
-      - name: Download the Connected Machine Agent on Linux servers
-        become: yes
-        get_url:
-          url: https://aka.ms/azcmagent
-          dest: ~/install_linux_azcmagent.sh
-          mode: '700'
-        when: (ansible_system == 'Linux') and (not azcmagent_downloaded.stat.exists)
-      - name: Download the Connected Machine Agent on Windows servers
-        win_get_url:
-          url: https://aka.ms/AzureConnectedMachineAgent
-          dest: C:\AzureConnectedMachineAgent.msi
-        when: (ansible_os_family == 'Windows') and (not azcmagent_downloaded.stat.exists)
-      - name: Install the Connected Machine Agent on Linux servers
-        become: yes
-        command: 
-		cmd: bash ~/install_linux_azcmagent.sh
-        when: (ansible_system == 'Linux') and (not azcmagent_downloaded.stat.exists)
-      - name: Install the Connected Machine Agent on Windows servers
-        win_package:
-          path: C:\AzureConnectedMachineAgent.msi
-        when: (ansible_os_family == 'Windows') and (not azcmagent_downloaded.stat.exists)
-	- name: Check if the Connected Machine Agent has already been connected
-	  become: true 
-	  command:
-	  	cmd: azcmagent show
-        register: azcmagent_connected
-      - name: Connect the Connected Machine Agent on Linux servers to Azure Arc
-        become: yes
-        command: 
-		cmd: azcmagent connect --service-principal-id {{ azure.service_principal_id }} --service-principal-secret {{ azure.service_principal_secret }} --resource-group {{ azure.resource_group }} --tenant-id {{ azure.tenant_id }} --location {{ azure.location }} --subscription-id {{ azure.subscription_id }}
-        when: (azcmagent_connected.rc == 0) and (ansible_system == 'Linux')
-      - name: Connect the Connected Machine Agent on Windows servers to Azure
-        win_shell: '& $env:ProgramFiles\AzureConnectedMachineAgent\azcmagent.exe connect --service-principal-id "{{ azure.service_principal_id }}" --service-principal-secret "{{ azure.service_principal_secret }}" --resource-group "{{ azure.resource_group }}" --tenant-id "{{ azure.tenant_id }}" --location "{{ azure.location }}" --subscription-id "{{ azure.subscription_id }}"'
-        when: (azcmagent_connected.rc == 0) and (ansible_os_family == 'Windows')
+  - name: Check if the Connected Machine Agent has already been downloaded on Linux servers
+    stat:
+      path: /usr/bin/azcmagent
+      get_attributes: False
+      get_checksum: False
+    register: azcmagent_lnx_downloaded
+    when: ansible_system == 'Linux'
+
+  - name: Download the Connected Machine Agent on Linux servers
+    become: yes
+    get_url:
+      url: https://aka.ms/azcmagent
+      dest: ~/install_linux_azcmagent.sh
+      mode: '700'
+    when: (ansible_system == 'Linux') and (azcmagent_lnx_downloaded.stat.exists == false)    
+
+  - name: Install the Connected Machine Agent on Linux servers
+    become: yes
+    shell: bash ~/install_linux_azcmagent.sh
+    when: (ansible_system == 'Linux') and (not azcmagent_lnx_downloaded.stat.exists)    
+
+  - name: Check if the Connected Machine Agent has already been downloaded on Windows servers
+    win_stat:
+      path: C:\Program Files\AzureConnectedMachineAgent
+    register: azcmagent_win_downloaded
+    when: ansible_os_family == 'Windows'
+
+  - name: Download the Connected Machine Agent on Windows servers
+    win_get_url:
+      url: https://aka.ms/AzureConnectedMachineAgent
+      dest: C:\AzureConnectedMachineAgent.msi
+    when: (ansible_os_family == 'Windows') and (not azcmagent_win_downloaded.stat.exists)    
+
+  - name: Install the Connected Machine Agent on Windows servers
+    win_package:
+      path: C:\AzureConnectedMachineAgent.msi
+    when: (ansible_os_family == 'Windows') and (not azcmagent_win_downloaded.stat.exists)
+
+  - name: Check if the Connected Machine Agent has already been connected
+    become: true 
+    command:
+     cmd: azcmagent check
+    register: azcmagent_lnx_connected
+    ignore_errors: yes
+    when: ansible_system == 'Linux'
+    failed_when: (azcmagent_lnx_connected.rc not in [ 0, 16 ])
+    changed_when: False
+
+  - name: Check if the Connected Machine Agent has already been connected on windows
+    win_command: azcmagent check
+    register: azcmagent_win_connected
+    when: ansible_os_family == 'Windows'
+    ignore_errors: yes
+    failed_when: (azcmagent_win_connected.rc not in [ 0, 16 ])
+    changed_when: False
+
+  - name: Connect the Connected Machine Agent on Linux servers to Azure Arc
+    become: yes
+    shell: azcmagent connect --service-principal-id "{{ azure.service_principal_id }}" --service-principal-secret "{{ azure.service_principal_secret }}" --resource-group "{{ azure.resource_group }}" --tenant-id "{{ azure.tenant_id }}" --location "{{ azure.location }}" --subscription-id "{{ azure.subscription_id }}"
+    when:  (ansible_system == 'Linux') and (azcmagent_lnx_connected.rc is defined and azcmagent_lnx_connected.rc != 0)
+
+  - name: Connect the Connected Machine Agent on Windows servers to Azure
+    win_shell: '& $env:ProgramFiles\AzureConnectedMachineAgent\azcmagent.exe connect --service-principal-id "{{ azure.service_principal_id }}" --service-principal-secret "{{ azure.service_principal_secret }}" --resource-group "{{ azure.resource_group }}" --tenant-id "{{ azure.tenant_id }}" --location "{{ azure.location }}" --subscription-id "{{ azure.subscription_id }}"'
+    when: (ansible_os_family == 'Windows') and (azcmagent_win_connected.rc is defined and azcmagent_win_connected.rc != 0) 
 ```
 
 ## Modify the Ansible playbook

articles/azure-maps/tutorial-search-location.md

@@ -140,7 +140,7 @@ The Map Control API is a convenient client library. This API allows you to easil
 
    About this code:
 
-   * A `ready` event is added to the map, which fires when the map resources finnish loading and the map is ready to be accessed.
+   * A `ready` event is added to the map, which fires when the map resources finish loading and the map is ready to be accessed.
    * In the map `ready` event handler, a data source is created to store result data.
    * A symbol layer is created and attached to the data source. This layer specifies how the result data in the data source should be rendered. In this case, the result is rendered with a dark blue round pin icon, centered over the results coordinate, that allows other icons to overlap.
    * The result layer is added to the map layers.

articles/azure-monitor/app/api-custom-events-metrics.md

@@ -150,6 +150,9 @@ The telemetry is available in the `customEvents` table on the [Application Insig
 
 If [sampling](./sampling.md) is in operation, the `itemCount` property shows a value greater than `1`. For example, `itemCount==10` means that of 10 calls to `trackEvent()`, the sampling process transmitted only one of them. To get a correct count of custom events, use code such as `customEvents | summarize sum(itemCount)`.
 
+> [!NOTE]
+> itemCount has a minimum value of one; the record itself represents an entry.
+
 ## GetMetric
 
 To learn how to effectively use the `GetMetric()` call to capture locally pre-aggregated metrics for .NET and .NET Core applications, see [Custom metric collection in .NET and .NET Core](./get-metric.md).
@@ -212,6 +215,9 @@ The telemetry is available in the `customMetrics` table in [Application Insights
 * `valueSum`: The sum of the measurements. To get the mean value, divide by `valueCount`.
 * `valueCount`: The number of measurements that were aggregated into this `trackMetric(..)` call.
 
+> [!NOTE]
+> valueCount has a minimum value of one; the record itself represents an entry.
+
 ## Page views
 
 In a device or webpage app, page view telemetry is sent by default when each screen or page is loaded. But you can change the default to track page views at more or different times. For example, in an app that displays tabs or blades, you might want to track a page whenever the user opens a new blade.

articles/azure-monitor/app/java-in-process-agent.md

@@ -34,9 +34,9 @@ Download the [applicationinsights-agent-3.3.1.jar](https://github.com/microsoft/
 
 > [!WARNING]
 > 
-> If you're upgrading from 3.2.x to 3.3.1:
+> If you're upgrading from 3.2.x:
 > 
->    -  Starting from 3.3.1, `LoggingLevel` is not captured by default as part of Traces' custom dimension since that data is already captured in the `SeverityLevel` field. For details on how to re-enable this if needed, please see the [config options](./java-standalone-config.md#logginglevel)
+>    -  Starting from 3.3.0, `LoggingLevel` is not captured by default as part of Traces' custom dimension since that data is already captured in the `SeverityLevel` field. For details on how to re-enable this if needed, please see the [config options](./java-standalone-config.md#logginglevel)
 >    - Exception records are no longer recorded for failed dependencies, they are only recorded for failed requests.
 >
 > If you're upgrading from 3.1.x:

articles/azure-monitor/app/java-standalone-config.md

@@ -247,7 +247,7 @@ Instrumentation key overrides allow you to override the [default instrumentation
 
 ## Cloud role name overrides (preview)
 
-This feature is in preview, starting from 3.3.1.
+This feature is in preview, starting from 3.3.0.
 
 Cloud role name overrides allow you to override the [default cloud role name](#cloud-role-name), for example:
 * Set one cloud role name for one http path prefix `/myapp1`.
@@ -344,7 +344,7 @@ These are the valid `level` values that you can specify in the `applicationinsig
 
 ### LoggingLevel
 
-Starting from version 3.3.1, `LoggingLevel` is not captured by default as part of Traces' custom dimension since that data is aleady captured in the `SeverityLevel` field. 
+Starting from version 3.3.0, `LoggingLevel` is not captured by default as part of Traces' custom dimension since that data is aleady captured in the `SeverityLevel` field.
 
 If needed, you can re-enable the previous behavior:
 
@@ -384,7 +384,7 @@ To disable auto-collection of Micrometer metrics (including Spring Boot Actuator
 
 ## HTTP headers
 
-Starting from version 3.3.1, you can capture request and response headers on your server (request) telemetry:
+Starting from version 3.3.0, you can capture request and response headers on your server (request) telemetry:
 
 ```json
 {
@@ -430,7 +430,7 @@ Again, the header names are case-insensitive, and the examples above will be cap
 
 By default, http server requests that result in 4xx response codes are captured as errors.
 
-Starting from version 3.3.1, you can change this behavior to capture them as success if you prefer:
+Starting from version 3.3.0, you can change this behavior to capture them as success if you prefer:
 
 ```json
 {
@@ -532,7 +532,7 @@ Starting from version 3.2.0, the following preview instrumentations can be enabl
 ```
 > [!NOTE]
 > Akka instrumentation is available starting from version 3.2.2
-> Vertx HTTP Library instrumentation is available starting from version 3.3.1
+> Vertx HTTP Library instrumentation is available starting from version 3.3.0
 
 ## Metric interval
 
@@ -605,7 +605,7 @@ When sending telemetry to the Application Insights service fails, Application In
 to disk and continue retrying from disk.
 
 The default limit for disk persistence is 50 Mb. If you have high telemetry volume, or need to be able to recover from
-longer network or ingestion service outages, you can increase this limit starting from version 3.3.1:
+longer network or ingestion service outages, you can increase this limit starting from version 3.3.0:
 
 ```json
 {

articles/azure-monitor/app/worker-service.md

@@ -529,6 +529,18 @@ If you want to disable telemetry conditionally and dynamically, you may resolve
 
 ## Frequently asked questions
 
+### Which package should I use?
+
+| .Net Core app scenario | Package  |
+|---------|---------|
+| Without HostedServices                              | AspNetCore                     |
+| With HostedServices                                 | AspNetCore (not WorkerService) |
+| With HostedServices, monitoring only HostedServices | WorkerService (rare scenario)  |
+
+### Can HostedServices inside a .NET Core app using the AspNetCore package have TelemetryClient injected to it?
+
+* Yes. The config will be shared with the rest of the web application.
+
 ### How can I track telemetry that's not automatically collected?
 
 Get an instance of `TelemetryClient` by using constructor injection, and call the required `TrackXXX()` method on it. We don't recommend creating new `TelemetryClient` instances. A singleton instance of `TelemetryClient` is already registered in the `DependencyInjection` container, which shares `TelemetryConfiguration` with rest of the telemetry. Creating a new `TelemetryClient` instance is recommended only if it needs a configuration that's separate from the rest of the telemetry.
@@ -584,6 +596,6 @@ For the latest updates and bug fixes, [consult the release notes](./release-note
 ## Next steps
 
 * [Use the API](./api-custom-events-metrics.md) to send your own events and metrics for a detailed view of your app's performance and usage.
-* [Track additional dependencies not automatically tracked](./auto-collect-dependencies.md).
+* [Track more dependencies not automatically tracked](./auto-collect-dependencies.md).
 * [Enrich or Filter auto collected telemetry](./api-filtering-sampling.md).
 * [Dependency Injection in ASP.NET Core](/aspnet/core/fundamentals/dependency-injection).