Skip to content

Commit 3949880

Browse files
committed
Merge branch 'master' of https://github.com/MicrosoftDocs/azure-docs-pr into RegionCorrection
2 parents c7c79dd + 3dbd1bd commit 3949880

File tree

15 files changed

+64
-242
lines changed

15 files changed

+64
-242
lines changed

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

Lines changed: 16 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -136,18 +136,28 @@ The Azure Monitor agent extensions for Windows and Linux can communicate either
136136

137137
| Parameter | Value |
138138
|:---|:---|
139-
| SettingString | A JSON object from the preceding flowchart converted to a string. Skip if not applicable. An example is {"proxy":{"mode":"application","address":"http://[address]:[port]","auth": false}}. |
140-
| ProtectedSettingString | A JSON object from the preceding flowchart converted to a string. Skip if not applicable. An example is {"proxy":{"username": "[username]","password": "[password]"}}. |
139+
| Setting | A JSON object from the preceding flowchart converted to a string. Skip if not applicable. An example is {"proxy":{"mode":"application","address":"http://[address]:[port]","auth": false}}. |
140+
| ProtectedSetting | A JSON object from the preceding flowchart converted to a string. Skip if not applicable. An example is {"proxy":{"username": "[username]","password": "[password]"}}. |
141141

142142

143-
# [Windows](#tab/PowerShellWindows)
143+
# [Windows VM](#tab/PowerShellWindows)
144144
```powershell
145-
Set-AzVMExtension -ExtensionName AzureMonitorWindowsAgent -ExtensionType AzureMonitorWindowsAgent -Publisher Microsoft.Azure.Monitor -ResourceGroupName <resource-group-name> -VMName <virtual-machine-name> -Location <location> -TypeHandlerVersion 1.0 -SettingString <settingString> -ProtectedSettingString <protectedSettingString>
145+
Set-AzVMExtension -ExtensionName AzureMonitorWindowsAgent -ExtensionType AzureMonitorWindowsAgent -Publisher Microsoft.Azure.Monitor -ResourceGroupName <resource-group-name> -VMName <virtual-machine-name> -Location <location> -TypeHandlerVersion 1.0 -Setting <settingString> -ProtectedSetting <protectedSettingString>
146146
```
147147

148-
# [Linux](#tab/PowerShellLinux)
148+
# [Linux VM](#tab/PowerShellLinux)
149149
```powershell
150-
Set-AzVMExtension -ExtensionName AzureMonitorLinuxAgent -ExtensionType AzureMonitorLinuxAgent -Publisher Microsoft.Azure.Monitor -ResourceGroupName <resource-group-name> -VMName <virtual-machine-name> -Location <location> -TypeHandlerVersion 1.5 -SettingString <settingString> -ProtectedSettingString <protectedSettingString>
150+
Set-AzVMExtension -ExtensionName AzureMonitorLinuxAgent -ExtensionType AzureMonitorLinuxAgent -Publisher Microsoft.Azure.Monitor -ResourceGroupName <resource-group-name> -VMName <virtual-machine-name> -Location <location> -TypeHandlerVersion 1.5 -Setting <settingString> -ProtectedSetting <protectedSettingString>
151+
```
152+
153+
# [Windows Arc enabled server](#tab/PowerShellWindowsArc)
154+
```powershell
155+
New-AzConnectedMachineExtension -Name AzureMonitorWindowsAgent -ExtensionType AzureMonitorWindowsAgent -Publisher Microsoft.Azure.Monitor -ResourceGroupName <resource-group-name> -MachineName <arc-server-name> -Location <arc-server-location> -Setting <settingString> -ProtectedSetting <protectedSettingString>
156+
```
157+
158+
# [Linux Arc enabled server](#tab/PowerShellLinuxArc)
159+
```powershell
160+
New-AzConnectedMachineExtension -Name AzureMonitorLinuxAgent -ExtensionType AzureMonitorLinuxAgent -Publisher Microsoft.Azure.Monitor -ResourceGroupName <resource-group-name> -MachineName <arc-server-name> -Location <arc-server-location> -Setting <settingString> -ProtectedSetting <protectedSettingString>
151161
```
152162

153163
---

articles/azure-monitor/essentials/diagnostic-settings.md

Lines changed: 9 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
---
22
title: Create diagnostic settings to send platform logs and metrics to different destinations
33
description: Send Azure Monitor platform metrics and logs to Azure Monitor Logs, Azure storage, or Azure Event Hubs using a diagnostic setting.
4-
author: bwren
5-
ms.author: bwren
4+
author: rboucher
5+
ms.author: robb
66
services: azure-monitor
77
ms.topic: conceptual
8-
ms.date: 06/09/2021
8+
ms.date: 11/02/2021
99
---
1010

