You signed in with another tab or window. Reload to refresh your session.You signed out in another tab or window. Reload to refresh your session.You switched accounts on another tab or window. Reload to refresh your session.Dismiss alert
Copy file name to clipboardExpand all lines: articles/azure-arc/system-center-virtual-machine-manager/disaster-recovery.md
+9-17Lines changed: 9 additions & 17 deletions
Display the source diff
Display the rich diff
Original file line number
Diff line number
Diff line change
@@ -3,7 +3,7 @@ title: Recover from accidental deletion of resource bridge VM
3
3
description: Learn how to perform recovery operations for the Azure Arc resource bridge VM in Azure Arc-enabled System Center Virtual Machine Manager disaster scenarios.
4
4
ms.topic: how-to
5
5
ms.custom:
6
-
ms.date: 12/06/2023
6
+
ms.date: 12/28/2023
7
7
ms.services: azure-arc
8
8
ms.subservice: azure-arc-scvmm
9
9
author: Farha-Bano
@@ -27,12 +27,14 @@ To recover from Arc resource bridge VM deletion, you need to deploy a new resour
27
27
> DHCP-based Arc Resource Bridge deployment is no longer supported.<br><br>
28
28
If you had deployed Arc Resource Bridge earlier using DHCP, you must clean up your deployment by removing your resources from Azure and do a [fresh onboarding](./quickstart-connect-system-center-virtual-machine-manager-to-arc.md).
29
29
30
-
1. Copy the Azure region and resource IDs of the Arc resource bridge, custom location, and SCVMM Azure resources.
30
+
### Recover Arc resource bridge from a Windows machine
31
31
32
-
2. Download the [onboarding script](/azure/azure-arc/system-center-virtual-machine-manager/quickstart-connect-system-center-virtual-machine-manager-to-arc#download-the-onboarding-script) from the Azure portal and update the following section in the script, using the same information as the original resources in Azure.
32
+
1. Copy the Azure region and resource IDs of the Arc resource bridge, custom location, and SCVMM management server Azure resources.
33
+
34
+
2. Download [this script](https://download.microsoft.com/download/a/a/8/aa8687e4-1a30-485f-9de4-4f15fc576724/arcvmm-windows-dr.ps1) and update the following section in the script using the same information as the original resources in Azure.
33
35
34
36
```powershell
35
-
$location = <Azure region of the resources>
37
+
$location = <Azure region of the original Arc resource bridge>
3. Run the updated script from the same location where the config YAML files are stored after the initial onboarding. This is most likely the same folder from where you ran the initial onboarding script unless the config files were moved later to a different location. [Provide the inputs](quickstart-connect-system-center-virtual-machine-manager-to-arc.md#script-runtime) as prompted.
48
52
49
-
3. [Run the onboarding script](/azure/azure-arc/system-center-virtual-machine-manager/quickstart-connect-system-center-virtual-machine-manager-to-arc#download-the-onboarding-script) again with the `-Force` parameter.
50
-
51
-
``` powershell-interactive
52
-
./resource-bridge-onboarding-script.ps1 -Force
53
-
```
54
-
55
-
4. [Provide the inputs](/azure/azure-arc/system-center-virtual-machine-manager/quickstart-connect-system-center-virtual-machine-manager-to-arc#script-runtime) as prompted.
56
-
57
-
5. In the same machine, run the following scripts, as applicable:
58
-
- [Download the script](https://download.microsoft.com/download/6/b/4/6b4a5009-fed8-46c2-b22b-b24a4d0a06e3/arcvmm-appliance-dr.ps1) if you're running the script from a Windows machine
59
-
- [Download the script](https://download.microsoft.com/download/0/5/c/05c2bcb8-87f8-4ead-9757-a87a0759071c/arcvmm-appliance-dr.sh) if you're running the script from a Linux machine
60
-
61
-
6. Once the script is run successfully, the old Resource Bridge is recovered and the connection is re-established to the existing Azure-enabled SCVMM resources.
53
+
4. Once the script is run successfully, the old Resource Bridge is recovered, and the connection is re-established to the existing Azure-enabled SCVMM resources.
|Configuration access endpoint | The endpoint from which Azure Monitor Agent retrieves data collection rules (DCRs).<br>Example: `<unique-dce-identifier>.<regionname>-1.handler.control`. |Same region as the monitored resources. |Set on the **Basics** tab when you create a data collection rule using the portal. |
30
-
|Logs ingestion endpoint | The endpoint that ingests logs into the data ingestion pipeline. Azure Monitor transforms the data and sends it to the defined destination Log Analytics workspace and table based on a DCR ID sent with the collected data.<br>Example: `<unique-dce-identifier>.<regionname>-1.ingest`. |Same region as the destination Log Analytics workspace. |Set on the **Resources** tab when you create a data collection rule using the portal.|
29
+
|Logs ingestion endpoint | The endpoint that ingests logs into the data ingestion pipeline. Azure Monitor transforms the data and sends it to the defined destination Log Analytics workspace and table based on a DCR ID sent with the collected data.<br>Example: `<unique-dce-identifier>.<regionname>-1.ingest`. |Same region as the destination Log Analytics workspace. |Set on the **Basics** tab when you create a data collection rule using the portal. |
30
+
|Configuration access endpoint | The endpoint from which Azure Monitor Agent retrieves data collection rules (DCRs).<br>Example: `<unique-dce-identifier>.<regionname>-1.handler.control`. |Same region as the monitored resources. |Set on the **Resources** tab when you create a data collection rule using the portal.|
31
31
32
32
33
33
## How to set up data collection endpoints based on your deployment
Copy file name to clipboardExpand all lines: articles/azure-monitor/logs/ingest-logs-event-hub.md
+1-1Lines changed: 1 addition & 1 deletion
Display the source diff
Display the rich diff
Original file line number
Diff line number
Diff line change
@@ -6,7 +6,7 @@ author: guywi-ms
6
6
ms.author: guywild
7
7
ms.reviewer: ilanawaitser
8
8
ms.topic: tutorial
9
-
ms.date: 09/20/2022
9
+
ms.date: 12/28/2023
10
10
ms.custom: references_regions
11
11
12
12
# customer-intent: As a DevOps engineer, I want to ingest data from an event hub into a Log Analytics workspace so that I can monitor logs that I send to Azure Event Hubs.
[30-day Free Trial without Azure subscription](https://azure.microsoft.com/try/cosmosdb/)
78
+
79
+
[90-day Free Trial with Azure AI Advantage](ai-advantage.md)
80
+
81
+
> [!div class="nextstepaction"]
82
+
> [Use the Azure Cosmos DB lifetime free tier](free-tier.md)
74
83
75
84
## Vector database related concepts
76
85
@@ -112,12 +121,3 @@ The process of creating good prompts for a scenario is called prompt engineering
112
121
### Tokens
113
122
114
123
Tokens are small chunks of text generated by splitting the input text into smaller segments. These segments can either be words or groups of characters, varying in length from a single character to an entire word. For instance, the word hamburger would be divided into tokens such as ham, bur, and ger while a short and common word like pear would be considered a single token. LLMs like ChatGPT, GPT-3.5, or GPT-4 break words into tokens for processing.
115
-
116
-
## Next step
117
-
118
-
[30-day Free Trial without Azure subscription](https://azure.microsoft.com/try/cosmosdb/)
119
-
120
-
[90-day Free Trial with Azure AI Advantage](ai-advantage.md)
121
-
122
-
> [!div class="nextstepaction"]
123
-
> [Use the Azure Cosmos DB lifetime free tier](free-tier.md)
- Defender for Servers Plan 2 – **Security solution**
80
80
81
-
### Other extensions for Defender for Cloud
82
-
83
-
The Azure Monitor Agent requires more extensions. The ASA extension, which supports endpoint protection recommendations, fileless attack detection, and Adaptive Application controls, is automatically installed when you autoprovision the Azure Monitor Agent.
84
-
85
81
### Other security events collection
86
82
87
-
When you autoprovision the Log Analytics agent in Defender for Cloud, you can choose to collect other security events to the workspace. When you autoprovision the Azure Monitor agent in Defender for Cloud, the option to collect other security events to the workspace isn't available. Defender for Cloud doesn't rely on these security events, but they can be helpful for investigations through Microsoft Sentinel.
88
-
89
-
If you want to collect security events when you autoprovision the Azure Monitor Agent, you can create a [Data Collection Rule](../azure-monitor/essentials/data-collection-rule-overview.md) to collect the required events. Learn [how do it with PowerShell or with Azure Policy](https://techcommunity.microsoft.com/t5/microsoft-defender-for-cloud/how-to-configure-security-events-collection-with-azure-monitor/ba-p/3770719).
83
+
When you autoprovision the Log Analytics agent in Defender for Cloud, you can choose to collect other security events to the workspace.
90
84
91
-
As in Log Analytics workspaces, Defender for Cloud users are eligible for [500 MB of free data](faq-defender-for-servers.yml) daily on defined data types that include security events.
85
+
As in Log Analytics workspaces, Defender for Servers Plan 2 users are eligible for [500 MB of free data](faq-defender-for-servers.yml) daily on defined data types that include security events.
92
86
93
87
## Next steps
94
88
95
-
Now that you enabled the Azure Monitor Agent, check out the features that are supported by the agent:
89
+
Now that you enabled the Log Analytics agent, check out the features that are supported by the agent:
Copy file name to clipboardExpand all lines: articles/defender-for-cloud/plan-defender-for-servers-select-plan.md
+1-1Lines changed: 1 addition & 1 deletion
Display the source diff
Display the rich diff
Original file line number
Diff line number
Diff line change
@@ -51,7 +51,7 @@ You can choose from two paid plans:
51
51
|**Defender for Endpoint provisioning**| Defender for Servers automatically provisions the Defender for Endpoint sensor on every supported machine that's connected to Defender for Cloud.| :::image type="icon" source="./media/icons/yes-icon.png"::: | :::image type="icon" source="./media/icons/yes-icon.png"::: |
52
52
|**Unified view**| Alerts from Defender for Endpoint appear in the Defender for Cloud portal. You can get detailed information in the Defender for Endpoint portal.| :::image type="icon" source="./media/icons/yes-icon.png"::: | :::image type="icon" source="./media/icons/yes-icon.png"::: |
53
53
|**Threat detection for OS-level (agent-based)**| Defender for Servers and Defender for Endpoint detect threats at the OS level, including virtual machine behavioral detections and *fileless attack detection*, which generates detailed security alerts that accelerate alert triage, correlation, and downstream response time.<br><br />[Learn more about alerts for Windows machines](alerts-reference.md#alerts-windows)<br /><br />[Learn more about alerts for Linux machines](alerts-reference.md#alerts-linux)<br /><br /><br />[Learn more about alerts for DNS](alerts-reference.md#alerts-dns)| :::image type="icon" source="./media/icons/yes-icon.png":::</br>[Provided by MDE](/microsoft-365/security/defender-endpoint/overview-endpoint-detection-response)| :::image type="icon" source="./media/icons/yes-icon.png"::: |
54
-
|**Threat detection for network-level (agentless security alerts)**| Defender for Servers detects threats that are directed at the control plane on the network, including network-based security alerts for Azure virtual machines. | Not supported in Plan 1 | :::image type="icon" source="./media/icons/yes-icon.png"::: |
54
+
|**Threat detection for network-level (agentless security alerts)**| Defender for Servers detects threats that are directed at the control plane on the network, including network-based security alerts for Azure virtual machines. [Learn more](/azure/defender-for-cloud/alerts-reference)| Not supported in Plan 1 | :::image type="icon" source="./media/icons/yes-icon.png"::: |
55
55
|**Microsoft Defender Vulnerability Management (MDVM) Add-on**| Enhance your vulnerability management program consolidated asset inventories, security baselines assessments, application block feature, and more. [Learn more](deploy-vulnerability-assessment-defender-vulnerability-management.md). | Not supported in Plan 1 | :::image type="icon" source="./media/icons/yes-icon.png"::: |
56
56
|**Security Policy and Regulatory Compliance**| Customize a security policy for your subscription and also compare the configuration of your resources with requirements in industry standards, regulations, and benchmarks. Learn more about [regulatory compliance](regulatory-compliance-dashboard.md) and [security policies](security-policy-concept.md)| Not supported in Plan 1 | :::image type="icon" source="./media/icons/yes-icon.png":::|
57
57
|**[Qualys vulnerability assessment](deploy-vulnerability-assessment-vm.md)**| As an alternative to Defender Vulnerability Management, Defender for Cloud can deploy a Qualys scanner and display the findings. You don't need a Qualys license or account. | Not supported in Plan 1 | :::image type="icon" source="./media/icons/yes-icon.png":::|
Copy file name to clipboardExpand all lines: articles/healthcare-apis/fhir/migration-strategies.md
+1-1Lines changed: 1 addition & 1 deletion
Display the source diff
Display the rich diff
Original file line number
Diff line number
Diff line change
@@ -41,7 +41,7 @@ Compare the differences between Azure API for FHIR and Azure Health Data Service
41
41
|**Autoscaling**|Supported on request and incurs charge|Enabled by default at no extra charge|
42
42
|**Search parameters**|Bundle type supported: Batch <br> • Include and revinclude, iterate modifier not supported <br> • Sorting supported by first name, last name, birthdate and clinical date|Bundle type supported: Batch and transaction <br> • Selectable search parameters <br> • Include, revinclude, and iterate modifier is supported <br>• Sorting supported by string and dateTime fields|
43
43
|**Events**|Not Supported|Supported|
44
-
|**Infrastructure**|Supported: <br> • Customer managed keys <br> • AZ support and PITR <br> • Cross region DR|Supported: <br> • Data recovery <br> • [Customer managed keys](configure-customer-managed-keys.md) <br> Upcoming: <br> • AZ support for customer managed keys|
44
+
|**Infrastructure**|Supported: <br> • Customer managed keys <br> • AZ support and PITR <br> • Cross region DR|Supported: <br> • Data recovery <br> • [Customer managed keys](configure-customer-managed-keys.md) <br> Upcoming: <br> • Availability zone support|
45
45
46
46
### Things to consider that may affect your architecture
0 commit comments