Skip to content

Commit e35286c

Browse files
authored
Merge branch 'main' into ddos-log-workspace-article
2 parents 7bc4068 + 5c35537 commit e35286c

File tree

18 files changed

+280
-239
lines changed

18 files changed

+280
-239
lines changed

articles/active-directory/authentication/howto-authentication-use-email-signin.md

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ services: active-directory
66
ms.service: active-directory
77
ms.subservice: authentication
88
ms.topic: how-to
9-
ms.date: 01/03/2023
9+
ms.date: 01/30/2023
1010

1111
ms.author: justinha
1212
author: calui
@@ -43,8 +43,8 @@ Here's what you need to know about email as an alternate login ID:
4343
* If the non-UPN email in use becomes stale (no longer belongs to the user), these claims will return the UPN instead.
4444
* The feature supports managed authentication with Password Hash Sync (PHS) or Pass-Through Authentication (PTA).
4545
* There are two options for configuring the feature:
46-
* [Home Realm Discovery (HRD) policy](#enable-user-sign-in-with-an-email-address) - Use this option to enable the feature for the entire tenant. Global administrator privileges required.
47-
* [Staged rollout policy](#enable-staged-rollout-to-test-user-sign-in-with-an-email-address) - Use this option to test the feature with specific Azure AD groups. Global administrator privileges required. When you first add a security group for staged rollout, you're limited to 200 users to avoid a UX time-out. After you've added the group, you can add more users directly to it, as required.
46+
* [Home Realm Discovery (HRD) policy](#enable-user-sign-in-with-an-email-address) - Use this option to enable the feature for the entire tenant. Global Administrator, Application Administrator, or Cloud Application Administrator role is required.
47+
* [Staged rollout policy](#enable-staged-rollout-to-test-user-sign-in-with-an-email-address) - Use this option to test the feature with specific Azure AD groups. Global Administrator privileges required. When you first add a security group for staged rollout, you're limited to 200 users to avoid a UX time-out. After you've added the group, you can add more users directly to it, as required.
4848

4949
## Preview limitations
5050

@@ -132,11 +132,11 @@ Email as an alternate login ID applies to [Azure AD B2B collaboration](../extern
132132
133133
Once users with the *ProxyAddresses* attribute applied are synchronized to Azure AD using Azure AD Connect, you need to enable the feature for users to sign in with email as an alternate login ID for your tenant. This feature tells the Azure AD login servers to not only check the sign-in identifier against UPN values, but also against *ProxyAddresses* values for the email address.
134134

135-
During preview, you currently need *global administrator* permissions to enable sign-in with email as an alternate login ID. You can use either Azure portal or PowerShell to set up the feature.
135+
During preview, you currently need *Global Administrator* permissions to enable sign-in with email as an alternate login ID. You can use either Azure portal or PowerShell to set up the feature.
136136

137137
### Azure portal
138138

139-
1. Sign in to the [Azure portal][azure-portal] as a *global administrator*.
139+
1. Sign in to the [Azure portal][azure-portal] as a *Global Administrator*.
140140
1. Search for and select **Azure Active Directory**.
141141
1. From the navigation menu on the left-hand side of the Azure Active Directory window, select **Azure AD Connect > Email as alternate login ID**.
142142

@@ -156,7 +156,7 @@ With the policy applied, it can take up to 1 hour to propagate and for users to
156156
157157
Once users with the *ProxyAddresses* attribute applied are synchronized to Azure AD using Azure AD Connect, you need to enable the feature for users to sign-in with email as an alternate login ID for your tenant. This feature tells the Azure AD login servers to not only check the sign-in identifier against UPN values, but also against *ProxyAddresses* values for the email address.
158158

159-
During preview, you can currently only enable email as an alternate login ID using PowerShell or the Microsoft Graph API. You need *global administrator* privileges to complete the following steps:
159+
During preview, you can currently only enable email as an alternate login ID using PowerShell or the Microsoft Graph API. You need *Global Administrator* privileges to complete the following steps:
160160

161161
1. Open a PowerShell session as an administrator, then install the *Microsoft.Graph* module using the `Install-Module` cmdlet:
162162

@@ -274,7 +274,7 @@ Remove-MgPolicyHomeRealmDiscoveryPolicy -HomeRealmDiscoveryPolicyId "HRD_POLICY_
274274
Staged rollout policy allows tenant administrators to enable features for specific Azure AD groups. It is recommended that tenant administrators use staged rollout to test user sign-in with an email address. When administrators are ready to deploy this feature to their entire tenant, they should use [HRD policy](#enable-user-sign-in-with-an-email-address).
275275

276276

277-
You need *global administrator* permissions to complete the following steps:
277+
You need *Global Administrator* permissions to complete the following steps:
278278

279279
1. Open a PowerShell session as an administrator, then install the *AzureADPreview* module using the [Install-Module][Install-Module] cmdlet:
280280

@@ -284,7 +284,7 @@ You need *global administrator* permissions to complete the following steps:
284284
285285
If prompted, select **Y** to install NuGet or to install from an untrusted repository.
286286
287-
1. Sign in to your Azure AD tenant as a *global administrator* using the [Connect-AzureAD][Connect-AzureAD] cmdlet:
287+
1. Sign in to your Azure AD tenant as a *Global Administrator* using the [Connect-AzureAD][Connect-AzureAD] cmdlet:
288288
289289
```powershell
290290
Connect-AzureAD
@@ -379,7 +379,7 @@ Within a tenant, a cloud-only user's UPN may take on the same value as another u
379379
380380
If prompted, select **Y** to install NuGet or to install from an untrusted repository.
381381
382-
1. Sign in to your Azure AD tenant as a *global administrator* using the [Connect-AzureAD][Connect-AzureAD] cmdlet:
382+
1. Sign in to your Azure AD tenant as a *Global Administrator* using the [Connect-AzureAD][Connect-AzureAD] cmdlet:
383383
384384
```powershell
385385
Connect-AzureAD

articles/active-directory/standards/memo-22-09-multi-factor-authentication.md

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -65,9 +65,7 @@ For more information on deploying this method, see the following resources:
6565

6666
>[!NOTE]
6767
>
68-
> Today, Microsoft Authenticator by itself is **not** phishing-resistant. You must additionally secure the authentication with the phishing resistant properties gained from conditional access policy enforcement of managed devices.
69-
>
70-
>**Microsoft Authenticator native phishing resistance is in development.** Once available, Microsoft Authenticator will be natively phishing-resistant without reliance on conditional access policies that enforce Hybrid join device or device marked as compliant.
68+
> Today, Microsoft Authenticator by itself is not phishing-resistant. You must additionally configure conditional access policy requiring managed device to gain protection from external phishing threats.
7169
7270
### Legacy
7371

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

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ description: Overview of the Azure Monitor Agent, which collects monitoring data
44
ms.topic: conceptual
55
author: guywi-ms
66
ms.author: guywild
7-
ms.date: 1/24/2023
7+
ms.date: 1/30/2023
88
ms.custom: references_regions
99
ms.reviewer: shseth
1010

@@ -84,6 +84,9 @@ In addition to the generally available data collection listed above, Azure Monit
8484
| [Network Watcher](../../network-watcher/network-watcher-monitoring-overview.md) | Connection Monitor: Public preview | Azure NetworkWatcher extension | [Monitor network connectivity by using Azure Monitor Agent](../../network-watcher/azure-monitor-agent-with-connection-monitor.md) |
8585
| [SQL Best Practices Assessment](/sql/sql-server/azure-arc/assess/) | Generally available | | [Configure best practices assessment using Azure Monitor Agent](/sql/sql-server/azure-arc/assess#enable-best-practices-assessment) |
8686

87+
> [!NOTE]
88+
> Features and services listed above in preview **may not be available in Azure Government and China clouds**. They will be available typically within a month *after* the features/services become generally available.
89+
8790

8891
## Supported regions
8992

articles/azure-resource-manager/bicep/bicep-functions-logical.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ description: Describes the functions to use in a Bicep file to determine logical
44
author: mumian
55
ms.author: jgao
66
ms.topic: conceptual
7-
ms.date: 12/15/2022
7+
ms.date: 01/30/2023
88
---
99

1010
# Logical functions for Bicep
@@ -25,7 +25,7 @@ Namespace: [sys](bicep-functions.md#namespaces-for-functions).
2525

2626
| Parameter | Required | Type | Description |
2727
|:--- |:--- |:--- |:--- |
28-
| arg1 |Yes |string or int |The value to convert to a boolean. The string value is case-insensitive. 0 is considered to be false and all other integers are considered to be true. |
28+
| arg1 |Yes |string or int |The value to convert to a boolean. String value "true" with any combination of upper and lower case characters (for example "True", "TRUE", "tRue", "true") are considered to be equivalent and represent the boolean value of `true`, otherwise `false`. Integer value 0 is considered to be `false` and all other integers are considered to be `true`. |
2929

3030
### Return value
3131

articles/cognitive-services/openai/how-to/embeddings.md

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,13 +22,31 @@ An embedding is a special format of data representation that can be easily utili
2222

2323
To obtain an embedding vector for a piece of text, we make a request to the embeddings endpoint as shown in the following code snippets:
2424

25+
# [console](#tab/console)
2526
```console
2627
curl https://YOUR_RESOURCE_NAME.openai.azure.com/openai/deployments/YOUR_DEPLOYMENT_NAME/embeddings?api-version=2022-12-01\
2728
-H 'Content-Type: application/json' \
2829
-H 'api-key: YOUR_API_KEY' \
2930
-d '{"input": "Sample Document goes here"}'
3031
```
3132

33+
# [python](#tab/python)
34+
```python
35+
import openai
36+
37+
openai.api_type = "azure"
38+
openai.api_key = YOUR_API_KEY
39+
openai.api_base = "https://YOUR_RESOURCE_NAME.openai.azure.com"
40+
openai.api_version = "2022-12-01"
41+
42+
response = openai.Embedding.create(
43+
input="Your text string goes here",
44+
engine="YOUR_DEPLOYMENT_NAME"
45+
)
46+
embeddings = response['data'][0]['embedding']
47+
```
48+
---
49+
3250
## Best Practices
3351

3452
### Verify inputs don't exceed the maximum length

articles/ddos-protection/TOC.yml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -62,6 +62,10 @@
6262
href: ddos-configure-log-analytics-workspace.md
6363
- name: Configure metric alerts through portal
6464
href: alerts.md
65+
- name: View Monitoring and Logging
66+
items:
67+
- name: View alerts in Microsoft Defender for Cloud
68+
href: ddos-view-alerts-defender-for-cloud.md
6569
- name: Test with simulation partners
6670
href: test-through-simulations.md
6771
- name: Manage permissions and restrictions
Lines changed: 48 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,48 @@
1+
---
2+
title: 'View Azure DDoS Protection alerts in Microsoft Defender for Cloud'
3+
description: Learn how to view DDoS protection alerts in Microsoft Defender for Cloud.
4+
services: ddos-protection
5+
documentationcenter: na
6+
author: AbdullahBell
7+
ms.service: ddos-protection
8+
ms.topic: how-to
9+
ms.tgt_pltfrm: na
10+
ms.workload: infrastructure-services
11+
ms.date: 01/30/2023
12+
ms.author: abell
13+
---
14+
15+
# View Azure DDoS Protection alerts in Microsoft Defender for Cloud
16+
17+
Microsoft Defender for Cloud provides a list of [security alerts](../security-center/security-center-managing-and-responding-alerts.md), with information to help investigate and remediate problems. With this feature, you get a unified view of alerts, including DDoS attack-related alerts and the actions taken to mitigate the attack in near-time.
18+
There are two specific alerts that you'll see for any DDoS attack detection and mitigation:
19+
20+
- **DDoS Attack detected for Public IP**: This alert is generated when the DDoS protection service detects that one of your public IP addresses is the target of a DDoS attack.
21+
- **DDoS Attack mitigated for Public IP**: This alert is generated when an attack on the public IP address has been mitigated.
22+
To view the alerts, open **Defender for Cloud** in the Azure portal and select **Security alerts**. Under **Threat Protection**, select **Security alerts**. The following screenshot shows an example of the DDoS attack alerts.
23+
24+
:::image type="content" source="./media/manage-ddos-protection/ddos-alert-asc.png" alt-text="Screenshot of DDoS Alert in Microsoft Defender for Cloud." lightbox="./media/manage-ddos-protection/ddos-alert-asc.png":::
25+
26+
## Prerequisites
27+
28+
- An Azure account with an active subscription. [Create an account for free](https://azure.microsoft.com/free/?WT.mc_id=A261C142F).
29+
- [DDoS Network Protection](manage-ddos-protection.md) must be enabled on a virtual network or [DDoS IP Protection (Preview)](manage-ddos-protection-powershell-ip.md) must be enabled on a public IP address.
30+
31+
## View alerts in Microsoft Defender for Cloud
32+
33+
1. Sign in to the [Azure portal](https://portal.azure.com/).
34+
1. In the search box at the top of the portal, enter **Microsoft Defender for Cloud**. Select **Microsoft Defender for Cloud** in the search results.
35+
1. Under *General* in the side tab, select **Security alerts**. To filter the alerts list, select your subscription, or any of the relevant filters. You can optionally add filters with the **Add filter** option.
36+
37+
:::image type="content" source="./media/manage-ddos-protection/ddos-protection-security-alerts.png" alt-text="Screenshot of Security alert in Microsoft Defender for Cloud.":::
38+
39+
The alerts include general information about the public IP address that’s under attack, geo and threat intelligence information, and remediation steps.
40+
41+
## Next steps
42+
43+
In this How-To, you learned how to view alerts in Microsoft Defender for Cloud.
44+
45+
To learn how to test and simulate a DDoS attack, see the simulation testing guide:
46+
47+
> [!div class="nextstepaction"]
48+
> [Test through simulations](test-through-simulations.md)
-4.13 KB
Loading

articles/machine-learning/how-to-manage-workspace.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ ms.custom: fasttrack-edit, FY21Q4-aml-seo-hack, contperf-fy21q4, sdkv2, event-ti
2121
> * [v1](v1/how-to-manage-workspace.md)
2222
> * [v2 (current)](how-to-manage-workspace.md)
2323
24-
In this article, you create, view, and delete [**Azure Machine Learning workspaces**](concept-workspace.md) for [Azure Machine Learning](overview-what-is-azure-machine-learning.md), using the [Azure portal](https://portal.azure.com) or the [SDK for Python](/python/api/overview/azure/ml/).
24+
In this article, you create, view, and delete [**Azure Machine Learning workspaces**](concept-workspace.md) for [Azure Machine Learning](overview-what-is-azure-machine-learning.md), using the [Azure portal](https://portal.azure.com) or the [SDK for Python](https://aka.ms/sdk-v2-install).
2525

2626
As your needs change or requirements for automation increase you can also manage workspaces [using the CLI](how-to-manage-workspace-cli.md), [Azure PowerShell](how-to-manage-workspace-powershell.md), or [via the VS Code extension](how-to-setup-vs-code.md).
2727

articles/machine-learning/how-to-run-jupyter-notebooks.md

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -172,12 +172,6 @@ Once you're connected to a compute instance, use the toolbar to run all cells in
172172

173173
Only you can see and use the compute instances you create. Your **User files** are stored separately from the VM and are shared among all compute instances in the workspace.
174174

175-
### View logs and output
176-
177-
Use [notebook widgets](/python/api/azureml-widgets/azureml.widgets) to view the progress of the run and logs. A widget is asynchronous and provides updates until training finishes. Azure Machine Learning widgets are also supported in Jupyter and JupterLab.
178-
179-
:::image type="content" source="media/how-to-run-jupyter-notebooks/jupyter-widget.png" alt-text="Screenshot: Jupyter notebook widget ":::
180-
181175
## Explore variables in the notebook
182176

183177
On the notebook toolbar, use the **Variable explorer** tool to show the name, type, length, and sample values for all variables that have been created in your notebook.

0 commit comments

Comments
 (0)