Skip to content

Commit 58b1571

Browse files
authored
Merge pull request #221952 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 1fe3909 + 8a986e9 commit 58b1571

File tree

5 files changed

+19
-15
lines changed

5 files changed

+19
-15
lines changed

articles/hdinsight/hdinsight-component-versioning.md

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -34,32 +34,32 @@ Support is defined as a time period that an HDInsight version is supported by Mi
3434
Standard support provides updates and support on HDInsight clusters. Microsoft recommends building solutions using the most recent fully supported version.
3535

3636
Standard support includes
37-
- Ability to create support requests on HDInsight 4.0 clusters.
38-
- Support for troubleshooting solutions built on 4.0 clusters.
37+
- Ability to create support requests for the cluster.
38+
- Support for troubleshooting solutions built on the cluster(s).
3939
- Requests to restart services or nodes.
4040
- Root cause analysis investigations on support requests.
4141
- Root cause analysis or fixes to improve job or query performance.
4242
- Root cause analysis or fixes to improve customer-initiated changes, for example, changing service configurations or issues due to custom script actions.
4343
- Product updates for critical security fixes until version retirement.
4444
- Scoped product updates to the HDInsight Resource provider.
45-
- Selective fixes or changes to HDInsight 4.0 images or open-source software (OSS) component versions.
45+
- Selective fixes or changes to HDInsight images or open-source software (OSS) component versions.
4646

4747
### Basic support
4848

4949
Basic support provides limited servicing to the HDInsight Resource provider. HDInsight images and open-source software (OSS) components won't be serviced. Only critical security fixes will be patched on HDInsight clusters.
5050

5151
Basic support includes
52-
- Continued use of existing HDInsight 3.6 clusters.
53-
- Ability for existing HDInsight 3.6 customers to create new 3.6 clusters.
54-
- Ability to scale HDInsight 3.6 clusters up and down via autoscale or manual scale.
52+
- Continued use of existing clusters.
53+
- Ability for existing HDInsight customers to create new clusters in the same version.
54+
- Ability to scale clusters up and down via autoscale or manual scale.
5555
- Scoped product updates to the HDInsight Resource provider.
5656
- Product updates for critical security fixes until version retirement.
57-
- Ability to create support requests on HDInsight 3.6 clusters.
57+
- Ability to create support requests for the cluster.
5858
- Requests to restart services or nodes.
5959

6060
Basic support doesn't include
61-
- Fixes or changes to HDInsight 3.6 images or open-source software (OSS) component versions.
62-
- Support for troubleshooting solutions built on 3.6 clusters.
61+
- Fixes or changes to HDInsight images or open-source software (OSS) component versions.
62+
- Support for troubleshooting solutions built on the cluster version.
6363
- Adding new features or functionality.
6464
- Support for advice or ad-hoc queries.
6565
- Root cause analysis investigations on support requests.

