Skip to content

Commit c4b578d

Browse files
authored
Merge pull request #290940 from MicrosoftDocs/repo_sync_working_branch
Confirm merge from repo_sync_working_branch to main to sync with https://github.com/MicrosoftDocs/azure-docs (branch main)
2 parents 7ec2803 + 0bf7912 commit c4b578d

File tree

5 files changed

+30
-6
lines changed

5 files changed

+30
-6
lines changed

articles/azure-app-configuration/concept-key-value.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -96,7 +96,7 @@ Each key-value in App Configuration has a content type attribute. You can option
9696
> [!div class="nextstepaction"]
9797
> [Point-in-time snapshot](./concept-point-time-snapshot.md)
9898
99-
> [!div class="neSxtstepaction"]
99+
> [!div class="nextstepaction"]
100100
> [Feature management](./concept-feature-management.md)
101101
102102
> [!div class="nextstepaction"]

articles/event-hubs/event-hubs-capture-enable-through-portal.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,12 +11,12 @@ ms.custom: mode-ui
1111
Azure [Event Hubs Capture][capture-overview] enables you to automatically deliver the streaming data in Event Hubs to an [Azure Blob storage](https://azure.microsoft.com/services/storage/blobs/) or [Azure Data Lake Storage Gen 2](https://azure.microsoft.com/services/data-lake-store/) account of your choice. You can configure capture settings using the [Azure portal](https://portal.azure.com) when creating an event hub or for an existing event hub. For conceptual information on this feature, see [Event Hubs Capture overview][capture-overview].
1212

1313
> [!IMPORTANT]
14-
> Event Hubs doesn't support capturing events in a **premium** storage account.
14+
> Event Hubs only supports **Premium** Storage account with **Block Blob** support.
1515
1616

1717
## Enable Capture when you create an event hub
1818

19-
If you don't have an Event Hubs namespace to work with, create a **standard** tier namespace by following steps from the article: [Create an Event Hubs namespace](event-hubs-create.md#create-an-event-hubs-namespace). Make sure that you select **Standard** for the **pricing tier**. The basic tier doesn't support the Capture feature.
19+
If you don't have an Event Hubs namespace to work with, create a namespace by following steps from the article: [Create an Event Hubs namespace](event-hubs-create.md#create-an-event-hubs-namespace). Make sure that you select **Standard** or higher **pricing tier**. The basic tier doesn't support the Capture feature.
2020

2121
To create an event hub within the namespace, follow these steps:
2222

articles/sentinel/notebooks-hunt.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -148,7 +148,7 @@ If you have multiple notebooks, make sure to select a default AML workspace to u
148148

149149
## Launch a notebook in your Azure Machine Learning workspace
150150

151-
After you create an Azure Machine Learning workspace, launch your notebook in that workspace from Microsoft Sentinel. Be aware that if you have private endpoints enabled in your Azure storage account, you can't launch notebooks in the Azure Machine Learning workspace from Microsoft Sentinel. You must copy the notebook template from Microsoft Sentinel and upload the notebook to the Azure Machine Learning studio.
151+
After you create an Azure Machine Learning workspace, launch your notebook in that workspace from Microsoft Sentinel. Be aware that if you have private endpoints or restrictions on the public network access enabled in your Azure storage account, you can't launch notebooks in the Azure Machine Learning workspace from Microsoft Sentinel. You must copy the notebook template from Microsoft Sentinel and upload the notebook to the Azure Machine Learning studio.
152152

153153
To launch your Microsoft Sentinel notebook in your Azure Machine Learning workspace, complete the following steps.
154154

articles/sentinel/unified-connector-cef-device.md

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -182,6 +182,22 @@ Set your security solution to send syslog messages in CEF format to the proxy ma
182182

183183
In ForgeRock, install and configure this Common Audit (CAUD) for Microsoft Sentinel per the documentation at https://github.com/javaservlets/SentinelAuditEventHandler. Next, in Azure, follow the steps to configure the CEF via AMA data connector.
184184

185+
## Fortinet
186+
187+
Set your Fortinet to send Syslog messages in CEF format to the proxy machine. Make sure you send the logs to port 514 TCP on the machine's IP address.<br/>
188+
189+
Copy the CLI commands below and:
190+
191+
- Replace \"server &lt;ip address&gt;\" with the Syslog agent's IP address.<br/>
192+
- Set the \"&lt;facility_name&gt;\" to use the facility you configured in the Syslog agent (by default, the agent sets this to local4).<br/>
193+
- Set the Syslog port to 514, the port your agent uses.<br/>
194+
- To enable CEF format in early FortiOS versions, you may need to run the command \"set csv disable\".<br/>For more information, go to the [Fortinet Document Library](https://aka.ms/asi-syslog-fortinet-fortinetdocumentlibrary), choose your version, and use the \"Handbook\" and \"Log Message Reference\" PDFs.<br/>
195+
196+
[Learn more >](https://aka.ms/CEF-Fortinet)
197+
198+
Set up the connection using the CLI to run the following commands:
199+
`config log syslogd setting/n set status enable/nset format cef/nset port 514/nset server <ip_address_of_Receiver>/nend`
200+
185201
## iboss
186202

187203
Set your Threat Console to send syslog messages in CEF format to your Azure workspace. Make note of your **Workspace ID** and **Primary Key** within your Log Analytics workspace. Select the workspace from the Log Analytics workspaces menu in the Azure portal. Then select **Agents management** in the **Settings** section.

articles/service-bus-messaging/service-bus-troubleshooting-guide.md

Lines changed: 10 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ To troubleshoot:
2020
- Try using the Web Socket transport option, which connects using port 443. For details, see [configure the transport](https://github.com/Azure/azure-sdk-for-net/blob/main/sdk/servicebus/Azure.Messaging.ServiceBus/samples/Sample13_AdvancedConfiguration.md#configuring-the-transport).
2121
- See if your network is blocking specific IP addresses. For details, see [What IP addresses do I need to allow?](/azure/service-bus-messaging/service-bus-faq#what-ip-addresses-do-i-need-to-add-to-allowlist-)
2222
- If applicable, verify the proxy configuration. For details, see: [Configuring the transport](https://github.com/Azure/azure-sdk-for-net/blob/main/sdk/servicebus/Azure.Messaging.ServiceBus/samples/Sample13_AdvancedConfiguration.md#configuring-the-transport)
23-
- For more information about troubleshooting network connectivity, see: [Connectivity, certificate, or timeout issues][#connectivity-certificate-or-timeout-issues].
23+
- For more information about troubleshooting network connectivity, see: [Connectivity, certificate, or timeout issues](#connectivity-certificate-or-timeout-issues).
2424

2525
### Secure socket layer (SSL) handshake failures
2626
This error can occur when an intercepting proxy is used. To verify, We recommend that you test the application in the host environment with the proxy disabled.
@@ -289,4 +289,12 @@ See the following articles:
289289
[MessageBody]: https://github.com/Azure/azure-sdk-for-net/blob/main/sdk/servicebus/Azure.Messaging.ServiceBus/samples/Sample14_AMQPMessage.md#message-body
290290
[MaxConcurrentSessions]: /dotnet/api/azure.messaging.servicebus.servicebussessionprocessoroptions.maxconcurrentsessions
291291
[DebugThreadPoolStarvation]: /dotnet/core/diagnostics/debug-threadpool-starvation
292-
[DiagnoseThreadPoolExhaustion]: /shows/on-net/diagnosing-thread-pool-exhaustion-issues-in-net-core-apps
292+
[DiagnoseThreadPoolExhaustion]: /shows/on-net/diagnosing-thread-pool-exhaustion-issues-in-net-core-apps
293+
[TryTimeout]: https://learn.microsoft.com/dotnet/api/azure.messaging.servicebus.servicebusretryoptions.trytimeout?view=azure-dotnet
294+
[SessionIdleTimeout]: https://learn.microsoft.com/dotnet/api/azure.messaging.servicebus.servicebussessionprocessoroptions.sessionidletimeout?view=azure-dotnet
295+
[BackgroundService]: https://learn.microsoft.com/dotnet/api/microsoft.extensions.hosting.backgroundservice?view=dotnet
296+
[TransactionTimeout]: https://learn.microsoft.com/azure/service-bus-messaging/service-bus-transactions#timeout
297+
[CrossEntityTransactions]: https://github.com/Azure/azure-sdk-for-net/blob/main/sdk/servicebus/Azure.Messaging.ServiceBus/samples/Sample06_Transactions.md#transactions-across-entities
298+
[Transactions]: https://learn.microsoft.com/azure/service-bus-messaging/service-bus-transactions
299+
[TransactionOperations]: https://learn.microsoft.com/azure/service-bus-messaging/service-bus-transactions#operations-within-a-transaction-scope
300+
[ServiceBusQuotas]: https://learn.microsoft.com/azure/service-bus-messaging/service-bus-quotas

0 commit comments

Comments
 (0)