Skip to content

Commit f9852c8

Browse files
authored
Merge branch 'MicrosoftDocs:main' into main
2 parents 3c24581 + 4f4c01f commit f9852c8

27 files changed

+296
-166
lines changed

articles/backup/soft-delete-azure-backup-faq.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,16 +4,16 @@ metadata:
44
description: Answers to common questions about the security feature - soft delete.
55
ms.topic: faq
66
ms.service: azure-backup
7-
ms.date: 01/05/2024
7+
ms.date: 01/31/2025
88
author: jyothisuri
99
ms.author: jsuri
1010

1111
title: Frequently asked questions - Soft delete
12-
summary: This article answers common questions about soft delete.
12+
summary: This article answers common questions about soft delete on vaults to perform backup operations.
1313

1414

1515
sections:
16-
- name: Manage soft delete
16+
- name: Commonly asked questions
1717
questions:
1818
- question: |
1919
Do I need to enable the soft delete feature on every vault?

articles/frontdoor/private-link.md

Lines changed: 34 additions & 35 deletions
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,40 @@ Once your request is approved, a private IP address gets assigned from the Azure
3131

3232
:::image type="content" source="./media/private-link/enable-private-endpoint.png" alt-text="Screenshot of enable Private Link service checkbox from origin configuration page.":::
3333

