Skip to content

Commit 0f2c500

Browse files
authored
Merge pull request #219232 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 5c264eb + f9848a9 commit 0f2c500

File tree

5 files changed

+21
-14
lines changed

5 files changed

+21
-14
lines changed

articles/active-directory/saas-apps/jiramicrosoft-tutorial.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ Use your Microsoft Azure Active Directory account with Atlassian JIRA server to
3030
To configure Azure AD integration with JIRA SAML SSO by Microsoft, you need the following items:
3131

3232
- An Azure AD subscription. If you don't have a subscription, you can get a [free account](https://azure.microsoft.com/free/).
33-
- JIRA Core and Software 6.4 to 8.22.1 or JIRA Service Desk 3.0 to 4.22.1 should be installed and configured on Windows 64-bit version.
33+
- JIRA Core and Software 6.4 to 9.4.0 or JIRA Service Desk 3.0 to 4.22.1 should be installed and configured on Windows 64-bit version.
3434
- JIRA server is HTTPS enabled.
3535
- Note the supported versions for JIRA Plugin are mentioned in below section.
3636
- JIRA server is reachable on the Internet particularly to the Azure AD login page for authentication and should able to receive the token from Azure AD.
@@ -51,7 +51,7 @@ To get started, you need the following items:
5151
5252
## Supported versions of JIRA
5353

54-
* JIRA Core and Software: 6.4 to 8.22.1.
54+
* JIRA Core and Software: 6.4 to 9.4.0.
5555
* JIRA Service Desk 3.0 to 4.22.1.
5656
* JIRA also supports 5.2. For more details, click [Microsoft Azure Active Directory single sign-on for JIRA 5.2](jira52microsoft-tutorial.md).
5757

articles/azure-monitor/alerts/alerts-troubleshoot.md

Lines changed: 10 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -136,9 +136,16 @@ If you can see a fired alert in the portal, but its configured action did not tr
136136
1. **Are you calling Slack or Microsoft Teams?**
137137
Each of these endpoints expects a specific JSON format. Follow [these instructions](../alerts/action-groups-logic-app.md) to configure a logic app action instead.
138138

139-
1. **Did your webhook became unresponsive or returned errors?**
140-
141-
Our timeout period for a webhook response is 10 seconds. The webhook call will be retried up to two additional times when the following HTTP status codes are returned: 408, 429, 503, 504, or when the HTTP endpoint does not respond. The first retry happens after 10 seconds. The second and final retry happens after 100 seconds. If the second retry fails, the endpoint will not be called again for 30 minutes for any action group.
139+
1. **Did your webhook become unresponsive or return errors?**
140+
141+
The webhook response timeout period is 10 seconds. When the HTTP endpoint does not respond or when the following HTTP status codes are returned, the webhook call is retried up to two times:
142+
143+
- `408`
144+
- `429`
145+
- `503`
146+
- `504`
147+
148+
One retry occurs after 10 seconds and another retry occurs after 100 seconds. If the second retry fails, the endpoint is not called again for 15 minutes for any action group.
142149

143150
## Action or notification happened more than once
144151

articles/event-grid/auth0-log-stream-blob-storage.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -98,10 +98,10 @@ This article shows you how to send Auth0 events to Azure Blob Storage via Azure
9898
1. Select the container and verify that your Auth0 logs are being stored.
9999

