Skip to content

Commit db14bf1

Browse files
authored
Merge pull request #274374 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 d8c7d3e + 282ae87 commit db14bf1

File tree

8 files changed

+53
-14
lines changed

8 files changed

+53
-14
lines changed

articles/active-directory-b2c/self-asserted-technical-profile.md

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -176,7 +176,8 @@ The following example demonstrates the use of a self-asserted technical profile
176176
<UseTechnicalProfileForSessionManagement ReferenceId="SM-AAD" />
177177
</TechnicalProfile>
178178
```
179-
179+
> [!NOTE]
180+
> When you collect the password claim value in the self-asserted technical profile, that value is only available within the same technical profile or within a validation technical profiles that are referenced by that same self-asserted technical profile. When execution of that self-asserted technical profile completes, and moves to another technical profile, the password's value is lost. Consequently, password claim can only be stored in the orchestration step in which it is collected.
180181
### Output claims sign-up or sign-in page
181182

182183
In a combined sign-up and sign-in page, note the following when using a content definition [DataUri](contentdefinitions.md#datauri) element that specifies a `unifiedssp` or `unifiedssd` page type:

articles/api-management/api-management-faq.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,7 @@ sections:
6868
- question: |
6969
How do I add a user to the Administrators group?
7070
answer: |
71-
Administrators group is an immutable system group that includes Azure subscription administrators. You can't add a user to this group. For more information, see [How to create and use groups to manage developer accounts in Azure API Management](./api-management-howto-create-groups.md).
71+
The Administrators group is an immutable system group that includes Azure subscription administrators. You can't add a user to this group. For more information, see [How to create and use groups to manage developer accounts in Azure API Management](./api-management-howto-create-groups.md).
7272
7373
- question: |
7474
Why is the policy that I want to add unavailable in the policy editor?

articles/azure-monitor/agents/data-collection-syslog.md

Lines changed: 39 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,10 @@ When the Azure Monitor agent for Linux is installed, it configures the local Sys
2020

2121
:::image type="content" source="media/azure-monitor-agent/linux-agent-syslog-communication.png" lightbox="media/azure-monitor-agent/linux-agent-syslog-communication.png" alt-text="Diagram that shows Syslog daemon and Azure Monitor Agent communication.":::
2222

23+
>[!Note]
24+
> Azure Monitor Agent uses a TCP port to receive messages sent by rsyslog or syslog-ng, however, in case SELinux is enabled and we aren't able to use semanage to add rules for the TCP port, we will use Unix sockets.
25+
26+
2327
The following facilities are supported with the Syslog collector:
2428
* None
2529
* Kern
@@ -147,7 +151,24 @@ queue.dequeueBatchSize="2048"
147151
queue.saveonshutdown="on"
148152
target="127.0.0.1" Port="28330" Protocol="tcp")
149153
```
150-
154+
155+
The following configuration is used when you use SELinux and we decide to use Unix sockets.
156+
```
157+
$ cat /etc/rsyslog.d/10-azuremonitoragent.conf
158+
# Azure Monitor Agent configuration: forward logs to azuremonitoragent
159+
$OMUxSockSocket /run/azuremonitoragent/default_syslog.socket
160+
template(name="AMA_RSYSLOG_TraditionalForwardFormat" type="string" string="<%PRI%>%TIMESTAMP% %HOSTNAME% %syslogtag%%msg:::sp-if-no-1st-sp%%msg%")
161+
$OMUxSockDefaultTemplate AMA_RSYSLOG_TraditionalForwardFormat
162+
# Forwarding all events through Unix Domain Socket
163+
*.* :omuxsock:
164+
```
165+
166+
```
167+
$ cat /etc/rsyslog.d/05-azuremonitoragent-loadomuxsock.conf
168+
# Azure Monitor Agent configuration: load rsyslog forwarding module.
169+
$ModLoad omuxsock
170+
```
171+
151172
On some legacy systems, such as CentOS 7.3, we've seen rsyslog log formatting issues when a traditional forwarding format is used to send Syslog events to Azure Monitor Agent. For these systems, Azure Monitor Agent automatically places a legacy forwarder template instead:
152173