articles/postgresql/flexible-server/concepts-extensions.md

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -164,7 +164,7 @@ The following extensions are available in Azure Database for PostgreSQL - Flexib
164164
> |[pgrowlocks](https://www.postgresql.org/docs/13/pgrowlocks.html) | 1.2 | show row-level locking information|
165165
> |[pgstattuple](https://www.postgresql.org/docs/13/pgstattuple.html) | 1.5 | show tuple-level statistics|
166166
> |[plpgsql](https://www.postgresql.org/docs/13/plpgsql.html) | 1.0 | PL/pgSQL procedural language|
167-
> |[plv8](https://plv8.github.io/) | 3.0.0 | Trusted Javascript language extension|
167+
> |[plv8](https://plv8.github.io/) | 3.0.0 | Trusted JavaScript language extension|
168168
> |[postgis](https://www.postgis.net/) | 3.2.0 | PostGIS geometry, geography |
169169
> |[postgis_raster](https://www.postgis.net/) | 3.2.0 | PostGIS raster types and functions|
170170
> |[postgis_sfcgal](https://www.postgis.net/) | 3.2.0 | PostGIS SFCGAL functions|
@@ -223,7 +223,7 @@ The following extensions are available in Azure Database for PostgreSQL - Flexib
223223
> |[pgrowlocks](https://www.postgresql.org/docs/13/pgrowlocks.html) | 1.2 | show row-level locking information|
224224
> |[pgstattuple](https://www.postgresql.org/docs/13/pgstattuple.html) | 1.5 | show tuple-level statistics|
225225
> |[plpgsql](https://www.postgresql.org/docs/13/plpgsql.html) | 1.0 | PL/pgSQL procedural language|
226-
> |[plv8](https://plv8.github.io/) | 3.0.0 | Trusted Javascript language extension|
226+
> |[plv8](https://plv8.github.io/) | 3.0.0 | Trusted JavaScript language extension|
227227
> |[postgis](https://www.postgis.net/) | 3.2.0 | PostGIS geometry, geography |
228228
> |[postgis_raster](https://www.postgis.net/) | 3.2.0 | PostGIS raster types and functions|
229229
> |[postgis_sfcgal](https://www.postgis.net/) | 3.2.0 | PostGIS SFCGAL functions|
@@ -282,7 +282,7 @@ The following extensions are available in Azure Database for PostgreSQL - Flexib
282282
> |[pgrowlocks](https://www.postgresql.org/docs/12/pgrowlocks.html) | 1.2 | show row-level locking information|
283283
> |[pgstattuple](https://www.postgresql.org/docs/12/pgstattuple.html) | 1.5 | show tuple-level statistics|
284284
> |[plpgsql](https://www.postgresql.org/docs/12/plpgsql.html) | 1.0 | PL/pgSQL procedural language|
285-
> |[plv8](https://plv8.github.io/) | 3.2.0 | Trusted Javascript language extension|
285+
> |[plv8](https://plv8.github.io/) | 3.2.0 | Trusted JavaScript language extension|
286286
> |[postgis](https://www.postgis.net/) | 3.2.0 | PostGIS geometry, geography |
287287
> |[postgis_raster](https://www.postgis.net/) | 3.2.0 | PostGIS raster types and functions|
288288
> |[postgis_sfcgal](https://www.postgis.net/) | 3.2.0 | PostGIS SFCGAL functions|
@@ -341,7 +341,7 @@ The following extensions are available in Azure Database for PostgreSQL - Flexib
341341
> |[pgrowlocks](https://www.postgresql.org/docs/11/pgrowlocks.html) | 1.2 | show row-level locking information|
342342
> |[pgstattuple](https://www.postgresql.org/docs/11/pgstattuple.html) | 1.5 | show tuple-level statistics|
343343
> |[plpgsql](https://www.postgresql.org/docs/11/plpgsql.html) | 1.0 | PL/pgSQL procedural language|
344-
> |[plv8](https://plv8.github.io/) | 3.0.0 | Trusted Javascript language extension|
344+
> |[plv8](https://plv8.github.io/) | 3.0.0 | Trusted JavaScript language extension|
345345
> |[postgis](https://www.postgis.net/) | 2.5.5 | PostGIS geometry, geography, and raster spatial types and functions|
346346
> |[postgis_sfcgal](https://www.postgis.net/) | 2.5.5 | PostGIS SFCGAL functions|
347347
> |[postgis_tiger_geocoder](https://www.postgis.net/) | 2.5.5 | PostGIS tiger geocoder and reverse geocoder|

articles/private-link/private-endpoint-dns.md

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -76,6 +76,7 @@ For Azure services, use the recommended zone names as described in the following
7676
| Azure Event Hubs (Microsoft.EventHub/namespaces) / namespace | privatelink.servicebus.windows.net | servicebus.windows.net |
7777
| Azure Service Bus (Microsoft.ServiceBus/namespaces) / namespace | privatelink.servicebus.windows.net | servicebus.windows.net |
7878
| Azure IoT Hub (Microsoft.Devices/IotHubs) / iotHub | privatelink.azure-devices.net<br/>privatelink.servicebus.windows.net<sup>1</sup> | azure-devices.net<br/>servicebus.windows.net |
79+
| Azure IoT Hub Device Provisioning Service (Microsoft.Devices/ProvisioningServices) / iotDps | privatelink.azure-devices-provisioning.net | azure-devices-provisioning.net |
7980
| Azure Relay (Microsoft.Relay/namespaces) / namespace | privatelink.servicebus.windows.net | servicebus.windows.net |
8081
| Azure Event Grid (Microsoft.EventGrid/topics) / topic | privatelink.eventgrid.azure.net | eventgrid.azure.net |
8182
| Azure Event Grid (Microsoft.EventGrid/domains) / domain | privatelink.eventgrid.azure.net | eventgrid.azure.net |
@@ -136,6 +137,7 @@ For Azure services, use the recommended zone names as described in the following
136137
| Azure Event Hubs (Microsoft.EventHub/namespaces) / namespace | privatelink.servicebus.usgovcloudapi.net | servicebus.usgovcloudapi.net|
137138
| Azure Service Bus (Microsoft.ServiceBus/namespaces) / namespace | privatelink.servicebus.usgovcloudapi.net| servicebus.usgovcloudapi.net |
138139
| Azure IoT Hub (Microsoft.Devices/IotHubs) / iotHub | privatelink.azure-devices.us<br/>privatelink.servicebus.windows.us<sup>1</sup> | azure-devices.us<br/>servicebus.usgovcloudapi.net |
140+
| Azure IoT Hub Device Provisioning Service (Microsoft.Devices/ProvisioningServices) / iotDps | privatelink.azure-devices-provisioning.us | azure-devices-provisioning.us |
139141
| Azure Relay (Microsoft.Relay/namespaces) / namespace | privatelink.servicebus.usgovcloudapi.net | servicebus.usgovcloudapi.net |
140142
| Azure Web Apps (Microsoft.Web/sites) / sites | privatelink.azurewebsites.us | azurewebsites.us |
141143
| Azure Monitor (Microsoft.Insights/privateLinkScopes) / azuremonitor | privatelink.monitor.azure.us <br/> privatelink.adx.monitor.azure.us <br/> privatelink. oms.opinsights.azure.us <br/> privatelink.ods.opinsights.azure.us <br/> privatelink.agentsvc.azure-automation.us <br/> privatelink.blob.core.usgovcloudapi.net | monitor.azure.us <br/> adx.monitor.azure.us <br/> oms.opinsights.azure.us<br/> ods.opinsights.azure.us<br/> agentsvc.azure-automation.us <br/> blob.core.usgovcloudapi.net |
@@ -173,6 +175,7 @@ For Azure services, use the recommended zone names as described in the following
173175
| Azure Event Hubs (Microsoft.EventHub/namespaces) / namespace | privatelink.servicebus.chinacloudapi.cn | servicebus.chinacloudapi.cn |
174176
| Azure Service Bus (Microsoft.ServiceBus/namespaces) / namespace | privatelink.servicebus.chinacloudapi.cn | servicebus.chinacloudapi.cn |
175177
| Azure IoT Hub (Microsoft.Devices/IotHubs) / iotHub | privatelink.azure-devices.cn<br/>privatelink.servicebus.chinacloudapi.cn<sup>1</sup> | azure-devices.cn<br/>servicebus.chinacloudapi.cn |
178+
| Azure IoT Hub Device Provisioning Service (Microsoft.Devices/ProvisioningServices) / iotDps | privatelink.azure-devices-provisioning.cn | azure-devices-provisioning.cn |
176179
| Azure Relay (Microsoft.Relay/namespaces) / namespace | privatelink.servicebus.chinacloudapi.cn | servicebus.chinacloudapi.cn |
177180
| Azure Event Grid (Microsoft.EventGrid/topics) / topic | privatelink.eventgrid.azure.cn | eventgrid.azure.cn |
178181
| Azure Event Grid (Microsoft.EventGrid/domains) / domain | privatelink.eventgrid.azure.cn | eventgrid.azure.cn |

articles/sentinel/connect-cef-ama.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,7 @@ Before you begin, verify that you have:
6363

6464
### Configure a log forwarder
6565

66-
To ingest Syslog and CEF logs into Microsoft Sentinel, you need to designate and configure a Linux machine that collects the logs from your devices and forwards them to your Microsoft Sentinel workspace. This machine can be a physical or virtual machine in your on-premises environment, an Azure VM, or a VM in another cloud. This machine must have Azure Arc installed (see the [prerequisites](#prerequisites)).
66+
To ingest Syslog and CEF logs into Microsoft Sentinel, you need to designate and configure a Linux machine that collects the logs from your devices and forwards them to your Microsoft Sentinel workspace. This machine can be a physical or virtual machine in your on-premises environment, an Azure VM, or a VM in another cloud. If this machine is not an Azure VM, it must have Azure Arc installed (see the [prerequisites](#prerequisites)).
6767

6868
This machine has two components that take part in this process:
6969

@@ -131,7 +131,7 @@ Select the machines on which you want to install the AMA. These machines are VMs
131131
> On each source machine that sends logs to the forwarder in CEF format, you must edit the Syslog configuration file to remove the facilities that are being used to send CEF messages. This way, the facilities that are sent in CEF won't also be sent in Syslog.
132132
133133
1. Select the **Collect** tab and select **Linux syslog** as the data source type.
134-
1. Configure the minimum log level for each facility. When you select a log level, Microsoft Sentinel collects logs for the selected level and other levels with lower severity. For example, if you select **LOG_ERR**, Microsoft Sentinel collects logs for the **LOG_ERR**, **LOG_WARNING**, **LOG_NOTICE**, **LOG_INFO**, and **LOG_DEBUG** levels.
134+
1. Configure the minimum log level for each facility. When you select a log level, Microsoft Sentinel collects logs for the selected level and other levels with higher severity. For example, if you select **LOG_ERR**, Microsoft Sentinel collects logs for the **LOG_ERR**, **LOG_CRIT**, **LOG_ALERT**, and **LOG_EMERG** levels.
135135

136136
:::image type="content" source="media/connect-cef-ama/dcr-log-levels.png" alt-text="Screenshot showing how to select log levels when setting up the DCR.":::
137137

articles/sentinel/sap/configure-audit.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -86,6 +86,7 @@ The following table lists Message IDs used by the Microsoft Sentinel Solution fo
8686
| AUD | User master record &A changed. | User Master Record Change | Severe | Used |
8787
| AUE | Audit configuration changed | System | Critical | Used |
8888
| AUF | Audit: Slot &A: Class &B, Severity &C, User &D, Client &E, &F | System | Critical | Used |
89+
| AUG | Application server started | System | Critical | Used |
8990
| AUI | Audit: Slot &A Inactive | System | Critical | Used |
9091
| AUJ | Audit: Active status set to &1 | System | Critical with Monitor Alert | Used |
9192
| AUK | Successful RFC call &C (function group = &A) | RFC Start | Non-Critical | Used |

0 commit comments

Comments
 (0)