34+
## Supported origins
35+
36+
Origin support for direct private endpoint connectivity is currently limited to:
37+
* Blob Storage
38+
* Web App
39+
* Internal load balancers, or any services that expose internal load balancers such as Azure Kubernetes Service, Azure Container Apps or Azure Red Hat OpenShift
40+
* Storage Static Website
41+
* Application Gateway (Public Preview. Don't use in production environments)
42+
* API Management (Public Preview. Don't use in production environments)
43+
* Azure Container Apps (Public Preview. Don't use in production environments)
44+
45+
> [!NOTE]
46+
> * This feature isn't supported with Azure App Service Slots or Functions.
47+
48+
## Region availability
49+
50+
Azure Front Door private link is available in the following regions:
51+
52+
| Americas | Europe | Africa | Asia Pacific |
53+
|--|--|--|--|
54+
| Brazil South | France Central | South Africa North | Australia East |
55+
| Canada Central | Germany West Central | | Central India |
56+
| Central US | North Europe | | Japan East |
57+
| East US | Norway East | | Korea Central |
58+
| East US 2 | UK South | | East Asia |
59+
| South Central US | West Europe | | South East Asia |
60+
| West US 2 | Sweden Central | | |
61+
| West US 3 | | | |
62+
| US Gov Arizona | | | |
63+
| US Gov Texas | | | |
64+
| US Gov Virginia | | | |
65+
66+
The Azure Front Door Private Link feature is region agnostic but for the best latency, you should always pick an Azure region closest to your origin when choosing to enable Azure Front Door Private Link endpoint. If your origin's region is not supported in the list of regions AFD Private Link supports, pick the next nearest region. You can use [Azure network round-trip latency statistics](../networking/azure-network-latency.md) to determine the next nearest region in terms of latency.
67+
3468
## Association of a private endpoint with an Azure Front Door profile
3569

3670
### Private endpoint creation
@@ -88,41 +122,6 @@ If AFD-Profile-1 gets deleted, then the PE1 private endpoint across all the orig
88122
* If AFD-Profile-4 gets deleted, only PE7 is removed.
89123
* If AFD-Profile-5 gets deleted, only PE8 is removed.
90124

91-
## Region availability
92-
93-
Azure Front Door private link is available in the following regions:
94-
95-
| Americas | Europe | Africa | Asia Pacific |
96-
|--|--|--|--|
97-
| Brazil South | France Central | South Africa North | Australia East |
98-
| Canada Central | Germany West Central | | Central India |
99-
| Central US | North Europe | | Japan East |
100-
| East US | Norway East | | Korea Central |
101-
| East US 2 | UK South | | East Asia |
102-
| South Central US | West Europe | | South East Asia |
103-
| West US 2 | Sweden Central | | |
104-
| West US 3 | | | |
105-
| US Gov Arizona | | | |
106-
| US Gov Texas | | | |
107-
| US Gov Virginia | | | |
108-
109-
110-
## Limitations
111-
112-
Origin support for direct private endpoint connectivity is currently limited to:
113-
* Blob Storage
114-
* Web App
115-
* Internal load balancers, or any services that expose internal load balancers such as Azure Kubernetes Service, Azure Container Apps or Azure Red Hat OpenShift
116-
* Storage Static Website
117-
* Application Gateway (Public Preview. Don't use in production environments)
118-
* API Management (Public Preview. Don't use in production environments)
119-
* Azure Container Apps (Public Preview. Don't use in production environments)
120-
121-
> [!NOTE]
122-
> * This feature isn't supported with Azure App Service Slots or Functions.
123-
124-
The Azure Front Door Private Link feature is region agnostic but for the best latency, you should always pick an Azure region closest to your origin when choosing to enable Azure Front Door Private Link endpoint. If your origin's region is not supported in the list of regions AFD Private Link supports, pick the next nearest region. You can use [Azure network round-trip latency statistics](../networking/azure-network-latency.md) to determine the next nearest region in terms of latency.
125-
126125
## Next steps
127126

128127
* Learn how to [connect Azure Front Door Premium to a Web App origin with Private Link](standard-premium/how-to-enable-private-link-web-app.md).

articles/iot/tutorial-iot-industrial-solution-architecture.md

Lines changed: 12 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -271,7 +271,7 @@ To create an Azure Managed Grafana service, and configure it with permissions to
271271

272272
1. To grant permission for the managed identity to access the ontologies database in Azure Data Explorer:
273273

274-
1. Navigate to the **Permissions** blade of the ontologies database in your Azure Data Explorer instance in the Azure portal.
274+
1. Navigate to the **Permissions** blade in your Azure Data Explorer instance in the Azure portal.
275275
1. Select **Add > AllDatabasesViewer**.
276276
1. Search for and select the **Object (principal) ID** value, you made a note of previously.
277277

@@ -299,7 +299,17 @@ Now you're ready to import the sample dashboard.
299299

300300
1. Select **Upload dashboard JSON file** and select the *samplegrafanadashboard.json* file that you downloaded previously. Select **Import**.
301301

302-
1. For each of the panels in the dashboard, select **Edit** and then select the **Data source** you setup previously.
302+
1. On the **OEE Station** panel, select **Edit** and then select the Azure Data Explorer **Data source** you setup previously. Then select **KQL** in the query panel and add the following query: `print round (CalculateOEEForStation('${Station}', '${Location}', '${CycleTime}', '${__from:date:iso}', '${__to:date:iso}') * 100, 2)`. Select **Apply** to apply your changes and go back to the dashboard.
303+
304+
1. On the **OEE Line** panel, select **Edit** and then select the Azure Data Explorer **Data source** you setup previously. Then select **KQL** in the query panel and add the following query: `print round(CalculateOEEForLine('${Location}', '${CycleTime}', '${__from:date:iso}', '${__to:date:iso}') * 100, 2)`. Select **Apply** to apply your changes and go back to the dashboard.
305+
306+
1. On the **Discarded products** panel, select **Edit** and then select the Azure Data Explorer **Data source** you setup previously. Then select **KQL** in the query panel and add the following query: `opcua_metadata_lkv| where Name contains '${Station}'| where Name contains '${Location}'| join kind=inner (opcua_telemetry| where Name == "NumberOfDiscardedProducts"| where Timestamp > todatetime('${__from:date:iso}') and Timestamp < todatetime('${__to:date:iso}')) on DataSetWriterID| extend numProd = toint(Value)| summarize max(numProd)`. Select **Apply** to apply your changes and go back to the dashboard.
307+
308+
1. On the **Manufactured products** panel, select **Edit** and then select the Azure Data Explorer **Data source** you setup previously. Then select **KQL** in the query panel and add the following query: `opcua_metadata_lkv| where Name contains '${Station}'| where Name contains '${Location}'| join kind=inner (opcua_telemetry| where Name == "NumberOfManufacturedProducts"| where Timestamp > todatetime('${__from:date:iso}') and Timestamp < todatetime('${__to:date:iso}')) on DataSetWriterID| extend numProd = toint(Value)| summarize max(numProd)`. Select **Apply** to apply your changes and go back to the dashboard.
309+
310+
1. On the **Energy Consumption** panel, select **Edit** and then select the Azure Data Explorer **Data source** you setup previously. Then select **KQL** in the query panel and add the following query: `opcua_metadata_lkv| where Name contains '${Station}'| where Name contains '${Location}'| join kind=inner (opcua_telemetry | where Name == "Pressure" | where Timestamp > todatetime('${__from:date:iso}') and Timestamp < todatetime('${__to:date:iso}')) on DataSetWriterID| extend energy = todouble(Value)| summarize avg(energy)); print round(toscalar(averageEnergyConsumption) * 1000, 2)`. Select **Apply** to apply your changes and go back to the dashboard.
311+
312+
1. On the **Pressure** panel, select **Edit** and then select the Azure Data Explorer **Data source** you setup previously. Then select **KQL** in the query panel and add the following query: `opcua_metadata_lkv| where Name contains '${Station}'| where Name contains '${Location}'| join kind=inner (opcua_telemetry | where Name == "Pressure" | where Timestamp > todatetime('${__from:date:iso}') and Timestamp < todatetime('${__to:date:iso}')) on DataSetWriterID| extend NodeValue = toint(Value)| project Timestamp1, NodeValue`. Select **Apply** to apply your changes and go back to the dashboard.
303313

304314
### Configure alerts
305315

articles/sentinel/TOC.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -790,7 +790,7 @@
790790
href: connect-threat-intelligence-taxii.md
791791
- name: Add threat intelligence in bulk by file
792792
href: indicators-bulk-file-import.md
793-
- name: Work with threat indicators
793+
- name: Work with threat intelligence
794794
href: work-with-threat-indicators.md
795795
- name: Add entity to threat indicators
796796
href: add-entity-to-threat-intelligence.md

articles/sentinel/add-entity-to-threat-intelligence.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ During an investigation, you examine entities and their context as an important
1919

2020
For example, you might discover an IP address that performs port scans across your network or functions as a command and control node by sending and/or receiving transmissions from large numbers of nodes in your network.
2121

22-
With Microsoft Sentinel, you can flag these types of entities from within your incident investigation and add them to your threat intelligence. You can view the added indicators in **Logs** and **Threat Intelligence** and use them across your Microsoft Sentinel workspace.
22+
With Microsoft Sentinel, you can flag these types of entities from within your incident investigation and add them to your threat intelligence. You can view the added indicators by querying them or searching for them in the threat intelligence management interface and use them across your Microsoft Sentinel workspace.
2323

2424
## Add an entity to your threat intelligence
2525

@@ -129,7 +129,7 @@ Whichever of the two interfaces you choose, you end up here.
129129

130130
1. When all the fields are filled in to your satisfaction, select **Apply**. A message appears in the upper-right corner to confirm that your indicator was created.
131131

132-
1. The entity is added as a threat indicator in your workspace. You can find it [in the list of indicators on the Threat intelligence page](work-with-threat-indicators.md#find-and-view-your-indicators-on-the-threat-intelligence-page). You can also find it [in the ThreatIntelligenceIndicators table in Logs](work-with-threat-indicators.md#find-and-view-your-indicators-in-logs).
132+
1. The entity is added as threat intelligence in your workspace. You can find it [in threat intelligence management interface](work-with-threat-indicators.md#view-your-threat-intelligence-in-the-management-interface). You can also query it [using the ThreatIntelligenceIndicators table](work-with-threat-indicators.md#find-and-view-your-indicators-with-queries).
133133

134134
## Related content
135135

articles/sentinel/connect-mdti-data-connector.md

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ appliesto:
1313
ms.collection: usx-security
1414

1515

16-
#Customer intent: As a security administrator, I want to enable the data connector for Microsoft Defender Threat Intelligence so that I can ingest high fidelity indicators of compromise into my Microsoft Sentinel workspace for enhanced threat monitoring and response.
16+
#Customer intent: As a security administrator, I want to enable the data connector for Microsoft Defender Threat Intelligence so that I can ingest high fidelity threat intelligence into my Microsoft Sentinel workspace for enhanced threat monitoring and response.
1717

1818
---
1919

@@ -23,7 +23,7 @@ Bring public, open-source and high-fidelity indicators of compromise (IOCs) gene
2323

2424
> [!INCLUDE [unified-soc-preview-without-alert](includes/unified-soc-preview-without-alert.md)]
2525
26-
For more information about the benefits of the standard and premium Defender Threat Intelligence data connectors, see [Understand threat intelligence](understand-threat-intelligence.md#add-threat-indicators-to-microsoft-sentinel-with-the-defender-threat-intelligence-data-connector).
26+
For more information about the benefits of the standard and premium Defender Threat Intelligence data connectors, see [Understand threat intelligence](understand-threat-intelligence.md#add-threat-intelligence-to-microsoft-sentinel-with-the-defender-threat-intelligence-data-connector).
2727

2828
## Prerequisites
2929

@@ -35,7 +35,7 @@ For more information on how to get a premium license and explore all the differe
3535

3636
## Install the threat intelligence solution in Microsoft Sentinel
3737

38-
To import threat indicators into Microsoft Sentinel from standard and premium Defender Threat Intelligence, follow these steps:
38+
To import threat intelligence into Microsoft Sentinel from standard and premium Defender Threat Intelligence, follow these steps:
3939

4040
1. For Microsoft Sentinel in the [Azure portal](https://portal.azure.com), under **Content management**, select **Content hub**.
4141

@@ -59,11 +59,11 @@ For more information about how to manage the solution components, see [Discover
5959

6060
:::image type="content" source="media/connect-mdti-data-connector/premium-connect.png" alt-text="Screenshot that shows the Defender Threat Intelligence Data connector page and the Connect button." lightbox="media/connect-mdti-data-connector/premium-connect.png":::
6161

62-
1. When Defender Threat Intelligence indicators start populating the Microsoft Sentinel workspace, the connector status displays **Connected**.
62+
1. When Defender Threat Intelligence starts populating the Microsoft Sentinel workspace, the connector status displays **Connected**.
6363

64-
At this point, the ingested indicators are now available for use in the `TI map...` analytics rules. For more information, see [Use threat indicators in analytics rules](use-threat-indicators-in-analytics-rules.md).
64+
At this point, the ingested intelligence is now available for use in the `TI map...` analytics rules. For more information, see [Use threat indicators in analytics rules](use-threat-indicators-in-analytics-rules.md).
6565

66-
Find the new indicators on the **Threat intelligence** pane or directly in **Logs** by querying the `ThreatIntelligenceIndicator` table. For more information, see [Work with threat indicators](work-with-threat-indicators.md).
66+
Find the new intelligence in the management interface or directly in **Logs** by querying the `ThreatIntelligenceIndicator` table. For more information, see [Work with threat intelligence](work-with-threat-indicators.md).
6767

6868
## Related content
6969

articles/sentinel/connect-threat-intelligence-upload-api.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ Many organizations use threat intelligence platform (TIP) solutions to aggregate
2020

2121
The upload API ingests threat intelligence into Microsoft Sentinel without the need for a data connector. This article describes what you need to connect. For more information on the API details, see the reference document [Microsoft Sentinel upload API](stix-objects-api.md).
2222

23-
:::image type="content" source="media/connect-threat-intelligence-upload-api/threat-intel-stix-objects-api.png" alt-text="Screenshot that shows the threat intelligence import path.":::
23+
:::image type="content" source="media/connect-threat-intelligence-upload-api/threat-intel-upload-api.png" alt-text="Screenshot that shows the threat intelligence import path.":::
2424

2525
For more information about threat intelligence, see [Threat intelligence](understand-threat-intelligence.md).
2626

articles/sentinel/indicators-bulk-file-import.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,7 @@ The templates provide all the fields you need to create a single valid indicator
6969

7070
1. Drag your bulk threat intelligence file to the **Upload a file** section, or browse for the file by using the link.
7171

72-
1. Enter a source for the threat intelligence in the **Source** text box. This value is stamped on all the indicators included in that file. View this property as the `SourceSystem` field. The source is also displayed in the **Manage file imports** pane. For more information, see [Work with threat indicators](work-with-threat-indicators.md#find-and-view-your-indicators-in-logs).
72+
1. Enter a source for the threat intelligence in the **Source** text box. This value is stamped on all the indicators included in that file. View this property as the `SourceSystem` field. The source is also displayed in the **Manage file imports** pane. For more information, see [Work with threat indicators](work-with-threat-indicators.md#find-and-view-your-indicators-with-queries).
7373

7474
1. Choose how you want Microsoft Sentinel to handle invalid entries by selecting one of the buttons at the bottom of the **Import using a file** pane:
7575

@@ -153,7 +153,7 @@ Here's an example `ipv4-addr` indicator and `attack-pattern` using the JSON file
153153
"name": "Sample IPv4 indicator",
154154
"description": "This indicator implements an observation expression.",
155155
"indicator_types": [
156-
"anonymization",
156+
"anonymization",
157157
"malicious-activity"
158158
],
159159
"kill_chain_phases": [
3.25 KB
Loading

0 commit comments

Comments
 (0)