1111
# Create diagnostic settings to send platform logs and metrics to different destinations
@@ -42,6 +42,7 @@ Platform logs and metrics can be sent to the destinations in the following table
4242
| [Log Analytics workspace](../logs/design-logs-deployment.md) | Sending logs and metrics to a Log Analytics workspace allows you to analyze them with other monitoring data collected by Azure Monitor using powerful log queries and also to leverage other Azure Monitor features such as alerts and visualizations. |
4343
| [Event hubs](../../event-hubs/index.yml) | Sending logs and metrics to Event Hubs allows you to stream data to external systems such as third-party SIEMs and other log analytics solutions. |
4444
| [Azure storage account](../../storage/blobs/index.yml) | Archiving logs and metrics to an Azure storage account is useful for audit, static analysis, or backup. Compared to Azure Monitor Logs and a Log Analytics workspace, Azure storage is less expensive and logs can be kept there indefinitely. |
45+
| [Azure Monitor partner integrations](/azure/partner-solutions/overview/)| Specialized integrations between Azure Monitor and other non-Microsoft monitoring platforms. |
4546

4647

4748
### Destination requirements
@@ -118,12 +119,12 @@ You can configure diagnostic settings in the Azure portal either from the Azure
118119
![Send to Storage](media/diagnostic-settings/storage-settings-new.png)
119120

120121
> [!TIP]
121-
> Consider setting the retention policy to 0 and manually deleting your data from storage using a scheduled job to avoid possible confusion in the future.
122+
> Consider setting the retention policy to 0 and either use [Azure Storage Lifecycle Policy](/azure/storage/blobs/lifecycle-management-policy-configure) or delete your data from storage using a scheduled job. These strategies are likely to provide more consistent behavior.
122123
>
123-
> First, if you are using storage for archiving, you generally want your data around for more than 365 days. Second, if you choose a retention policy that is greater than 0, the expiration date is attached to the logs at the time of storage. You can't change the date for those logs once stored.
124-
>
125-
> For example, if you set the retention policy for *WorkflowRuntime* to 180 days and then 24 hours later set it to 365 days, the logs stored during those first 24 hours will be automatically deleted after 180 days, while all subsequent logs of that type will be automatically deleted after 365 days. Changing the retention policy later doesn't make the first 24 hours of logs stay around for 365 days.
126-
124+
> First, if you are using storage for archiving, you generally want your data around for more than 365 days. Second, if you choose a retention policy that is greater than 0, the expiration date is attached to the logs at the time of storage. You can't change the date for those logs once stored. For example, if you set the retention policy for *WorkflowRuntime* to 180 days and then 24 hours later set it to 365 days, the logs stored during those first 24 hours will be automatically deleted after 180 days, while all subsequent logs of that type will be automatically deleted after 365 days. Changing the retention policy later doesn't make the first 24 hours of logs stay around for 365 days.
125+
126+
1. **Partner integration** - You must first install a partner integration into your subscription. For more information, see [Azure Monitor Partner integrations](/azure/partner-solutions/overview/).
127+
127128
6. Click **Save**.
128129

129130
After a few moments, the new setting appears in your list of settings for this resource, and logs are streamed to the specified destinations as new event data is generated. It may take up to 15 minutes between when an event is emitted and when it [appears in a Log Analytics workspace](../logs/data-ingestion-time.md).

articles/azure-monitor/monitor-reference.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ description: Reference of all services and other resources monitored by Azure Mo
44
ms.topic: conceptual
55
author: rboucher
66
ms.author: robb
7-
ms.date: 10/15/2021
7+
ms.date: 11/02/2021
88

99
---
1010

@@ -77,7 +77,7 @@ The other services and older monitoring solutions in the following table store t
7777
|:---|:---|
7878
| [ITSM](alerts/itsmc-overview.md) | The IT Service Management Connector (ITSMC) allows you to connect Azure and a supported IT Service Management (ITSM) product/service. |
7979
| [Azure Monitor Partners](/azure/azure-monitor/partners/) | A list of partners that integrate with Azure Monitor in some form |
80-
| [Datadog Integration](/azure/partner-solutions/datadog/overview) | A specialized integration between Azure Monitor and Datadog for companies who have already built their monitoring infrastructure on Datadog |
80+
| [Azure Monitor Partner integrations](/azure/partner-solutions/overview/)| Specialized integrations between Azure Monitor and other non-Microsoft monitoring platforms if you've already built on them. Examples include Datadog and Elastic|
8181

8282

8383
## Resources outside of Azure

articles/cognitive-services/Speech-Service/releasenotes.md

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -22,11 +22,11 @@ ms.custom: ignite-fall-2021
2222

2323
#### Highlights
2424

