Skip to content

Commit 96cff05

Browse files
authored
Merge branch 'MicrosoftDocs:main' into mcollier/retry-approach
2 parents 5fea5d2 + a654bc7 commit 96cff05

File tree

44 files changed

+1783
-868
lines changed

Some content is hidden

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

44 files changed

+1783
-868
lines changed

.openpublishing.redirection.azure-monitor.json

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,11 @@
2525
"redirect_url": "/azure/azure-monitor/change/change-analysis",
2626
"redirect_document_id": false
2727
},
28+
{
29+
"source_path_from_root": "/articles/azure-monitor/app/legacy-pricing.md",
30+
"redirect_url": "/azure/azure-monitor/best-practices-cost",
31+
"redirect_document_id": false
32+
},
2833
{
2934
"source_path_from_root": "/articles/azure-monitor/app/snapshot-debugger.md",
3035
"redirect_url": "/azure/azure-monitor/snapshot-debugger/snapshot-debugger",

articles/active-directory/authentication/how-to-mfa-number-match.md

Lines changed: 3 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,9 @@ description: Learn how to use number matching in MFA notifications
44
ms.service: active-directory
55
ms.subservice: authentication
66
ms.topic: conceptual
7-
ms.date: 01/31/2023
7+
ms.date: 02/03/2023
88
ms.author: justinha
9-
author: mjsantani
9+
author: justinha
1010
ms.collection: M365-identity-device-management
1111

1212
# Customer intent: As an identity administrator, I want to encourage users to use the Microsoft Authenticator app in Azure AD to improve and secure user sign-in events.
@@ -305,7 +305,7 @@ GET https://graph.microsoft.com/beta/authenticationMethodsPolicy/authenticationM
305305

306306
### When will my tenant see number matching if I don't use the Azure portal or Graph API to roll out the change?
307307

308-
Number match will be enabled for all users of Microsoft Authenticator after February 27, 2023. Relevant services will begin deploying these changes after February 27, 2023 and users will start to see number match in approval requests. As services deploy, some may see number match while others don't. To ensure consistent behavior for all your users, we highly recommend you use the Azure portal or Graph API to roll out number match for all Microsoft Authenticator users.
308+
Number match will be enabled for all users of Microsoft Authenticator push notifications after February 27, 2023. Relevant services will begin deploying these changes after February 27, 2023 and users will start to see number match in approval requests. As services deploy, some may see number match while others don't. To ensure consistent behavior for all your users, we highly recommend you use the Azure portal or Graph API to roll out number match for all Microsoft Authenticator users.
309309

310310
### Will the changes after February 27th, 2023, override number matching settings that are configured for a group in the Authentication methods policy?
311311

@@ -362,10 +362,6 @@ If the user has a different default authentication method, there won't be any ch
362362

363363
Regardless of their default method, any user who is prompted to sign-in with Authenticator push notifications will see number match after February 27th, 2023. If the user is prompted for another method, they won't see any change.
364364

365-
### Will users who don't use number matching be able to perform MFA?
366-
367-
It depends on how the **Enable and Target** tab is configured. The scope for number match approvals will change under the **Configure** tab to include everyone, but it only applies for users and groups targeted on the **Enable and Target** tab for Push or Any. However, if Target on the **Enable and Target** tab is set to specific groups for Push or Any, and the user isn't a member of those groups, then they won't receive the number matching approvals once the change is implemented after February 27th, 2023 because they aren't a member of the groups defined on the **Enable and Target** tab for Push and/or Any.
368-
369365
### Is number matching supported with MFA Server?
370366

371367
No, number matching isn't enforced because it's not a supported feature for MFA Server, which is [deprecated](https://techcommunity.microsoft.com/t5/microsoft-entra-azure-ad-blog/microsoft-entra-change-announcements-september-2022-train/ba-p/2967454).

articles/active-directory/fundamentals/9-secure-access-teams-sharepoint.md

Lines changed: 114 additions & 111 deletions
Large diffs are not rendered by default.

articles/active-directory/multi-tenant-organizations/cross-tenant-synchronization-configure.md

Lines changed: 22 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ ms.service: active-directory
88
ms.workload: identity
99
ms.subservice: multi-tenant-organizations
1010
ms.topic: how-to
11-
ms.date: 02/01/2023
11+
ms.date: 02/03/2023
1212
ms.author: rolyon
1313
ms.custom: it-pro
1414

@@ -118,7 +118,7 @@ In this step, you automatically redeem invitations in the source tenant.
118118

119119
1. Select **Save**.
120120

121-
## Step 5: Create a configuration application in the source tenant
121+
## Step 5: Create a configuration in the source tenant
122122

123123
![Icon for the source tenant.](./media/common/icon-tenant-source.png)<br/>**Source tenant**
124124

@@ -454,6 +454,26 @@ Restoring a previously soft-deleted user in the target tenant isn't supported.
454454

455455
Manually restore the soft-deleted user in the target tenant. For more information, see [Restore or remove a recently deleted user using Azure Active Directory](../fundamentals/active-directory-users-restore.md).
456456

457+
#### Symptom - Unable to delete a configuration
458+
459+
On the **Configurations** page, there isn't a way to delete a configuration.
460+
461+
**Cause**
462+
463+
Currently, there isn't a way to delete a configuration on the **Configurations** page. Instead, you must delete the configuration in **Enterprise applications**.
464+
465+
**Solution**
466+
467+
1. In the source tenant, select **Azure Active Directory** > **Enterprise applications**.
468+
469+
1. In the list of all applications, find the name of your configuration. If necessary, you can search by the configuration name.
470+
471+
1. Select the configuration and then select **Properties**.
472+
473+
1. Select **Delete** and then **Yes** to delete the configuration.
474+
475+
:::image type="content" source="./media/cross-tenant-synchronization-configure/enterprise-applications-configuration-delete.png" alt-text="Screenshot of the Enterprise applications Properties page showing how to delete a configuration." lightbox="./media/cross-tenant-synchronization-configure/enterprise-applications-configuration-delete.png":::
476+
457477
## Next steps
458478

459479
- [Tutorial: Reporting on automatic user account provisioning](../app-provisioning/check-status-user-account-provisioning.md)
Loading

articles/aks/image-cleaner.md

Lines changed: 56 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -5,15 +5,15 @@ ms.author: nickoman
55
author: nickomang
66
services: container-service
77
ms.topic: article
8-
ms.date: 12/14/2022
8+
ms.date: 02/03/2023
99
---
1010

1111
# Use Image Cleaner to clean up stale images on your Azure Kubernetes Service cluster (preview)
1212

13-
It's common to use pipelines to build and deploy images on Azure Kubernetes Service (AKS) clusters. While great for image creation, this process often doesn't account for the stale images left behind and can lead to image bloat on cluster nodes. These images can present security issues as they may contain vulnerabilities. By cleaning these unreferenced images, you can remove an area of risk in your clusters. When done manually, this process can be time intensive, which Image Cleaner can mitigate via automatic image identification and removal.
13+
It's common to use pipelines to build and deploy images on Azure Kubernetes Service (AKS) clusters. While great for image creation, this process often doesn't account for the stale images left behind and can lead to image bloat on cluster nodes. These images can present security issues as they may contain vulnerabilities. By cleaning these unreferenced images, you can remove an area of risk in your clusters. When done manually, this process can be time intensive, which Image Cleaner can mitigate via automatic image identification and removal.
1414

1515
> [!NOTE]
16-
> Image Cleaner is a feature based on [Eraser](https://github.com/Azure/eraser).
16+
> Image Cleaner is a feature based on [Eraser](https://github.com/Azure/eraser).
1717
> On an AKS cluster, the feature name and property name is `Image Cleaner` while the relevant Image Cleaner pods' names contain `Eraser`.
1818
1919
[!INCLUDE [preview features callout](./includes/preview/preview-callout.md)]
@@ -92,8 +92,7 @@ When enabled, an `eraser-controller-manager` pod is deployed on each agent node,
9292

9393
Once an `ImageList` is generated, Image Cleaner will remove all the images in the list from node VMs.
9494

95-
96-
:::image type="content" source="./media/image-cleaner/image-cleaner.jpg" alt-text="A diagram showing ImageCleaner's workflow. The ImageCleaner pods running on the cluster can generate an ImageList, or manual input can be provided.":::
95+
:::image type="content" source="./media/image-cleaner/image-cleaner.jpg" alt-text="Screenshot of a diagram showing ImageCleaner's workflow. The ImageCleaner pods running on the cluster can generate an ImageList, or manual input can be provided.":::
9796

9897
## Configuration options
9998

@@ -167,7 +166,58 @@ az aks update -g MyResourceGroup -n MyManagedCluster
167166

168167
## Logging
169168

170-
The deletion logs are stored in the `image-cleaner-kind-worker` pods. You can check these via `kubectl logs` or via the Container Insights pod log table if the [Azure Monitor add-on](./monitor-aks.md) is enabled.
169+
Deletion image logs are stored in `eraser-aks-nodepool-xxx` pods for manually deleted images, and in `eraser-collector-xxx` pods for automatically deleted images.
170+
171+
You can view these logs by running `kubectl logs <pod name> -n kubesystem`. However, this command may return only the most recent logs, since older logs are routinely deleted. To view all logs, follow these steps to enable the [Azure Monitor add-on](./monitor-aks.md) and use the Container Insights pod log table.
172+
173+
1. Ensure that Azure monitoring is enabled on the cluster. For detailed steps, see [Enable Container Insights for AKS cluster](../azure-monitor/containers/container-insights-enable-aks.md#existing-aks-cluster).
174+
175+
1. Get the Log Analytics resource ID:
176+
177+
```azurecli
178+
az aks show -g <resourceGroupofAKSCluster> -n <nameofAksCluster>
179+
```
180+
181+
After a few minutes, the command returns JSON-formatted information about the solution, including the workspace resource ID:
182+
183+
```json
184+
"addonProfiles": {
185+
"omsagent": {
186+
"config": {
187+
"logAnalyticsWorkspaceResourceID": "/subscriptions/<WorkspaceSubscription>/resourceGroups/<DefaultWorkspaceRG>/providers/Microsoft.OperationalInsights/workspaces/<defaultWorkspaceName>"
188+
},
189+
"enabled": true
190+
}
191+
}
192+
```
193+
194+
1. In the Azure portal, search for the workspace resource ID, then select **Logs**.
195+
196+
1. Copy this query into the table, replacing `name` with either `eraser-aks-nodepool-xxx` (for manual mode) or `eraser-collector-xxx` (for automatic mode).
197+
198+
```kusto
199+
let startTimestamp = ago(1h);
200+
KubePodInventory
201+
| where TimeGenerated > startTimestamp
202+
| project ContainerID, PodName=Name, Namespace
203+
| where PodName contains "name" and Namespace startswith "kube-system"
204+
| distinct ContainerID, PodName
205+
| join
206+
(
207+
ContainerLog
208+
| where TimeGenerated > startTimestamp
209+
)
210+
on ContainerID
211+
// at this point before the next pipe, columns from both tables are available to be "projected". Due to both
212+
// tables having a "Name" column, we assign an alias as PodName to one column which we actually want
213+
| project TimeGenerated, PodName, LogEntry, LogEntrySource
214+
| summarize by TimeGenerated, LogEntry
215+
| order by TimeGenerated desc
216+
```
217+
218+
1. Select **Run**. Any deleted image logs will appear in the **Results** area.
219+
220+
:::image type="content" source="media/image-cleaner/eraser-log-analytics.png" alt-text="Screenshot showing deleted image logs in the Azure portal." lightbox="media/image-cleaner/eraser-log-analytics.png":::
171221

172222
<!-- LINKS -->
173223

91.8 KB
Loading

articles/azure-arc/servers/prerequisites.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ The following versions of the Windows and Linux operating system are officially
3838
* SUSE Linux Enterprise Server (SLES) 12 and 15
3939
* Red Hat Enterprise Linux (RHEL) 7, 8 and 9
4040
* Amazon Linux 2
41-
* Oracle Linux 7
41+
* Oracle Linux 7 and 8
4242

4343
> [!NOTE]
4444
> On Linux, Azure Arc-enabled servers install several daemon processes. We only support using systemd to manage these processes. In some environments, systemd may not be installed or available, in which case Arc-enabled servers are not supported, even if the distribution is otherwise supported. These environments include **Windows Subsystem for Linux** (WSL) and most container-based systems, such as Kubernetes or Docker. The Azure Connected Machine agent can be installed on the node that runs the containers but not inside the containers themselves.

articles/azure-fluid-relay/concepts/customer-managed-keys.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,7 @@ Request payload format:
6868
Example userAssignedIdentities and userAssignedIdentityResourceId:
6969
/subscriptions/ xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx/resourceGroups/testGroup/providers/Microsoft.ManagedIdentity/userAssignedIdentities/testUserAssignedIdentity
7070

71-
Example keyEncryptionKeyUrl: https://test-key-vault.vault.azure.net/keys/testKey/testKeyVersionGuid
71+
Example keyEncryptionKeyUrl: `https://test-key-vault.vault.azure.net/keys/testKey/testKeyVersionGuid`
7272

7373
Notes:
7474
- Identity.type must be UserAssigned. It is the identity type of the managed identity that is assigned to the Fluid Relay resource.

0 commit comments

Comments
 (0)