Skip to content

Commit 5c37977

Browse files
authored
Merge pull request #253370 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 ca98cd3 + 86be917 commit 5c37977

File tree

8 files changed

+27
-8
lines changed

8 files changed

+27
-8
lines changed

articles/active-directory/governance/how-to-lifecycle-workflow-sync-attributes.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -31,10 +31,10 @@ The following table shows the scheduling (trigger) relevant attributes and the m
3131
> [!NOTE]
3232
> Manually setting the employeeLeaveDateTime for cloud-only users requires special permissions. For more information, see: [Configure the employeeLeaveDateTime property for a user](/graph/tutorial-lifecycle-workflows-set-employeeleavedatetime)
3333
34-
This document explains how to set up synchronization from on-premises Microsoft Entra Connect cloud sync and Microsoft Entra Connect for the required attributes.
34+
This document explains how to set up synchronization from on-premises Microsoft Entra Connect cloud sync or Microsoft Entra Connect for the required attributes.
3535

3636
>[!NOTE]
37-
> There's no corresponding EmployeeHireDate or EmployeeLeaveDateTime attribute in Active Directory. If you're importing from on-premises AD, you'll need to identify an attribute in AD that can be used. This attribute must be a string.
37+
> There's no corresponding EmployeeHireDate or EmployeeLeaveDateTime attribute in Active Directory. If you're synchronizing from on-premises AD, you'll need to identify an attribute in AD that can be used. This attribute must be a string.
3838
3939

4040
## Understanding EmployeeHireDate and EmployeeLeaveDateTime formatting
@@ -173,7 +173,7 @@ To update this mapping, you'd do the following:
173173
1. Add your source attribute(s) created as Type String, and select on the CheckBox for required.
174174
:::image type="content" source="media/how-to-lifecycle-workflow-sync-attributes/edit-attribute-list.png" alt-text="Screenshot of source api list.":::
175175
> [!NOTE]
176-
> The number, and name, of source attributes added will depend on which attributes you are syncing.
176+
> The number, and name, of source attributes added will depend on which attributes you are syncing from Active Directory.
177177
1. Select Save.
178178

179179
1. From there you must map the HRM attributes to the added Active Directory attributes. To do this, Add New Mapping using an Expression.

articles/azure-monitor/containers/container-insights-logging-v2.md

Lines changed: 23 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -101,9 +101,29 @@ This applies to the scenario where you have already enabled container insights f
101101
>* The configuration change can take a few minutes to complete before it takes effect. All ama-logs pods in the cluster will restart.
102102
>* The restart is a rolling restart for all ama-logs pods. It won't restart all of them at the same time.
103103

104-
## Multi-line logging in Container Insights (preview)
104+
## Multi-line logging in Container Insights
105105
Azure Monitor container insights now supports multiline logging. With this feature enabled, previously split container logs are stitched together and sent as single entries to the ContainerLogV2 table. Customers are able see container log lines upto to 64 KB (up from the existing 16 KB limit). If the stitched log line is larger than 64 KB, it gets truncated due to Log Analytics limits.
106-
Additionally, the feature also adds support for .NET and Go stack traces, which appear as single entries instead of being split into multiple entries in ContainerLogV2 table.
106+
Additionally, the feature also adds support for .NET, Go, Python and Java stack traces, which appear as single entries instead of being split into multiple entries in ContainerLogV2 table.
107+
108+
Below are two screenshots which demonstrate Multi-line logging at work for Go exception stack trace:
109+
110+
Multi-line logging disabled scenario:
111+
112+
![Screenshot that shows Multi-line logging disabled.](./media/container-insights-logging-v2/multi-line-disabled-go.png)
113+
114+
Multi-line logging enabled scenario:
115+
116+
[ ![Screenshot that shows Multi-line enabled.](./media/container-insights-logging-v2/multi-line-enabled-go.png) ](./media/container-insights-logging-v2/multi-line-enabled-go.png#lightbox)
117+
118+
Similarly, below screenshots depict Multi-line logging enabled scenarios for Java and Python stack traces:
119+
120+
For Java:
121+
122+
[ ![Screenshot that shows Multi-line enabled for Java](./media/container-insights-logging-v2/multi-line-enabled-java.png) ](./media/container-insights-logging-v2/multi-line-enabled-java.png#lightbox)
123+
124+
For Python:
125+
126+
[ ![Screenshot that shows Multi-line enabled for Python](./media/container-insights-logging-v2/multi-line-enabled-python.png) ](./media/container-insights-logging-v2/multi-line-enabled-python.png#lightbox)
107127

108128
### Pre-requisites
109129

@@ -116,7 +136,7 @@ Multi-line logging is a preview feature and can be enabled by setting **enabled*
116136
[log_collection_settings.enable_multiline_logs]
117137
# fluent-bit based multiline log collection for go (stacktrace), dotnet (stacktrace)
118138
# if enabled will also stitch together container logs split by docker/cri due to size limits(16KB per log line)
119-
enabled = "true"
139+
enabled = "true"
120140
```
121141

122142
## Next steps
107 KB
Loading
102 KB
Loading
65.1 KB
Loading
104 KB
Loading

articles/event-hubs/event-hubs-dotnet-standard-getstarted-send.md

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -162,7 +162,6 @@ This section shows you how to create a .NET Core console application to send eve
162162
{
163163
// if it is too large for the batch
164164
throw new Exception($"Event {i} is too large for the batch and cannot be sent.");
165-
Console.ReadLine();
166165
}
167166
}
168167

articles/virtual-machines/unmanaged-disks-deprecation.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ With managed disks, you don't have to worry about managing storage accounts for
1919

2020
## How does this affect me?
2121

22-
- As of September 30, 2023, new customers won't be able to create unmanaged disks.
22+
- As of January 30, 2024, new customers won't be able to create unmanaged disks.
2323
- On September 30, 2025, customers will no longer be able to start IaaS VMs by using unmanaged disks. Any VMs that are still running or allocated will be stopped and deallocated.
2424

2525
## What is being retired?

0 commit comments

Comments
 (0)