25-
- Speaker Recognition service is generally available (GA) now. Speech SDK APIs are available on C++, C#, Java and Javascript. With Speaker recognition you can accurately verify and identify speakers by their unique voice characteristics. See the [document](speaker-recognition-overview.md) for more details.
25+
- Speaker Recognition service is generally available (GA) now. Speech SDK APIs are available on C++, C#, Java and Javascript. With Speaker recognition you can accurately verify and identify speakers by their unique voice characteristics. See the [documentation](speaker-recognition-overview.md) for more details.
2626

27-
- Ubuntu 16.04 reached end of life back in April of 2021. In conjunction with Azure DevOps and Github we have dropped support for Ubuntu 16.04 in this release. Please migrate Ubuntu 16.04 workflows to Ubuntu 18.04 or newer. 
27+
- We have dropped support for Ubuntu 16.04 in conjunction with Azure DevOps and Github. Ubuntu 16.04 reached end of life back in April of 2021. Please migrate Ubuntu 16.04 workflows to Ubuntu 18.04 or newer. 
2828

29-
- OpenSSL linking in Linux binaries changed to dynamic. Linux binary size has been reduced about 50%.
29+
- OpenSSL linking in Linux binaries changed to dynamic. Linux binary size has been reduced by about 50%.
3030

3131
- Mac M1 ARM based silicon support added.
3232

@@ -38,31 +38,31 @@ ms.custom: ignite-fall-2021
3838

3939
- **C++**: New APIs for intent recognition to facilitate more advanced pattern matching. This includes List and Prebuilt Integer entities as well as support for grouping intents and entities as models (Documentation, updates, and samples are under development and will be published in the near future).
4040