100100
> [!NOTE]
101-
> You can use steps in the article to handle events from other event sources too. For a generic example of sending Event Grid events to Azure Blob Storage or Azure Monitor's Application Insights, see [this example on GitHub](https://github.com/awkwardindustries/azure-monitor-handler).
101+
> You can use steps in the article to handle events from other event sources too. For a generic example of sending Event Grid events to Azure Blob Storage or Azure Monitor Application Insights, see [this example on GitHub](https://github.com/awkwardindustries/azure-monitor-handler).
102102

103103
## Next steps
104104

105105
- [Auth0 Partner Topic](auth0-overview.md)
106106
- [Subscribe to Auth0 events](auth0-how-to.md)
107-
- [Send Auth0 events to Azure Blob Storage](auth0-log-stream-blob-storage.md)
107+
- [Send Auth0 events to Azure Blob Storage](auth0-log-stream-blob-storage.md)

articles/machine-learning/azure-machine-learning-release-notes.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -40,9 +40,9 @@ __RSS feed__: Get notified when this page is updated by copying and pasting the
4040
+ **azureml-contrib-automl-dnn-forecasting**
4141
+ There is a corner case where samples are reduced to 1 after the cross validation split but sample_size still points to the count before the split and hence batch_size ends up being more than sample count in some cases. In this fix we initialize sample_size after the split
4242
+ **azureml-core**
43-
+ Added deprecation warning when inference customers use CLI/SDK v1 model deployment APIs to deploy models and also when python version is 3.6 and less.
43+
+ Added deprecation warning when inference customers use CLI/SDK v1 model deployment APIs to deploy models and also when Python version is 3.6 and less.
4444
+ The following values of `AZUREML_LOG_DEPRECATION_WARNING_ENABLED` change the behavior as follows:
45-
+ Default - displays the warning when customer uses python 3.6 and less and for cli/sdk v1.
45+
+ Default - displays the warning when customer uses Python 3.6 and less and for cli/sdk v1.
4646
+ `True` - displays the sdk v1 deprecation warning on azureml-sdk packages.
4747
+ `False` - disables the sdk v1 deprecation warning on azureml-sdk packages.
4848
+ Command to be executed to set the environment variable to disable the deprecation message:

articles/virtual-machines/windows/external-ntpsource-configuration.md

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ ms.author: ndelvillar
1414

1515
**Applies to:** :heavy_check_mark: Windows Virtual Machines
1616

17-
Use this guide to learn how to setup time synchronization for your Azure Windows Virtual Machines that belong to an Active Directory Domain.
17+
Use this guide to learn how to set up time synchronization for your Azure Windows Virtual Machines that belong to an Active Directory Domain.
1818

1919
## Time sync hierarchy in Active Directory Domain Services
2020

@@ -25,7 +25,7 @@ All other Domain Controllers would then sync time against the PDC, and all other
2525
If you have an Active Directory domain running on virtual machines hosted in Azure, follow these steps to properly set up Time Sync.
2626

2727
>[!NOTE]
28-
>This guide focuses on usign the **Group Policy Management** console to perform the configuration. You can achieve the same results by using the Command Prompt, PowerShell, or by manually modifying the Registry; however those methods are not in scope in this article.
28+
>This guide focuses on using the **Group Policy Management** console to perform the configuration. You can achieve the same results by using the Command Prompt, PowerShell, or by manually modifying the Registry; however, those methods are not in scope in this article.
2929
3030
## GPO to allow the PDC to synchronize with an External NTP Source
3131

@@ -41,7 +41,7 @@ To check current time source in your **PDC**, from an elevated command prompt ru
4141
8. Double click the *Configure Windows NTP Client* policy and set it to *Enabled*, configure the parameter *NTPServer* to point to an IP address or FQDN of a time server followed by `,0x9` for example: `131.107.13.100,0x9` and configure *Type* to **NTP**. For all the other parameters you can use the default values, or use custom ones according to your corporate needs.
4242
9. Click the *Next Setting* button, set the *Enable Windows NTP Client* policy to *Enabled* and click *OK*
4343
10. In the *Scope* tab of the newly created GPO navigate to **Security Filtering** and highlight the *Authenticated Users* group -> Click the *Remove* button -> *OK* -> *OK*
44-
11. Create a WMI Filter to dinamycally get the Domain Controller that holds the PDC role:
44+
11. Create a WMI Filter to dynamically get the Domain Controller that holds the PDC role:
4545
- In the *Group Policy Management* console, navigate to *WMI Filters*, right-click on it and select *New*.
4646
- In the *New WMI Filter* window, give a name to the new filter, for example, *Get PDC Emulator* -> Fill out the *Description* field (optional) -> Click the *Add* button.
4747
- In the *WMI Query* window leave the *Namespace* as is, in the *Query* text box paste the following string `Select * from Win32_ComputerSystem where DomainRole = 5`, then click the *OK* button.
@@ -51,7 +51,7 @@ To check current time source in your **PDC**, from an elevated command prompt ru
5151
14. Link the GPO to the **Domain Controllers** Organizational Unit.
5252

5353
>[!NOTE]
54-
>It can take up to 15 minutes for these changes to reflect in the system.
54+
>It can take up to 15 minutes for these changes to be reflected by the system.
5555
5656
From an elevated command prompt rerun *w32tm /query /source* and compare the output to the one you noted at the beginning of the configuration. Now it will be set to the NTP Server you chose.
5757

@@ -114,4 +114,4 @@ Below are links to more details about the time sync:
114114
- [Windows Server 2016 Improvements
115115
](/windows-server/networking/windows-time-service/windows-server-2016-improvements)
116116
- [Accurate Time for Windows Server 2016](/windows-server/networking/windows-time-service/accurate-time)
117-
- [Support boundary to configure the Windows Time service for high-accuracy environments](/windows-server/networking/windows-time-service/support-boundary)
117+
- [Support boundary to configure the Windows Time service for high-accuracy environments](/windows-server/networking/windows-time-service/support-boundary)

0 commit comments

Comments
 (0)