Skip to content

Commit 17b581e

Browse files
huypubhuypub
authored
Merge pull request #205880 from MicrosoftDocs/main
7/25 PM Publish
2 parents 319ec8f + 518b22f commit 17b581e

File tree

124 files changed

+1466
-1039
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

124 files changed

+1466
-1039
lines changed

‎.openpublishing.publish.config.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -947,7 +947,7 @@
947947
{
948948
"path_to_root": "azure-cosmos-mongodb-dotnet",
949949
"url": "https://github.com/Azure-Samples/cosmos-db-mongodb-api-dotnet-samples",
950-
"branch": "quickstart-test",
950+
"branch": "main",
951951
"branch_mapping": {}
952952
}
953953
],

‎.openpublishing.redirection.azure-monitor.json

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -410,6 +410,11 @@
410410
"source_path_from_root": "/articles/azure-monitor/logs/custom-logs-overview.md" ,
411411
"redirect_url": "/azure/azure-monitor/logs/logs-ingestion-api-overview",
412412
"redirect_document_id": false
413+
},
414+
{
415+
"source_path_from_root": "/articles/azure-monitor/insights/cosmosdb-insights-overview.md" ,
416+
"redirect_url": "/azure/cosmos-db/cosmosdb-insights-overview",
417+
"redirect_document_id": false
413418
}
414419
]
415420
}

