Skip to content

Commit b029950

Browse files
authored
Merge pull request #293383 from MicrosoftDocs/main
Publish to live, Wednesday 4AM PST, 1/22
2 parents d900c04 + 29897a7 commit b029950

File tree

11 files changed

+117
-34
lines changed

11 files changed

+117
-34
lines changed
Binary file not shown.

articles/active-directory-b2c/technical-overview.md

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -269,8 +269,6 @@ In an audit log, which is available for your Azure AD B2C tenant or for a partic
269269
* CRUD operations on B2C resources (for example, policies and identity providers)
270270
* Validation of user credentials and token issuance
271271

272-
:::image type="content" source="media/technical-overview/audit-log.png" alt-text="Individual user audit log shown in the Azure portal.":::
273-
274272
For more information on audit logs, see [Accessing Azure AD B2C audit logs](view-audit-logs.md).
275273

276274
## Usage analytics

articles/backup/azure-kubernetes-service-cluster-backup.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ For more information on supported scenarios, limitations, and availability, see
2929

3030
## Create a Backup vault
3131

32-
A Backup vault is a management entity that stores recovery points treated over time. A Backup vault also provides an interface to do the backup operations. Operations include taking on-demand backups, doing restores, and creating backup policies. AKS Backup requires the Backup vault and the AKS cluster to be in the same region. Learn [how to create a Backup vault](create-manage-backup-vault.md#create-a-backup-vault).
32+
A Backup vault is a management entity that stores recovery points treated over time. A Backup vault also provides an interface to do the backup operations. Operations include taking on-demand backups, doing restores, and creating backup policies. AKS Backup requires the Backup Vault and the AKS cluster to be located in the same region. However, they can reside in different subscriptions as long as they are within the same tenant. Learn [how to create a Backup vault](create-manage-backup-vault.md#create-a-backup-vault).
3333

3434
> [!NOTE]
3535
> A Backup vault is a new resource that's used to back up newly supported datasources. A Backup vault is different from a Recovery Services vault.

articles/backup/blob-backup-overview.md

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
title: Overview of Azure Blobs backup
33
description: Learn about Azure Blobs backup.
44
ms.topic: overview
5-
ms.date: 12/30/2024
5+
ms.date: 01/22/2025
66
ms.service: azure-backup
77
author: jyothisuri
88
ms.author: jsuri
@@ -55,7 +55,7 @@ Operational backup is configured and managed at the **storage account** level, a
5555

5656
When you configure backup for a storage account and assign a backup policy with a retention of ‘n’ days, the underlying properties are set as described below. You can view these properties in the **Data protection** tab of the blob service in your storage account.
5757

58-
- **Point-in-time restore**: Set to ‘n’ days, as defined in the backup policy. If the storage account already had point-in-time enabled with a retention of, say ‘x’ days, before configuring backup, the point-in-time restore duration will be set to the greater of the two values that is max(n,x). If you had already enabled point-in-time restore and specified the retention to be greater than that in the backup policy, it will remain unchanged.
58+
- **Point-in-time restore**: Set to ‘n’ days, as defined in the backup policy. If the storage account already had point-in-time enabled with a retention of, say ‘x’ days, before configuring backup, the point-in-time restore duration will be set to the greater of the two values that are max(n,x). If you had already enabled point-in-time restore and specified the retention to be greater than that in the backup policy, it will remain unchanged.
5959

6060
- **Soft delete**: Set to ‘n+5’ days, that is, five days in addition to the duration specified in the backup policy. If the storage account that is being configured for operational backup already had soft delete enabled with a retention of, say ‘y’ days, then the soft delete retention will be set to the maximum of the two values, that is, maximum (n+5, y). If you had already enabled soft delete and specified the retention to be greater than that according to the backup policy, it will remain unchanged.
6161

@@ -66,7 +66,8 @@ When you configure backup for a storage account and assign a backup policy with
6666
To allow Backup to enable these properties on the storage accounts to be protected, the Backup vault must be granted the **Storage Account Backup Contributor** role on the respective storage accounts.
6767

6868
>[!NOTE]
69-
>Operational backup supports operations on block blobs only and operations on containers can’t be restored. If you delete a container from the storage account by calling the **Delete Container** operation, that container can’t be restored with a restore operation. It’s suggested you enable soft delete to enhance data protection and recovery.
69+
>- The Operational backup can only be enabled along with vaulted backup.
70+
>- Operational backup supports operations on block blobs only and operations on containers can’t be restored. If you delete a container from the storage account by calling the **Delete Container** operation, that container can’t be restored with a restore operation. It’s suggested you enable soft delete to enhance data protection and recovery.
7071
7172
# [Vaulted backup](#tab/vaulted-backup)
7273

articles/backup/monitoring-and-alerts-overview.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -53,16 +53,16 @@ The following table summarizes the different backup alerts currently available v
5353

5454
| **Alert Category** | **Alert Name** | **Supported workload types / vault types** | **Description** |
5555
| ------------------ | ------------- | ------------------------------------------ | -------- |
56-
| Security | Delete Backup Data | - Microsoft Azure Virtual Machine <br><br> - SQL in Azure VM (non-AG scenarios) <br><br> - SAP HANA in Azure VM <br><br> - Azure Backup Agent <br><br> - DPM <br><br> - Azure Backup Server <br><br> - Azure Database for PostgreSQL Server <br><br> - Azure Blobs <br><br> - Azure Managed Disks | This alert is fired when you stop backup and deletes backup data. <br><br> **Note** <br> If you disable the soft delete feature for the vault, Delete Backup Data alert isn't received. |
56+
| Security | Delete Backup Data | - Microsoft Azure Virtual Machine <br><br> - SQL in Azure VM (non-AG scenarios) <br><br> - SAP HANA in Azure VM <br><br> - Azure Backup Agent <br><br> - DPM <br><br> - Azure Backup Server <br><br> - Azure Database for PostgreSQL Server <br><br> - Azure Blobs <br><br> - Azure Managed Disks<br><br> - Azure Kubernetes Service | This alert is fired when you stop backup and deletes backup data. <br><br> **Note** <br> If you disable the soft delete feature for the vault, Delete Backup Data alert isn't received. |
5757
| Security | Upcoming Purge | - Azure Virtual Machine <br><br> - SQL in Azure VM <br><br> - SAP HANA in Azure VM | For all workloads that support soft-delete, this alert is fired when the backup data for an item is 2 days away from being permanently purged by the Azure Backup service. |
5858
| Security | Purge Complete | - Azure Virtual Machine <br><br> - SQL in Azure VM <br><br> - SAP HANA in Azure VM | Delete Backup Data |
5959
| Security | Soft Delete Disabled for Vault | Recovery Services vaults | This alert is fired when the soft-deleted backup data for an item has been permanently deleted by the Azure Backup service. |
6060
| Security | Modify Policy with Shorter Retention | - Azure Virtual Machine <br><br> - SQL in Azure VM <br><br> - SAP HANA in Azure VM <br><br> - Azure Files | This alert is fired when a backup policy is modified to use lesser retention. |
6161
| Security | Modify Protection with Shorter Retention | - Azure Virtual Machine <br><br> - SQL in Azure VM <br><br> - SAP HANA in Azure VM <br><br> - Azure Files | This alert is fired when a backup instance is assigned to a different policy with lesser retention. |
6262
| Security | MUA Disabled | Recovery Services vaults | This alert is fired when a user disables MUA functionality for vault. |
6363
| Security | Disable hybrid security features | Recovery Services vaults | This alert is fired when hybrid security settings are disabled for a vault. |
64-
| Jobs | Backup Failure | - Azure Virtual Machine <br><br> - SQL in Azure VM <br><br> - SAP HANA in Azure VM <br><br> - Azure Backup Agent <br><br> - Azure Files <br><br> - Azure Database for PostgreSQL Server <br><br> - Azure Managed Disks | This alert is fired when a backup job failure has occurred. By default, alerts for backup failures are turned on. For more information, see the [section on turning on alerts for this scenario](backup-azure-monitoring-alerts.md#turn-on-azure-monitor-alerts-for-job-failure-scenarios). |
65-
| Jobs | Restore Failure | - Azure Virtual Machine <br><br> - SQL in Azure VM (non-AG scenarios) <br><br> - SAP HANA in Azure VM <br><br> - Azure Backup Agent <br><br> - Azure Files <br><br> - Azure Database for PostgreSQL Server <br><br> - Azure Blobs <br><br> - Azure Managed Disks | This alert is fired when a restore job failure has occurred. By default, alerts for restore failures are turned on. For more information, see the [section on turning on alerts for this scenario](backup-azure-monitoring-alerts.md#turn-on-azure-monitor-alerts-for-job-failure-scenarios). |
64+
| Jobs | Backup Failure | - Azure Virtual Machine <br><br> - SQL in Azure VM <br><br> - SAP HANA in Azure VM <br><br> - Azure Backup Agent <br><br> - Azure Files <br><br> - Azure Database for PostgreSQL Server <br><br> - Azure Managed Disks <br><br> - Azure Kubernetes Service | This alert is fired when a backup job failure has occurred. By default, alerts for backup failures are turned on. For more information, see the [section on turning on alerts for this scenario](backup-azure-monitoring-alerts.md#turn-on-azure-monitor-alerts-for-job-failure-scenarios). |
65+
| Jobs | Restore Failure | - Azure Virtual Machine <br><br> - SQL in Azure VM (non-AG scenarios) <br><br> - SAP HANA in Azure VM <br><br> - Azure Backup Agent <br><br> - Azure Files <br><br> - Azure Database for PostgreSQL Server <br><br> - Azure Blobs <br><br> - Azure Managed Disks <br><br> - Azure Kubernetes Service | This alert is fired when a restore job failure has occurred. By default, alerts for restore failures are turned on. For more information, see the [section on turning on alerts for this scenario](backup-azure-monitoring-alerts.md#turn-on-azure-monitor-alerts-for-job-failure-scenarios). |
6666
| Jobs | Unsupported backup type | - SQL in Azure VM <br><br> - SAP HANA in Azure VM | This alert is fired when the current settings for a database don't support certain backup types present in the policy. By default, alerts for unsupported backup type scenario are turned on. For more information, see the [section on turning on alerts for this scenario](backup-azure-monitoring-alerts.md#turn-on-azure-monitor-alerts-for-job-failure-scenarios). |
6767
| Jobs | Workload extension unhealthy | - SQL in Azure VM <br><br> - SAP HANA in Azure VM | This alert is fired when the Azure Backup workload extension for database backups is in an unhealthy state that might prevent future backups from succeeding. By default, alerts for workload extension unhealthy scenario are turned on. For more information, see the [section on turning on alerts for this scenario](backup-azure-monitoring-alerts.md#turn-on-azure-monitor-alerts-for-job-failure-scenarios). |
6868

articles/partner-solutions/apache-kafka-confluent-cloud/overview.md

Lines changed: 16 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,19 @@
11
---
2-
title: Apache Kafka & Apache Flink on Confluent Cloud - An Azure Native ISV Service overview
3-
description: Learn about using Apache Kafka & Apache Flink on Confluent Cloud in the Azure Marketplace.
2+
title: Apache Kafka & Apache Flink on Confluent Cloud overview
3+
description: Learn about using Apache Kafka & Apache Flink on Confluent Cloud in Azure Marketplace.
44
ms.topic: overview
5-
ms.date: 1/31/2024
5+
ms.date: 01/22/2025
66
---
77

8-
# What is Apache Kafka & Apache Flink on Confluent Cloud - An Azure Native ISV Service?
8+
# What is Apache Kafka & Apache Flink on Confluent Cloud?
99

10-
Azure Native ISV Services enable you to easily provision, manage, and tightly integrate independent software vendor (ISV) software and services on Azure. This Azure Native ISV Service is developed and managed by Microsoft and Confluent.
10+
[!INCLUDE [what-is](../includes/what-is.md)]
1111

12-
You can find Apache Kafka® & Apache Flink® on Confluent Cloud™ - An Azure Native ISV Service in the [Azure portal](https://portal.azure.com/#view/HubsExtension/BrowseResource/resourceType/Microsoft.Confluent%2Forganizations) or get it on [Azure Marketplace](https://azuremarketplace.microsoft.com/marketplace/apps/confluentinc.confluent-cloud-azure-prod?tab=Overview).
12+
Microsoft and Confluent Cloud developed this service and manage it together.
1313

14-
Apache Kafka & Apache Flink on Confluent Cloud - An Azure Native ISV Service is an Azure Marketplace offering that provides Apache Kafka and Apache Flink as a managed service. It's fully managed so you can focus on building your applications rather than managing the clusters.
14+
You can find Apache Kafka® & Apache Flink® on Confluent Cloud™ in the [Azure portal](https://portal.azure.com/#view/HubsExtension/BrowseResource/resourceType/Microsoft.Confluent%2Forganizations) or get it on [Azure Marketplace](https://azuremarketplace.microsoft.com/marketplace/apps/confluentinc.confluent-cloud-azure-prod?tab=Overview).
15+
16+
Apache Kafka & Apache Flink on Confluent Cloud is an Azure Marketplace offering that provides Apache Kafka and Apache Flink as a fully managed service so you can focus on building your applications rather than managing the clusters.
1517

1618
To reduce the burden of cross-platform management, Microsoft partnered with Confluent Cloud to build an integrated provisioning layer from Azure to Confluent Cloud. It provides a consolidated experience for using Confluent Cloud on Azure. You can easily integrate and manage Confluent Cloud with your Azure applications.
1719

@@ -36,7 +38,7 @@ Each Azure subscription can contain multiple Confluent plans. Each Confluent pla
3638

3739
When you provision a Confluent Cloud resource in Azure, you get a Confluent organization ID, default environment, and user account. For more information, see [QuickStart: Get started with Confluent Cloud on Azure](create.md).
3840

39-
For billing, each Confluent Cloud offer purchased in the Marketplace maps to a unique Confluent organization.
41+
Each Confluent Cloud offer purchased in the Marketplace maps to a unique Confluent organization for billing.
4042

4143
## Single sign-on
4244

@@ -53,13 +55,12 @@ There are two billing options available: pay-as-you-go monthly plan and commitme
5355

5456
You decide which billing option to use when you create the service.
5557

56-
## Next steps
58+
## Subscribe to Confluent Cloud
5759

58-
- To create an instance of Apache Kafka & Apache Flink on Confluent Cloud, see [QuickStart: Get started with Confluent Cloud on Azure](create.md).
59-
- Get started with Apache Kafka on Confluent Cloud - An Azure Native ISV Service on
60+
[!INCLUDE [subscribe](../includes/subscribe.md)] *Apache Kafka and Apache Flink on Confluent Cloud*.
6061

61-
> [!div class="nextstepaction"]
62-
> [Azure portal](https://portal.azure.com/#view/HubsExtension/BrowseResource/resourceType/Microsoft.Confluent%2Forganizations)
62+
[!INCLUDE [subscribe](../includes/subscribe-from-azure-portal.md)]
63+
64+
## Next steps
6365

64-
> [!div class="nextstepaction"]
65-
> [Azure Marketplace](https://azuremarketplace.microsoft.com/marketplace/apps/confluentinc.confluent-cloud-azure-prod?tab=Overview)
66+
- [QuickStart: Get started with Apache Kafka & Apache Flink on Confluent Cloud](create.md)

articles/sentinel/TOC.yml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1145,6 +1145,8 @@
11451145
href: sentinel-integration-guide.md
11461146
- name: Partner integrations best practices
11471147
href: partner-integrations.md
1148+
- name: Creating Workbooks
1149+
href: sentinel-workbook-creation.md
11481150
- name: Publish solutions
11491151
href: publish-sentinel-solutions.md
11501152
- name: Solution lifecycle post publish

articles/sentinel/connect-microsoft-365-defender.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,7 @@ To ingest and synchronize Microsoft Defender XDR incidents with all their alerts
6666

6767
```kusto
6868
SecurityIncident
69-
| where ProviderName == "Microsoft 365 Defender"
69+
| where ProviderName == "Microsoft Defender XDR"
7070
```
7171

7272
When you enable the Microsoft Defender XDR connector, any Microsoft Defender components’ connectors that were previously connected are automatically disconnected in the background. Although they continue to *appear* connected, no data flows through them.
@@ -153,7 +153,7 @@ let Now = now();
153153
| extend Count = 0
154154
| union isfuzzy=true (
155155
SecurityIncident
156-
| where ProviderName == "Microsoft 365 Defender"
156+
| where ProviderName == "Microsoft Defender XDR"
157157
| summarize Count = count() by bin_at(TimeGenerated, 1d, Now)
158158
)
159159
| summarize Count=max(Count) by bin_at(TimeGenerated, 1d, Now)
45.4 KB
Loading

0 commit comments

Comments
 (0)