Skip to content

Commit c54ee0c

Browse files
authored
Merge pull request #213276 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 6c20424 + 079b936 commit c54ee0c

File tree

7 files changed

+17
-17
lines changed

7 files changed

+17
-17
lines changed

articles/active-directory/enterprise-users/groups-dynamic-membership.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -396,7 +396,7 @@ The following device attributes can be used.
396396
deviceOSVersion | any string value | device.deviceOSVersion -eq "9.1"<br>device.deviceOSVersion -startsWith "10.0.1"
397397
deviceOwnership | Personal, Company, Unknown | device.deviceOwnership -eq "Company"
398398
devicePhysicalIds | any string value used by Autopilot, such as all Autopilot devices, OrderID, or PurchaseOrderID | device.devicePhysicalIDs -any _ -contains "[ZTDId]"<br>(device.devicePhysicalIds -any _ -eq "[OrderID]:179887111881"<br>(device.devicePhysicalIds -any _ -eq "[PurchaseOrderId]:76222342342"
399-
deviceTrustType | AzureAD, ServerAD, Workplace | device.deviceOwnership -eq "AzureAD"
399+
deviceTrustType | AzureAD, ServerAD, Workplace | device.deviceTrustType -eq "AzureAD"
400400
enrollmentProfileName | Apple Device Enrollment Profile name, Android Enterprise Corporate-owned dedicated device Enrollment Profile name, or Windows Autopilot profile name | device.enrollmentProfileName -eq "DEP iPhones"
401401
extensionAttribute1 | any string value | device.extensionAttribute1 -eq "some string value"
402402
extensionAttribute2 | any string value | device.extensionAttribute2 -eq "some string value"

articles/active-directory/hybrid/how-to-connect-group-writeback-v2.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ There are two versions of group writeback. The original version is in general av
3131
- You can configure the common name in an Active Directory group's distinguished name to include the group's display name when it's written back.
3232
- You can use the Azure AD admin portal, Graph Explorer, and PowerShell to configure which Azure AD groups are written back.
3333

34-
The new version is available only in [Azure AD Connect version 2.0.89.0 or later](https://www.microsoft.com/download/details.aspx?id=47594). It must be enabled in addition to the original version.
34+
The new version is enabled on the tenant and not per Azure AD Connect client instance. Make sure that all Azure AD Connect client instances are updated to a minimal build of [Azure AD Connect version 2.0 or later](https://www.microsoft.com/download/details.aspx?id=47594) if group writeback is currently enabled on the client instance.
3535

3636
This article walks you through activities that you should complete before you enable group writeback for your tenant. These activities include discovering your current configuration, verifying the prerequisites, and choosing the deployment approach.
3737

articles/azure-functions/functions-how-to-use-azure-function-app-settings.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -265,7 +265,7 @@ The Functions editor built into the Azure portal lets you update your function c
265265
Files in the root of the app, such as function.proj or extensions.csproj need to be created and edited by using the [Advanced Tools (Kudu)](#kudu).
266266

267267
1. Select your function app, then under **Development tools** select **Advanced tools** > **Go**.
268-
1. If promoted, sign-in to the SCM site with your Azure credentials.
268+
1. If prompted, sign-in to the SCM site with your Azure credentials.
269269
1. From the **Debug console** menu, choose **CMD**.
270270
1. Navigate to `.\site\wwwroot`, select the plus (**+**) button at the top, and select **New file**.
271271
1. Name the file, such as `extensions.csproj` and press Enter.

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

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
title: Migrate from legacy agents to Azure Monitor Agent
33
description: This article provides guidance for migrating from the existing legacy agents to the new Azure Monitor Agent (AMA) and data collection rules (DCR).
44
ms.topic: conceptual
5-
author: guywild
5+
author: guywi-ms
66
ms.author: guywild
77
ms.reviewer: shseth
88
ms.date: 9/14/2022
@@ -11,7 +11,7 @@ ms.custom: devx-track-azurepowershell, devx-track-azurecli
1111
---
1212

1313
# Migrate to Azure Monitor Agent from Log Analytics agent
14-
[Azure Monitor Agent (AMA)](./agents-overview.md) replaces the Log Analytics agent (also known as MMA and OMS) for both Windows and Linux machines, in Azure and on premises. It introduces a simplified, flexible method of configuring collection configuration called [Data Collection Rules (DCRs)](../essentials/data-collection-rule-overview.md). This article outlines the benefits of migrating to Azure Monitor Agent (AMA) and provides guidance on how to implement a successful migration.
14+
[Azure Monitor Agent (AMA)](./agents-overview.md) replaces the Log Analytics agent (also known as MMA and OMS) for both Windows and Linux machines, in both Azure and non-Azure (on-premises and 3rd party clouds) environments. It introduces a simplified, flexible method of configuring collection configuration called [Data Collection Rules (DCRs)](../essentials/data-collection-rule-overview.md). This article outlines the benefits of migrating to Azure Monitor Agent (AMA) and provides guidance on how to implement a successful migration.
1515

1616
> [!IMPORTANT]
1717
> The Log Analytics agent will be [retired on **31 August, 2024**](https://azure.microsoft.com/updates/were-retiring-the-log-analytics-agent-in-azure-monitor-on-31-august-2024/). If you are currently using the Log Analytics agent with Azure Monitor or other supported features and services, you should start planning your migration to Azure Monitor Agent using the information in this article.
@@ -49,7 +49,7 @@ Your migration plan to the Azure Monitor Agent should take into account:
4949
- Running two telemetry agents on the same machine consumes double the resources, including, but not limited to CPU, memory, storage space, and network bandwidth.
5050

5151
## Prerequisites
52-
Review the [prerequisites](./azure-monitor-agent-manage.md#prerequisites) for use Azure Monitor Agent. For on-premises servers or other cloud managed servers, [installing the Azure Arc agent](/azure/azure-arc/servers/agent-overview) is an important prerequisite that then helps to install the agent extension and other required extensions. Using Arc for this purpose comes at no added cost, and it's not mandatory to use Arc for server management overall (i.e. you can continue using your existing on premises management solutions). Once Arc agent is installed, you can follow the same guidance below across Azure and on-premise for migration.
52+
Review the [prerequisites](./azure-monitor-agent-manage.md#prerequisites) for use Azure Monitor Agent. For non-Azure servers, [installing the Azure Arc agent](/azure/azure-arc/servers/agent-overview) is an important prerequisite that then helps to install the agent extension and other required extensions. Using Arc for this purpose comes at no added cost, and it's not mandatory to use Arc for server management overall (i.e. you can continue using your existing non-Azure management solutions). Once Arc agent is installed, you can follow the same guidance below across Azure and non-Azure for migration.
5353

5454
## Migration testing
5555
To ensure safe deployment during migration, begin testing with few resources running Azure Monitor Agent in your nonproduction environment. After you validate the data collected on these test resources, roll out to production by following the same steps.
@@ -58,7 +58,7 @@ See [create new data collection rules](./data-collection-rule-azure-monitor-agen
5858
After you **validate** that data is flowing as expected with Azure Monitor Agent, check the `Category` column in the [Heartbeat](/azure/azure-monitor/reference/tables/heartbeat) table for the value *Azure Monitor Agent* for AMA collected data. Ensure it matches data flowing through the existing Log Analytics agent.
5959

6060
## At-scale migration using Azure Policy
61-
We recommend using [Azure Policy](../../governance/policy/overview.md) to migrate a large number of agents. Start by analyzing your current monitoring setup with the Log Analytics agent using the [AMA Migration Helper](./azure-monitor-agent-migration-tools.md#using-ama-migration-helper-preview) to find sources, such as virtual machines, virtual machine scale sets, and on-premises servers.
61+
We recommend using [Azure Policy](../../governance/policy/overview.md) to migrate a large number of agents. Start by analyzing your current monitoring setup with the Log Analytics agent using the [AMA Migration Helper](./azure-monitor-agent-migration-tools.md#using-ama-migration-helper-preview) to find sources, such as virtual machines, virtual machine scale sets, and non-Azure servers.
6262

6363
Use the [DCR Config Generator](./azure-monitor-agent-migration-tools.md#installing-and-using-dcr-config-generator-preview) to migrate legacy agent configuration, including data sources and destinations, from the workspace to the new DCRs.
6464

articles/iot-edge/how-to-vs-code-develop-module.md

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -125,49 +125,49 @@ The [IoT Edge Dev Tool](https://github.com/Azure/iotedgedev) simplifies Azure Io
125125
mkdir c:\dev\iotedgesolution
126126
```
127127
128-
1. Use the **iotedgedev init** command to create a solution and set up your Azure IoT Hub. Use the following command to create an IoT Edge solution for a specified development language.
128+
1. Use the **iotedgedev solution init** command to create a solution and set up your Azure IoT Hub. Use the following command to create an IoT Edge solution for a specified development language.
129129
130130
# [C](#tab/c)
131131
132132
```bash
133-
iotedgedev init --template c
133+
iotedgedev solution init --template c
134134
```
135135
136136
# [C\#](#tab/csharp)
137137
138138
```bash
139-
iotedgedev init --template csharp
139+
iotedgedev solution init --template csharp
140140
```
141141
142142
The solution includes a default C# module named *filtermodule*.
143143
144144
# [Azure Functions](#tab/azfunctions)
145145
146146
```bash
147-
iotedgedev init --template csharpfunction
147+
iotedgedev solution init --template csharpfunction
148148
```
149149
150150
# [Java](#tab/java)
151151
152152
```bash
153-
iotedgedev init --template java
153+
iotedgedev solution init --template java
154154
```
155155
156156
# [Node.js](#tab/node)
157157
158158
```bash
159-
iotedgedev init --template nodejs
159+
iotedgedev solution init --template nodejs
160160
```
161161
162162
# [Python](#tab/python)
163163
164164
```bash
165-
iotedgedev init --template python
165+
iotedgedev solution init --template python
166166
```
167167
168168
---
169169
170-
The *iotedgedev init* script prompts you to complete several steps including:
170+
The *iotedgedev solution init* script prompts you to complete several steps including:
171171
172172
* Authenticate to Azure
173173
* Choose an Azure subscription

articles/virtual-desktop/TOC.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -95,7 +95,7 @@
9595
href: management.md
9696
- name: Host pool load-balancing methods
9797
href: host-pool-load-balancing.md
98-
- name: FSLogix profile containers and Azure files
98+
- name: FSLogix profile containers and Azure Files
9999
href: fslogix-containers-azure-files.md
100100
- name: Storage options for FSLogix profile containers
101101
href: store-fslogix-profile.md

articles/virtual-desktop/fslogix-containers-azure-files.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
---
22
title: Azure Virtual Desktop FSLogix profile containers files - Azure
3-
description: This article describes FSLogix profile containers within Azure Virtual Desktop and Azure files.
3+
description: This article describes FSLogix profile containers within Azure Virtual Desktop and Azure Files.
44
author: Heidilohr
55
ms.topic: conceptual
66
ms.date: 01/04/2021

0 commit comments

Comments
 (0)