‎articles/aks/csi-secrets-store-driver.md

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -192,11 +192,7 @@ To specify a custom rotation interval, use the `rotation-poll-interval` flag:
192192
az aks addon update -g myResourceGroup -n myAKSCluster2 -a azure-keyvault-secrets-provider --enable-secret-rotation --rotation-poll-interval 5m
193193
```
194194

195-
To disable autorotation, use the flag `disable-secret-rotation`:
196-
197-
```azurecli-interactive
198-
az aks addon update -g myResourceGroup -n myAKSCluster2 -a azure-keyvault-secrets-provider --disable-secret-rotation
199-
```
195+
To disable autorotation, first disable the addon. Then, re-enable the addon without the `enable-secret-rotation` flag.
200196

201197
### Sync mounted content with a Kubernetes secret
202198

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -57,15 +57,15 @@ The tutorial continues to use the following environment variables from the previ
5757
1. Create a subnet for the App Service virtual network integration.
5858
5959
```azurecli-interactive
60-
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
60+
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
6161
```
6262
6363
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).
6464
6565
1. Create another subnet for the private endpoints.
6666
6767
```azurecli-interactive
68-
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
68+
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
6969
```
7070
7171
For private endpoint subnets, you must [disable private endpoint network policies](../private-link/disable-private-endpoint-network-policy.md).

‎articles/application-gateway/monitor-application-gateway.md

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -46,11 +46,6 @@ This is just a subset of the metrics available for Application Gateway. For more
4646

4747
## Azure Monitor Network Insights
4848

49-
<!-- OPTIONAL SECTION. Only include if your service has an "insight" associated with it. Examples of insights include
50-
- CosmosDB https://docs.microsoft.com/azure/azure-monitor/insights/cosmosdb-insights-overview
51-
- If you still aren't sure, contact [email protected].>
52-
-->
53-
5449
Some services in Azure have a special focused pre-built monitoring dashboard in the Azure portal that provides a starting point for monitoring your service. These special dashboards are called "insights".
5550

5651
<!-- Give a quick outline of what your "insight page" provides and refer to another article that gives details -->

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

Lines changed: 73 additions & 59 deletions
Original file line numberDiff line numberDiff line change
@@ -32,66 +32,80 @@ If you are onboarding machines to Azure Arc-enabled servers, copy the following
3232
```yaml
3333
---
3434
- name: Onboard Linux and Windows Servers to Azure Arc-enabled servers with public endpoint connectivity
35-
hosts: <INSERT-HOSTS>
36-
vars:
37-
azure:
38-
service_principal_id: 'INSERT-SERVICE-PRINCIPAL-CLIENT-ID'
39-
service_principal_secret: 'INSERT-SERVICE-PRINCIPAL-SECRET'
40-
resource_group: 'INSERT-RESOURCE-GROUP'
41-
tenant_id: 'INSERT-TENANT-ID'
42-
subscription_id: 'INSERT-SUBSCRIPTION-ID'
43-
location: 'INSERT-LOCATION'
35+
hosts: all
36+
# vars:
37+
# azure:
38+
# service_principal_id: 'INSERT-SERVICE-PRINCIPAL-CLIENT-ID'
39+
# service_principal_secret: 'INSERT-SERVICE-PRINCIPAL-SECRET'
40+
# resource_group: 'INSERT-RESOURCE-GROUP'
41+
# tenant_id: 'INSERT-TENANT-ID'
42+
# subscription_id: 'INSERT-SUBSCRIPTION-ID'
43+
# location: 'INSERT-LOCATION'
4444
tasks:
45-
- name: Check if the Connected Machine Agent has already been downloaded on Linux servers
46-
stat:
47-
path: /usr/bin/azcmagent
48-
get_attributes: False
49-
get_checksum: False
50-
get_mine: azcmagent_downloaded
51-
register: azcmagent_downloaded
52-
when: ansible_system == 'Linux'
53-
- name: Check if the Connected Machine Agent has already been downloaded on Windows servers
54-
stat:
55-
path: C:\Program Files\AzureConnectedMachineAgent
56-
get_attributes: False
57-
get_checksum: False
58-
get_mine: azcmagent_downloaded
59-
register: azcmagent_downloaded
60-
when: ansible_system == 'Windows'
61-
- name: Download the Connected Machine Agent on Linux servers
62-
become: yes
63-
get_url:
64-
url: https://aka.ms/azcmagent
65-
dest: ~/install_linux_azcmagent.sh
66-
mode: '700'
67-
when: (ansible_system == 'Linux') and (not azcmagent_downloaded.stat.exists)
68-
- name: Download the Connected Machine Agent on Windows servers
69-
win_get_url:
70-
url: https://aka.ms/AzureConnectedMachineAgent
71-
dest: C:\AzureConnectedMachineAgent.msi
72-
when: (ansible_os_family == 'Windows') and (not azcmagent_downloaded.stat.exists)
73-
- name: Install the Connected Machine Agent on Linux servers
74-
become: yes
75-
command:
76-
cmd: bash ~/install_linux_azcmagent.sh
77-
when: (ansible_system == 'Linux') and (not azcmagent_downloaded.stat.exists)
78-
- name: Install the Connected Machine Agent on Windows servers
79-
win_package:
80-
path: C:\AzureConnectedMachineAgent.msi
81-
when: (ansible_os_family == 'Windows') and (not azcmagent_downloaded.stat.exists)
82-
- name: Check if the Connected Machine Agent has already been connected
83-
become: true
84-
command:
85-
cmd: azcmagent show
86-
register: azcmagent_connected
87-
- name: Connect the Connected Machine Agent on Linux servers to Azure Arc
88-
become: yes
89-
command:
90-
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 }}
91-
when: (azcmagent_connected.rc == 0) and (ansible_system == 'Linux')
92-
- name: Connect the Connected Machine Agent on Windows servers to Azure
93-
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 }}"'
94-
when: (azcmagent_connected.rc == 0) and (ansible_os_family == 'Windows')
45+
- name: Check if the Connected Machine Agent has already been downloaded on Linux servers
46+
stat:
47+
path: /usr/bin/azcmagent
48+
get_attributes: False
49+
get_checksum: False
50+
register: azcmagent_lnx_downloaded
51+
when: ansible_system == 'Linux'
52+
53+
- name: Download the Connected Machine Agent on Linux servers
54+
become: yes
55+
get_url:
56+
url: https://aka.ms/azcmagent
57+
dest: ~/install_linux_azcmagent.sh
58+
mode: '700'
59+
when: (ansible_system == 'Linux') and (azcmagent_lnx_downloaded.stat.exists == false)
60+
61+
- name: Install the Connected Machine Agent on Linux servers
62+
become: yes
63+
shell: bash ~/install_linux_azcmagent.sh
64+
when: (ansible_system == 'Linux') and (not azcmagent_lnx_downloaded.stat.exists)
65+
66+
- name: Check if the Connected Machine Agent has already been downloaded on Windows servers
67+
win_stat:
68+
path: C:\Program Files\AzureConnectedMachineAgent
69+
register: azcmagent_win_downloaded
70+
when: ansible_os_family == 'Windows'
71+
72+
- name: Download the Connected Machine Agent on Windows servers
73+
win_get_url:
74+
url: https://aka.ms/AzureConnectedMachineAgent
75+
dest: C:\AzureConnectedMachineAgent.msi
76+
when: (ansible_os_family == 'Windows') and (not azcmagent_win_downloaded.stat.exists)
77+
78+
- name: Install the Connected Machine Agent on Windows servers
79+
win_package:
80+
path: C:\AzureConnectedMachineAgent.msi
81+
when: (ansible_os_family == 'Windows') and (not azcmagent_win_downloaded.stat.exists)
82+
83+
- name: Check if the Connected Machine Agent has already been connected
84+
become: true
85+
command:
86+
cmd: azcmagent check
87+
register: azcmagent_lnx_connected
88+
ignore_errors: yes
89+
when: ansible_system == 'Linux'
90+
failed_when: (azcmagent_lnx_connected.rc not in [ 0, 16 ])
91+
changed_when: False
92+
93+
- name: Check if the Connected Machine Agent has already been connected on windows
94+
win_command: azcmagent check
95+
register: azcmagent_win_connected
96+
when: ansible_os_family == 'Windows'
97+
ignore_errors: yes
98+
failed_when: (azcmagent_win_connected.rc not in [ 0, 16 ])
99+
changed_when: False
100+
101+
- name: Connect the Connected Machine Agent on Linux servers to Azure Arc
102+
become: yes
103+
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 }}"
104+
when: (ansible_system == 'Linux') and (azcmagent_lnx_connected.rc is defined and azcmagent_lnx_connected.rc != 0)
105+
106+
- name: Connect the Connected Machine Agent on Windows servers to Azure
107+
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 }}"'
108+
when: (ansible_os_family == 'Windows') and (azcmagent_win_connected.rc is defined and azcmagent_win_connected.rc != 0)
95109
```
96110
97111
## Modify the Ansible playbook

‎articles/azure-cache-for-redis/redis-cache-insights-overview.md

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ To view the utilization and performance of your storage accounts across all of y
4747

4848
1. Search for **Monitor**, and select **Monitor**.
4949

50-
![Search box with the word "Monitor" and the Services search result that shows "Monitor" with a speedometer symbol](../azure-monitor/insights/media/cosmosdb-insights-overview/search-monitor.png)
50+
![Search box with the word "Monitor" and the Services search result that shows "Monitor" with a speedometer symbol](../cosmos-db/media/cosmosdb-insights-overview/search-monitor.png)
5151

5252
1. Select **Azure Cache for Redis**. If this option isn't present, select **More** > **Azure Cache for Redis**.
5353

@@ -157,27 +157,27 @@ Selecting any of the other tabs for **Performance** or **Operations** opens the
157157

158158
To pin any metric section to an [Azure dashboard](../azure-portal/azure-portal-dashboards.md), select the pushpin symbol in the section's upper right.
159159

160-
![A metric section with the pushpin symbol highlighted](../azure-monitor/insights/media/cosmosdb-insights-overview/pin.png)
160+
![A metric section with the pushpin symbol highlighted](../cosmos-db/media/cosmosdb-insights-overview/pin.png)
161161

162162
To export your data into an Excel format, select the down arrow symbol to the left of the pushpin symbol.
163163

164-
![A highlighted export-workbook symbol](../azure-monitor/insights/media/cosmosdb-insights-overview/export.png)
164+
![A highlighted export-workbook symbol](../cosmos-db/media/cosmosdb-insights-overview/export.png)
165165

166166
To expand or collapse all views in a workbook, select the expand symbol to the left of the export symbol.
167167

168-
![A highlighted expand-workbook symbol](../azure-monitor/insights/media/cosmosdb-insights-overview/expand.png)
168+
![A highlighted expand-workbook symbol](../cosmos-db/media/cosmosdb-insights-overview/expand.png)
169169

170170
## Customize Azure Monitor for Azure Cache for Redis
171171

172172
Because this experience is built atop Azure Monitor workbook templates, you can select **Customize** > **Edit** > **Save** to save a copy of your modified version into a custom workbook.
173173

174-
![A command bar with Customize highlighted](../azure-monitor/insights/media/cosmosdb-insights-overview/customize.png)
174+
![A command bar with Customize highlighted](../cosmos-db/media/cosmosdb-insights-overview/customize.png)
175175

176176
Workbooks are saved within a resource group in either the **My Reports** section or the **Shared Reports** section. **My Reports** is available only to you. **Shared Reports** is available to everyone with access to the resource group.
177177

178178
After you save a custom workbook, go to the workbook gallery to open it.
179179

180-
![A command bar with Gallery highlighted](../azure-monitor/insights/media/cosmosdb-insights-overview/gallery.png)
180+
![A command bar with Gallery highlighted](../cosmos-db/media/cosmosdb-insights-overview/gallery.png)
181181

182182
## Troubleshooting
183183

‎articles/azure-monitor/agents/agents-overview.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -157,7 +157,7 @@ The following tables list the operating systems that are supported by the Azure
157157

158158
| Operating system | Azure Monitor agent <sup>1</sup> | Log Analytics agent <sup>1</sup> | Diagnostics extension <sup>2</sup>|
159159
|:---|:---:|:---:|:---:|:---:
160-
| AlmaLinux | X | X | |
160+
| AlmaLinux 8.* | X | X | |
161161
| Amazon Linux 2017.09 | | X | |
162162
| Amazon Linux 2 | | X | |
163163
| CentOS Linux 8 | X <sup>3</sup> | X | |
@@ -179,7 +179,7 @@ The following tables list the operating systems that are supported by the Azure
179179
| Red Hat Enterprise Linux Server 7 | X | X | X |
180180
| Red Hat Enterprise Linux Server 6 | | X | |
181181
| Red Hat Enterprise Linux Server 6.7+ | | X | X |
182-
| Rocky Linux | X | X | |
182+
| Rocky Linux 8.* | X | X | |
183183
| SUSE Linux Enterprise Server 15.2 | X <sup>3</sup> | | |
184184
| SUSE Linux Enterprise Server 15.1 | X <sup>3</sup> | X | |
185185
| SUSE Linux Enterprise Server 15 SP1 | X | X | |

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

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -150,6 +150,9 @@ The telemetry is available in the `customEvents` table on the [Application Insig
150150

151151
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)`.
152152

153+
> [!NOTE]
154+
> itemCount has a minimum value of one; the record itself represents an entry.
155+
153156
## GetMetric
154157

155158
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
212215
* `valueSum`: The sum of the measurements. To get the mean value, divide by `valueCount`.
213216
* `valueCount`: The number of measurements that were aggregated into this `trackMetric(..)` call.
214217

218+
> [!NOTE]
219+
> valueCount has a minimum value of one; the record itself represents an entry.
220+
215221
## Page views
216222

217223
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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -34,9 +34,9 @@ Download the [applicationinsights-agent-3.3.1.jar](https://github.com/microsoft/
3434

3535
> [!WARNING]
3636
>
37-
> If you're upgrading from 3.2.x to 3.3.1:
37+
> If you're upgrading from 3.2.x:
3838
>
39-
> - 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)
39+
> - 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)
4040
> - Exception records are no longer recorded for failed dependencies, they are only recorded for failed requests.
4141
>
4242
> If you're upgrading from 3.1.x:

0 commit comments

Comments
 (0)