153174
`template(name="AMA_RSYSLOG_TraditionalForwardFormat" type="string" string="%TIMESTAMP% %HOSTNAME% %syslogtag%%msg:::sp-if-no-1st-sp%%msg%\n")`
@@ -177,6 +198,23 @@ log {
177198
flags(flow-control);
178199
};
179200
```
201+
The following configuration is used when you use SELinux and we decide to use Unix sockets.
202+
```
203+
$ cat /etc/syslog-ng/conf.d/azuremonitoragent.conf
204+
# Azure MDSD configuration: syslog forwarding config for mdsd agent options {};
205+
# during install time, we detect if s_src exist, if it does then we
206+
# replace it by appropriate source name like in redhat 's_sys'
207+
# Forwrding using unix domain socket
208+
destination d_azure_mdsd {
209+
unix-dgram("/run/azuremonitoragent/default_syslog.socket"
210+
flags(no_multi_line) );
211+
};
212+
213+
log {
214+
source(s_src); # will be automatically parsed from /etc/syslog-ng/syslog-ng.conf
215+
destination(d_azure_mdsd);
216+
};
217+
```
180218

181219
>[!Note]
182220
> Azure Monitor supports collection of messages sent by rsyslog or syslog-ng, where rsyslog is the default daemon. The default Syslog daemon on version 5 of Red Hat Enterprise Linux, CentOS, and Oracle Linux version (sysklog) isn't supported for Syslog event collection. To collect Syslog data from this version of these distributions, the rsyslog daemon should be installed and configured to replace sysklog.

articles/defender-for-cloud/azure-devops-extension.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -162,7 +162,7 @@ procedureSection:
162162
163163
Findings from third-party security tools will appear as 'Azure DevOps
164164
repositories should have code scanning findings resolved' assessments
165-
associated with the repository the secuirty finding was identified in.
165+
associated with the repository the security finding was identified in.
166166
167167
relatedContent:
168168
- text: Create your first pipeline
@@ -174,4 +174,4 @@ relatedContent:
174174

175175

176176
# Learn more about [DevOps Security in Defender for Cloud](defender-for-devops-introduction.md).
177-
# Learn how to [connect your Azure DevOps Organizations](quickstart-onboard-devops.md) to Defender for Cloud.
177+
# Learn how to [connect your Azure DevOps Organizations](quickstart-onboard-devops.md) to Defender for Cloud.

articles/event-grid/communication-services-chat-events.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ Azure Communication Services emits chat events only when Azure Communication Ser
1414

1515
## Event types
1616

17-
Azure Communication Services emits chat events on two different levels: **User-level** and **Thread-level**. User-level events pertain to a specific user on the chat thread and are delivered once per user. Thread-level events pertain to the entire chat thread and and delivered once per thread. For example: if there are 10 users in a thread, there will be one thread-level event and 10 user-level events, one for each user, when a message is received in a thread.
17+
Azure Communication Services emits chat events on two different levels: **User-level** and **Thread-level**. User-level events pertain to a specific user on the chat thread and are delivered once per user. Thread-level events pertain to the entire chat thread and are delivered once per thread. For example: if there are 10 users in a thread, there will be one thread-level event and 10 user-level events, one for each user, when a message is received in a thread.
1818

1919
Azure Communication Services emits the following chat event types:
2020

@@ -33,7 +33,7 @@ Azure Communication Services emits the following chat event types:
3333
| [Microsoft.Communication.ChatThreadParticipantAdded](#microsoftcommunicationchatthreadparticipantadded-event) | `Thread` | Published when a new participant is added to a chat thread |
3434
| [Microsoft.Communication.ChatThreadParticipantRemoved](#microsoftcommunicationchatthreadparticipantremoved-event) | `Thread` | Published when a participant is removed from a chat thread |
3535
| [Microsoft.Communication.ChatMessageReceivedInThread](#microsoftcommunicationchatmessagereceivedinthread-event) | `Thread` |Published when a message is received in a chat thread |
36-
| [Microsoft.Communication.ChatThreadPropertiesUpdated](#microsoftcommunicationchatthreadpropertiesupdated-event)| `Thread` | Published when a chat thread's properties are updated.|
36+
| [Microsoft.Communication.ChatThreadPropertiesUpdated](#microsoftcommunicationchatthreadpropertiesupdated-event)| `Thread` | Published when a chat thread's properties are updated |
3737
| [Microsoft.Communication.ChatMessageEditedInThread](#microsoftcommunicationchatmessageeditedinthread-event) | `Thread` |Published when a message is edited in a chat thread |
3838
| [Microsoft.Communication.ChatMessageDeletedInThread](#microsoftcommunicationchatmessagedeletedinthread-event) | `Thread` |Published when a message is deleted in a chat thread |
3939

articles/event-grid/communication-services-voice-video-events.md

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -17,12 +17,12 @@ Azure Communication Services emits the following voice and video calling event t
1717

1818
| Event type | Description |
1919
| ----------------------------------------------------------- | ---------------------------------------------------------------------------------------------- |
20-
| Microsoft.Communication.RecordingFileStatusUpdated | Published when recording file is available |
21-
| Microsoft.Communication.CallStarted | Published when call is started |
22-
| Microsoft.Communication.CallEnded | Published when call is ended |
23-
| Microsoft.Communication.CallParticipantAdded | Published when participant is added |
24-
| Microsoft.Communication.CallParticipantRemoved | Published when participant is removed |
25-
| Microsoft.Communication.IncomingCall | Published when there is an incoming call |
20+
| [Microsoft.Communication.RecordingFileStatusUpdated](#microsoftcommunicationrecordingfilestatusupdated) | Published when a recording file is available |
21+
| [Microsoft.Communication.CallStarted](#microsoftcommunicationcallstarted) | Published when a call is started |
22+
| [Microsoft.Communication.CallEnded](#microsoftcommunicationcallended) | Published when a call ends |
23+
| [Microsoft.Communication.CallParticipantAdded](#microsoftcommunicationcallparticipantadded) | Published when a participant is added to a call AND they join it |
24+
| [Microsoft.Communication.CallParticipantRemoved](#microsoftcommunicationcallparticipantremoved) | Published when a participant leaves or is removed from a call |
25+
| [Microsoft.Communication.IncomingCall](#microsoftcommunicationincomingcall) | Published when there is an incoming call |
2626

2727
## Event responses
2828

articles/postgresql/flexible-server/concepts-backup-restore.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ Azure Database for PostgreSQL flexible server stores multiple copies of your bac
4040

4141
Azure Database for PostgreSQL flexible server offers three options:
4242

43-
- **Zone-redundant backup storage**: This option is automatically chosen for regions that support availability zones. When the backups are stored in zone-redundant backup storage, multiple copies are not only stored within the same availability zone, but also replicated to another availability zone within the same region.
43+
- **Zone-redundant backup storage**: This option is automatically chosen for regions that support availability zones. When the backups are stored in zone-redundant backup storage, multiple copies are not only stored within the same availability zone, but also replicated to other availability zones within the same region.
4444

4545
This option provides backup data availability across availability zones and restricts replication of data to within a country/region to meet data residency requirements. This option provides at least 99.9999999999 percent (12 nines) durability of backup objects over a year.
4646

-6.22 KB
Loading

0 commit comments

Comments
 (0)