Skip to content

Commit 3f1f2d3

Browse files
authored
Merge pull request #95263 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 bc57a3a + fd44fd6 commit 3f1f2d3

File tree

9 files changed

+45
-19
lines changed

9 files changed

+45
-19
lines changed

articles/active-directory/authentication/howto-mfa-getstarted.md

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -206,6 +206,9 @@ function Set-MfaState {
206206
Get-MsolUser -All | Set-MfaState -State Disabled
207207
```
208208

209+
> [!NOTE]
210+
> We recently changed the behavior and PowerShell script above accordingly. Previously, the script saved off the MFA methods, disabled MFA, and restored the methods. This is no longer necessary now that the default behavior for disable doesn't clear the methods.
211+
209212
## Plan Conditional Access policies
210213

211214
To plan your Conditional Access policy strategy, which will determine when MFA and other controls are required, refer to [What is Conditional Access in Azure Active Directory?](../conditional-access/overview.md).

articles/active-directory/hybrid/how-to-connect-staged-rollout.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -113,16 +113,16 @@ Enable Seamless SSO on the AD forests using PowerShell. If you have more than
113113

114114
2. Navigate to the %programfiles%\\Microsoft Azure Active Directory Connect folder.
115115

116-
3. Import the Seamless SSO PowerShell module using this command: `Import-Module .\\AzureADSSO.psd1`.
116+
3. Import the Seamless SSO PowerShell module using this command: `Import-Module .\AzureADSSO.psd1`.
117117

118118
4. Run PowerShell as an Administrator. In PowerShell, call `New-AzureADSSOAuthenticationContext`. This command should give you a dialog box where you can enter your tenant's Global Administrator credentials.
119119

120-
5. Call `Get-AzureADSSOStatus|ConvertFrom-Json`. This command provides you the list of AD forests (look at the \"Domains\" list) on which this feature has been enabled. By default, it is set to false at the tenant level.
120+
5. Call `Get-AzureADSSOStatus | ConvertFrom-Json`. This command provides you the list of AD forests (look at the \"Domains\" list) on which this feature has been enabled. By default, it is set to false at the tenant level.
121121

122122
> **Example:**
123123
> ![Example of the Windows PowerShell output](./media/how-to-connect-staged-rollout/sr3.png)
124124
125-
6. Call `$creds=Get-Credential`. When prompted, enter the Domain Administrator credentials for the intended AD forest.
125+
6. Call `$creds = Get-Credential`. When prompted, enter the Domain Administrator credentials for the intended AD forest.
126126

127127
7. Call `Enable-AzureADSSOForest -OnPremCredentials $creds`. This command creates the AZUREADSSOACC computer account from the on-premises domain controller for this specific Active Directory forest that is required for Seamless SSO.
128128

articles/active-directory/hybrid/reference-connect-sync-attributes-synchronized.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@ In this case, start with the list of attributes in this topic and identify those
5959
| company |X |X | | |
6060
| countryCode |X |X | | |
6161
| department |X |X | | |
62-
| description |X |X |X | |
62+
| description | | |X | |
6363
| displayName |X |X |X | |
6464
| dLMemRejectPerms |X |X |X | |
6565
| dLMemSubmitPerms |X |X |X | |

articles/active-directory/hybrid/reference-connect-version-history.md

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -75,8 +75,8 @@ Under certain circumstances, servers that were auto upgraded to version 1.4.18.0
7575
- Added a deprecation warning for the sync service manager on the connector properties page. This warning notifies the user that changes should be made through the AADC wizard.
7676
- Added new error for issues with a user's password policy.
7777
- Prevent misconfiguration of group filtering by domain and OU filters. Group filtering will show an error when the domain/OU of the entered group is already filtered out and keep the user from moving forward until the issue is resolved.
78-
- Users can no longer create a connector for Active Directory Domain Services or Windows Azure Active Directory in the old UI.
79-
- Fixed accessibility of custom UI controls in the Sync Service Manager
78+
- Users can no longer create a connector for Active Directory Domain Services or Windows Azure Active Directory in the Synchronization Service Manager UI.
79+
- Fixed accessibility of custom UI controls in the Synchronization Service Manager.
8080
- Enabled six federation management tasks for all sign-in methods in Azure AD Connect. (Previously, only the “Update AD FS SSL certificate” task was available for all sign-ins.)
8181
- Added a warning when changing the sign-in method from federation to PHS or PTA that all Azure AD domains and users will be converted to managed authentication.
8282
- Removed token-signing certificates from the “Reset Azure AD and AD FS trust” task and added a separate sub-task to update these certificates.
@@ -128,7 +128,7 @@ Under certain circumstances, servers that were auto upgraded to version 1.4.18.0
128128
- Add support for Domain Refresh
129129
- Exchange Mail Public Folders feature goes GA
130130
- Improve wizard error handling for service failures
131-
- Added warning link for old UI on connector properties page.
131+
- Added warning link on Synchronization Service Manager UI in the connector properties page.
132132
- The Unified Groups Writeback feature is now GA
133133
- Improved SSPR error message when the DC is missing an LDAP control
134134
- Added diagnostics for DCOM registry errors during install
@@ -154,7 +154,7 @@ Under certain circumstances, servers that were auto upgraded to version 1.4.18.0
154154
- Fix VSS Errors with LocalDB
155155
- Fix misleading error message when object type is not in scope
156156
- Corrected an issue where installation of Azure AD PowerShell on a server could potentially cause an assembly conflict with Azure AD Connect.
157-
- Fixed PHS bug on Staging Server when Connector Credentials are updated in the old UI.
157+
- Fixed PHS bug on Staging Server when Connector Credentials are updated in the Synchronization Service Manager UI.
158158
- Fixed some memory leaks
159159
- Miscellaneous Autoupgrade fixes
160160
- Miscellaneous fixes to Export and Unconfirmed Import Processing

articles/aks/azure-disks-dynamic-pv.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ Each AKS cluster includes two pre-created storage classes, both configured to wo
3838
* The *managed-premium* storage class provisions a premium Azure disk.
3939
* Premium disks are backed by SSD-based high-performance, low-latency disk. Perfect for VMs running production workload. If the AKS nodes in your cluster use premium storage, select the *managed-premium* class.
4040

41-
These default storage classes don't allow you to update the volume size once created. To enable this ability, add the *allowVolumeExpansion: true* line to one of the default storage classes, or create you own custom storage class. You can edit an existing storage class using the `kubectl edit sc` command. For more information on storage classes and creating youor own, see [Storage options for applications in AKS][storage-class-concepts].
41+
These default storage classes don't allow you to update the volume size once created. To enable this ability, add the *allowVolumeExpansion: true* line to one of the default storage classes, or create you own custom storage class. You can edit an existing storage class using the `kubectl edit sc` command. For more information on storage classes and creating your own, see [Storage options for applications in AKS][storage-class-concepts].
4242

4343
Use the [kubectl get sc][kubectl-get] command to see the pre-created storage classes. The following example shows the pre-create storage classes available within an AKS cluster:
4444

articles/app-service/overview-managed-identity.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ To set up a managed identity in the portal, you will first create an application
3838

3939
2. If using a function app, navigate to **Platform features**. For other app types, scroll down to the **Settings** group in the left navigation.
4040

41-
3. Select **Managed identity**.
41+
3. Select **Identity**.
4242

4343
4. Within the **System assigned** tab, switch **Status** to **On**. Click **Save**.
4444

@@ -165,7 +165,7 @@ First, you'll need to create a user-assigned identity resource.
165165

166166
3. If using a function app, navigate to **Platform features**. For other app types, scroll down to the **Settings** group in the left navigation.
167167

168-
4. Select **Managed identity**.
168+
4. Select **Identity**.
169169

170170
5. Within the **User assigned** tab, click **Add**.
171171

@@ -190,7 +190,7 @@ Any resource of type `Microsoft.Web/sites` can be created with an identity by in
190190
> [!NOTE]
191191
> An application can have both system-assigned and user-assigned identities at the same time. In this case, the `type` property would be `SystemAssigned,UserAssigned`
192192
193-
Adding the user-assigned type and a cotells Azure to create and manage the identity for your application.
193+
Adding the user-assigned type tells Azure to use the user-assigned identity specified for your application.
194194

195195
For example, a web app might look like the following:
196196
```json

articles/azure-monitor/app/api-filtering-sampling.md

Lines changed: 26 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -21,11 +21,11 @@ You can write and configure plug-ins for the Application Insights SDK to customi
2121

2222
Before you start:
2323

24-
* Install the appropriate SDK for your application: [ASP.NET](asp-net.md), [ASP.NET Core](asp-net-core.md), [Non HTTP/Worker for .NET/.NET Core](worker-service.md), or [Java](../../azure-monitor/app/java-get-started.md).
24+
* Install the appropriate SDK for your application: [ASP.NET](asp-net.md), [ASP.NET Core](asp-net-core.md), [Non HTTP/Worker for .NET/.NET Core](worker-service.md), [Java](../../azure-monitor/app/java-get-started.md) or [JavaScript](javascript.md)
2525

2626
<a name="filtering"></a>
2727

28-
## Filtering: ITelemetryProcessor
28+
## Filtering
2929

3030
This technique gives you direct control over what is included or excluded from the telemetry stream. Filtering can be used to drop telemetry items from being sent to Application Insights. You can use it in conjunction with Sampling, or separately.
3131

@@ -195,7 +195,30 @@ public void Process(ITelemetry item)
195195

196196
<a name="add-properties"></a>
197197

198-
## Add properties: ITelemetryInitializer
198+
### JavaScript Web applications
199+
200+
**Filtering using ITelemetryInitializer**
201+
202+
1. Create a telemetry initializer callback function. The callback function takes `ITelemetryItem` as a parameter, which is the event that is being processed. Returning `false` from this callback results in the telemetry item to be filtered out.
203+
204+
```JS
205+
var filteringFunction = (envelope) => {
206+
if (envelope.data.someField === 'tobefilteredout') {
207+
return false;
208+
}
209+
210+
return true;
211+
};
212+
```
213+
214+
2. Add your telemetry initializer callback:
215+
216+
```JS
217+
appInsights.addTelemetryInitializer(filteringFunction);
218+
```
219+
220+
## Add/modify properties: ITelemetryInitializer
221+
199222

200223
Use telemetry initializers to enrich telemetry with additional information and/or to override telemetry properties set by the standard telemetry modules.
201224

articles/azure-monitor/platform/gateway.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ The Log Analytics gateway is an HTTP forward proxy that supports HTTP tunneling
2222

2323
The Log Analytics gateway supports:
2424

25-
* Reporting up to the same four Log Analytics workspace agents that are behind it and that are configured with Azure Automation Hybrid Runbook Workers.
25+
* Reporting up to the same Log Analytics workspaces configured on each agent behind it and that are configured with Azure Automation Hybrid Runbook Workers.
2626
* Windows computers on which the Microsoft Monitoring Agent is directly connected to a Log Analytics workspace in Azure Monitor.
2727
* Linux computers on which a Log Analytics agent for Linux is directly connected to a Log Analytics workspace in Azure Monitor.
2828
* System Center Operations Manager 2012 SP1 with UR7, Operations Manager 2012 R2 with UR3, or a management group in Operations Manager 2016 or later that is integrated with Log Analytics.
@@ -383,4 +383,4 @@ To get help, select the question mark icon in the upper-right corner of the port
383383

384384
## Next steps
385385

386-
[Add data sources](../../azure-monitor/platform/agent-data-sources.md) to collect data from connected sources, and store the data in your Log Analytics workspace.
386+
[Add data sources](../../azure-monitor/platform/agent-data-sources.md) to collect data from connected sources, and store the data in your Log Analytics workspace.

articles/event-hubs/event-hubs-dotnet-standard-getstarted-send.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -55,8 +55,8 @@ Add the [`Microsoft.Azure.EventHubs`](https://www.nuget.org/packages/Microsoft.A
5555

5656
```csharp
5757
using Microsoft.Azure.EventHubs;
58-
using System.Text;
59-
using System.Threading.Tasks;
58+
using System.Text;
59+
using System.Threading.Tasks;
6060
```
6161

6262
2. Add constants to the `Program` class for the Event Hubs connection string and entity path (individual event hub name). Replace the placeholders in brackets with the proper values that were obtained when creating the event hub. Make sure that the `{Event Hubs connection string}` is the namespace-level connection string, and not the event hub string.

0 commit comments

Comments
 (0)