41-
- **Mac**: Support for ARM64 (M1) based silicon for Cocoapod, Python, Java and NuGet packages [Related customer issue](https://github.com/Azure-Samples/cognitive-services-speech-sdk/issues/1244).
41+
- **Mac**: Support for ARM64 (M1) based silicon for Cocoapod, Python, Java, and NuGet packages related to [GitHub issue 1244](https://github.com/Azure-Samples/cognitive-services-speech-sdk/issues/1244).
4242

43-
- **iOS/Mac**: iOS and MacOS binaries are now packaged into xcframework [Related customer issue](https://github.com/Azure-Samples/cognitive-services-speech-sdk/issues/919).
43+
- **iOS/Mac**: iOS and MacOS binaries are now packaged into xcframework related to [GitHub issue 919](https://github.com/Azure-Samples/cognitive-services-speech-sdk/issues/919).
4444

45-
- **iOS/Mac**: Support for Mac catalyst [Related customer issue](https://github.com/Azure-Samples/cognitive-services-speech-sdk/issues/1171).
45+
- **iOS/Mac**: Support for Mac catalyst related to [GitHub issue 1171](https://github.com/Azure-Samples/cognitive-services-speech-sdk/issues/1171).
4646

4747
- **Linux**: New tar package added for CentOS7 [About the Speech SDK](speech-sdk.md).
4848

4949
- **Javascript**: VoiceProfile & SpeakerRecognizer APIs made async/awaitable.
5050

5151
- **Javascript**: Support added for US government Azure regions.
5252

53-
- **Windows**: Support playback on Universal Windows Platform (UWP).
53+
- **Windows**: Support added for playback on Universal Windows Platform (UWP).
5454

5555

5656

5757
#### Bug fixes
5858

59-
- **Android**: OpenSSL security update (updated to 1.1.1l version) for Android packages.
59+
- **Android**: OpenSSL security update (updated to version 1.1.1l) for Android packages.
6060

61-
- **Python**: Fix bug selecting speaker device on Python fails.
61+
- **Python**: Resolved bug where selecting speaker device on Python fails.
6262

6363
- **Core**: Automatically reconnect when a connection attempt fails.
6464

65-
- **iOS**: Audio compression disabled on iOS packages due instability and bitcode build problems when using Gstreamer. Details [here](https://github.com/Azure-Samples/cognitive-services-speech-sdk/issues/1209).
65+
- **iOS**: Audio compression disabled on iOS packages due instability and bitcode build problems when using Gstreamer. Details are available via [GitHub issue 1209](https://github.com/Azure-Samples/cognitive-services-speech-sdk/issues/1209).
6666

6767

6868

articles/communication-services/concepts/interop/calling-chat.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -50,11 +50,11 @@ const call = callAgent.startCall([teamsCallee]);
5050
**Limitations and known issues**
5151
- Teams users must be in "TeamsOnly" mode. Skype for Business users can't receive 1:1 calls from Communication Services users.
5252
- Escalation to a group call isn't supported.
53-
- Communication Services users are not displayed correctly in the Call history
5453
- Communication Services call recording isn't available for 1:1 calls.
5554
- Advanced call routing capabilities such as call forwarding, group call pickup, simulring, and voice mail are not supported.
5655
- Teams users can't set Communication Services users as forwarding/transfer targets.
57-
- LyncIpPhone fork is not supported.
56+
- There are a number of features in the Teams client that do not work as expected during 1:1 calls with Communication Services users.
57+
- Third party [devices for Teams](/MicrosoftTeams/devices/teams-ip-phones) are not supported.
5858

5959
## Chat
6060
With the Chat SDK, Communication Services users or endpoints can start 1:n chat with Teams users, identified by their Azure Active Directory (AAD) object ID. You can easily modify an existing application that creates chats with other Communication Services users, to instead create chats with Teams users:

articles/container-apps/scale-app.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -161,7 +161,7 @@ The following example shows how to create a CPU scaling rule.
161161

162162
## Memory
163163

164-
CPU scaling allows your app to scale in or out depending on how much the CPU is being used. CPU scaling doesn't allow your container app to scale to 0. For more information regarding this scaler, see [KEDA Memory scaler](https://keda.sh/docs/scalers/memory/).
164+
Memory scaling allows your app to scale in or out depending on how much of the memory is being used. Memory scaling doesn't allow your container app to scale to 0. For more information regarding this scaler, see [KEDA Memory scaler](https://keda.sh/docs/scalers/memory/).
165165

166166
The following example shows how to create a memory scaling rule.
167167

articles/mysql/flexible-server/connect-csharp.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ For this quickstart you need:
2626
- Create an Azure Database for MySQL Flexible server using [Azure portal](./quickstart-create-server-portal.md) <br/> or [Azure CLI](./quickstart-create-server-cli.md) if you do not have one.
2727
- Based on whether you are using public or private access, complete **ONE** of the actions below to enable connectivity.
2828
- [Create a database and non-admin user](../howto-create-users.md)
29-
- Install the [.NET SDK for your platform](/dotnet/core/install/windows?tabs=net50) (Windows, Ubuntu Linux, or macOS) for your platform.
29+
- Install the [.NET SDK for your platform](https://dotnet.microsoft.com/download) (Windows, Ubuntu Linux, or macOS) for your platform.
3030

3131
[Having issues? Let us know](https://github.com/MicrosoftDocs/azure-docs/issues)
3232

articles/postgresql/connect-csharp.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ For this quickstart you need:
2727
| **Configure Service Endpoint** | Public | [Portal](./howto-manage-vnet-using-portal.md) <br/> [CLI](./howto-manage-vnet-using-cli.md)|
2828
| **Configure private link** | Private | [Portal](./howto-configure-privatelink-portal.md) <br/> [CLI](./howto-configure-privatelink-cli.md) |
2929

30-
- Install the [.NET SDK for your platform](/dotnet/core/install/windows?tabs=net50) (Windows, Ubuntu Linux, or macOS) for your platform.
30+
- Install the [.NET SDK for your platform](https://dotnet.microsoft.com/download) (Windows, Ubuntu Linux, or macOS) for your platform.
3131
- Install [Visual Studio](https://www.visualstudio.com/downloads/) to build your project.
3232
- Install [Npgsql](https://www.nuget.org/packages/Npgsql/) NuGet package in Visual Studio.
3333

articles/postgresql/flexible-server/connect-csharp.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ For this quickstart you need:
2020
- An Azure account with an active subscription. [Create an account for free](https://azure.microsoft.com/free).
2121
- Create an Azure Database for PostgreSQL Flexible server using [Azure portal](./quickstart-create-server-portal.md) <br/> or [Azure CLI](./quickstart-create-server-cli.md) if you do not have one.
2222
- Use the empty *postgres* database available on the server or create a [new database](./quickstart-create-server-portal.md#connect-to-the-postgresql-database-using-psql).
23-
- Install the [.NET SDK for your platform](/dotnet/core/install/windows?tabs=net50) (Windows, Ubuntu Linux, or macOS) for your platform.
23+
- Install the [.NET SDK for your platform](https://dotnet.microsoft.com/download) (Windows, Ubuntu Linux, or macOS) for your platform.
2424
- Install [Visual Studio](https://www.visualstudio.com/downloads/) to build your project.
2525
- Install [Npgsql](https://www.nuget.org/packages/Npgsql/) NuGet package in Visual Studio.
2626

articles/purview/.openpublishing.redirection.purview.json

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -44,6 +44,16 @@
4444
"source_path_from_root": "/articles/purview/file-extension-insights.md",
4545
"redirect_url": "/azure/purview/asset-insights",
4646
"redirect_document_id": true
47+
},
48+
{
49+
"source_path_from_root": "/articles/purview/concept-data-policies.md",
50+
"redirect_url": "/azure/purview/how-to-access-policies-storage",
51+
"redirect_document_id": true
52+
},
53+
{
54+
"source_path_from_root": "/articles/purview/concept-self-service.md",
55+
"redirect_url": "/azure/purview/overview",
56+
"redirect_document_id": true
4757
}
4858
]
4959
}

0 commit comments

Comments
 (0)