Skip to content

Commit

Permalink
Merge pull request #291661 from MicrosoftDocs/main
Browse files Browse the repository at this point in the history
12/9/2024 AM Publish
  • Loading branch information
Taojunshen authored Dec 9, 2024
2 parents 210dff9 + eabc84d commit 15b598a
Show file tree
Hide file tree
Showing 112 changed files with 305 additions and 157 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,7 @@ The resource providers for compute services are:

| Resource provider namespace | Azure service |
| --------------------------- | ------------- |
| Microsoft.AppPlatform | [Azure Spring Apps](../../spring-apps/enterprise/overview.md) |
| Microsoft.AppPlatform | [Azure Spring Apps](../../spring-apps/basic-standard/overview.md) |
| Microsoft.AVS | [Azure VMware Solution](../../azure-vmware/index.yml) |
| Microsoft.Batch | [Batch](../../batch/index.yml) |
| Microsoft.ClassicCompute | Classic deployment model virtual machine |
Expand All @@ -73,7 +73,7 @@ The resource providers for compute services are:
| Microsoft.HanaOnAzure | [SAP HANA on Azure Large Instances](/azure/virtual-machines/workloads/sap/hana-overview-architecture) |
| Microsoft.LabServices | [Azure Lab Services](../../lab-services/index.yml) |
| Microsoft.Maintenance | [Azure Maintenance](/azure/virtual-machines/maintenance-configurations) |
| Microsoft.Microservices4Spring | [Azure Spring Apps](../../spring-apps/enterprise/overview.md) |
| Microsoft.Microservices4Spring | [Azure Spring Apps](../../spring-apps/basic-standard/overview.md) |
| Microsoft.Quantum | [Azure Quantum](https://azure.microsoft.com/services/quantum/) |
| Microsoft.SerialConsole - [registered by default](#registration) | [Azure Serial Console for Windows](/troubleshoot/azure/virtual-machines/serial-console-windows) |
| Microsoft.ServiceFabric | [Service Fabric](/azure/service-fabric/) |
Expand Down Expand Up @@ -135,6 +135,7 @@ The resource providers for developer tools services are:
| Microsoft.AppConfiguration | [Azure App Configuration](../../azure-app-configuration/index.yml) |
| Microsoft.DevCenter | [Microsoft Dev Box](../../dev-box/index.yml) |
| Microsoft.DevSpaces | [Azure Dev Spaces](/previous-versions/azure/dev-spaces/) |
| Microsoft.LoadTestService | [Azure Load Testing](/azure/load-testing/) |
| Microsoft.MixedReality | [Azure Spatial Anchors](../../spatial-anchors/index.yml) |
| Microsoft.Notebooks | [Azure Notebooks](https://notebooks.azure.com/help/introduction) |

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -257,7 +257,7 @@ The following limits apply to [Azure role-based access control (Azure RBAC)](../

## Azure Spring Apps limits

To learn more about the limits for Azure Spring Apps, see [Quotas and service plans for Azure Spring Apps](../../spring-apps/enterprise/quotas.md).
To learn more about the limits for Azure Spring Apps, see [Quotas and service plans for Azure Spring Apps](../../spring-apps/basic-standard/quotas.md).

## Azure Storage limits

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -101,7 +101,7 @@ Applying locks can lead to unexpected results. Some operations, which don't seem

- A cannot-delete lock on a **Virtual Machine** that is protected by **Site Recovery** prevents certain resource links related to Site Recovery from being removed properly when you remove the protection or disable replication. If you plan to protect the VM again later, you need to remove the lock before disabling protection. If you don't remove the lock, you need to follow certain steps to clean up the stale links before you can protect the VM. For more information, see [Troubleshoot Azure VM replication](../../site-recovery/azure-to-azure-troubleshoot-errors.md#replication-not-enabled-on-vm-with-stale-resources-error-code-150226).

- For **Postgresql**, the virtual network shouldn't have any resource locks set at the virtual network or subnet level, as locks may interfere with network and DNS operations. Before creating the server in a virtual network, ensure you remove any delete or read-only locks from your virtual network and all subnets. You can reapply the locks after the server is created.
- For **PostgreSQL**, the virtual network shouldn't have any resource locks set at the virtual network or subnet level, as locks may interfere with network and DNS operations. Before creating the server in a virtual network, ensure you remove any delete or read-only locks from your virtual network and all subnets. You can reapply the locks after the server is created.

## Who can create or delete locks

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -119,7 +119,7 @@ Use the following steps to guide you through the process to onboard Azure Arc fo
}
```

3. Run the installation scripts. You can optionionally setup this preview from a Windows or Linux-based jump box/VM.
3. Run the installation scripts. You can optionally setup this preview from a Windows or Linux-based jump box/VM.

Run the following commands to execute the installation script.

Expand Down
2 changes: 1 addition & 1 deletion articles/container-apps/compare-options.md
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@ You can get started building your first container app [using the quickstarts](ge
[Azure Functions](../azure-functions/functions-overview.md) is a serverless Functions-as-a-Service (FaaS) solution. It's optimized for running event-driven applications using the functions programming model. It shares many characteristics with Azure Container Apps around scale and integration with events, but optimized for ephemeral functions deployed as either code or containers. The Azure Functions programming model provides productivity benefits for teams looking to trigger the execution of your functions on events and bind to other data sources. When building FaaS-style functions, Azure Functions is the ideal option. The Azure Functions programming model is available as a base container image, making it portable to other container based compute platforms allowing teams to reuse code as environment requirements change.

### Azure Spring Apps
[Azure Spring Apps](../spring-apps/enterprise/overview.md) is a fully managed service for Spring developers. If you want to run Spring Boot, Spring Cloud or any other Spring applications on Azure, Azure Spring Apps is an ideal option. The service manages the infrastructure of Spring applications so developers can focus on their code. Azure Spring Apps provides lifecycle management using comprehensive monitoring and diagnostics, configuration management, service discovery, CI/CD integration, blue-green deployments, and more.
[Azure Spring Apps](../spring-apps/basic-standard/overview.md) is a fully managed service for Spring developers. If you want to run Spring Boot, Spring Cloud or any other Spring applications on Azure, Azure Spring Apps is an ideal option. The service manages the infrastructure of Spring applications so developers can focus on their code. Azure Spring Apps provides lifecycle management using comprehensive monitoring and diagnostics, configuration management, service discovery, CI/CD integration, blue-green deployments, and more.

### Azure Red Hat OpenShift
[Azure Red Hat OpenShift](../openshift/intro-openshift.md) is an integrated product with Red Hat and Microsoft jointly engineered, operated, and supported. This collaboration provides an integrated product and support experience for running Kubernetes-powered OpenShift. With Azure Red Hat OpenShift, teams can choose their own registry, networking, storage, and CI/CD solutions. Alternatively, they can use the built-in solutions for automated source code management, container and application builds, deployments, scaling, health management, and more from OpenShift. If your team or organization is using OpenShift, Azure Red Hat OpenShift is an ideal option.
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@ Besides managed identities, another identity option is to create a security prin
Once you have an application security principal and followed above steps, [assign the permission to publish events to that identity](#assign-permission-to-a-security-principal-to-publish-events).

> [!NOTE]
> When you register an application in the portal, an [application object](/entra/identity-platform/app-objects-and-service-principals?tabs=browser#application-object) and a [service principal](/entra/identity-platform/app-objects-and-service-principals?tabs=browser#service-principal-object) are created automatically in your home tenant. Alternatively, you can use Microsot Graph to register your application. However, if you register or create an application using the Microsoft Graph APIs, creating the service principal object is a separate step.
> When you register an application in the portal, an [application object](/entra/identity-platform/app-objects-and-service-principals?tabs=browser#application-object) and a [service principal](/entra/identity-platform/app-objects-and-service-principals?tabs=browser#service-principal-object) are created automatically in your home tenant. Alternatively, you can use Microsoft Graph to register your application. However, if you register or create an application using the Microsoft Graph APIs, creating the service principal object is a separate step.
## Assign permission to a security principal to publish events

Expand Down
4 changes: 2 additions & 2 deletions articles/event-grid/authenticate-with-microsoft-entra-id.md
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@ Besides managed identities, another identity option is to create a security prin
Once you have an application security principal and followed above steps, [assign the permission to publish events to that identity](#assign-permission-to-a-security-principal-to-publish-events).

> [!NOTE]
> When you register an application in the portal, an [application object](/entra/identity-platform/app-objects-and-service-principals?tabs=browser#application-object) and a [service principal](/entra/identity-platform/app-objects-and-service-principals?tabs=browser#service-principal-object) are created automatically in your home tenant. Alternatively, you can use Microsot Graph to register your application. However, if you register or create an application using the Microsoft Graph APIs, creating the service principal object is a separate step.
> When you register an application in the portal, an [application object](/entra/identity-platform/app-objects-and-service-principals?tabs=browser#application-object) and a [service principal](/entra/identity-platform/app-objects-and-service-principals?tabs=browser#service-principal-object) are created automatically in your home tenant. Alternatively, you can use Microsoft Graph to register your application. However, if you register or create an application using the Microsoft Graph APIs, creating the service principal object is a separate step.

## Assign permission to a security principal to publish events
Expand Down Expand Up @@ -136,7 +136,7 @@ Microsoft Entra authentication provides a superior authentication support than t
Once you decide to use Microsoft Entra authentication, you can disable authentication based on access keys or SAS tokens.

> [!NOTE]
> Acess keys or SAS token authentication is a form of **local authentication**. you'll hear sometimes referring to "local auth" when discussing this category of authentication mechanisms that don't rely on Microsoft Entra ID. The API parameter used to disable local authentication is called, appropriately so, ``disableLocalAuth``.
> Access keys or SAS token authentication is a form of **local authentication**. you'll hear sometimes referring to "local auth" when discussing this category of authentication mechanisms that don't rely on Microsoft Entra ID. The API parameter used to disable local authentication is called, appropriately so, ``disableLocalAuth``.
### Azure portal

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -266,7 +266,7 @@ Details for the attributes specific to `Microsoft.Communication.AdvancedMessageA

| Attribute | Type | Nullable | Description |
|:---------------|:--------:|:--------:|---------------------------------------------|
| language | `string` | ✔️ | The languege detected. |
| language | `string` | ✔️ | The language detected. |
| confidenceScore | `float` | ✔️ | The confidence score of the language detected. |
| translation | `string` | ✔️ | The message translation. |

Expand Down
8 changes: 4 additions & 4 deletions articles/event-grid/configure-private-endpoints.md
Original file line number Diff line number Diff line change
Expand Up @@ -129,7 +129,7 @@ To create a private endpoint, use the [az network private-endpoint create](/cli/

```azurecli-interactive
az network private-endpoint create \
--resource-group <RESOURECE GROUP NAME> \
--resource-group <RESOURCE GROUP NAME> \
--name <PRIVATE ENDPOINT NAME> \
--vnet-name <VIRTUAL NETWORK NAME> \
--subnet <SUBNET NAME> \
Expand All @@ -147,7 +147,7 @@ For descriptions of the parameters used in the example, see documentation for [a
To delete a private endpoint, use the [az network private-endpoint delete](/cli/azure/network/private-endpoint?#az-network-private-endpoint-delete) method as shown in the following example:

```azurecli-interactive
az network private-endpoint delete --resource-group <RESOURECE GROUP NAME> --name <PRIVATE ENDPOINT NAME>
az network private-endpoint delete --resource-group <RESOURCE GROUP NAME> --name <PRIVATE ENDPOINT NAME>
```

> [!NOTE]
Expand All @@ -173,7 +173,7 @@ To create a private endpoint, use the [az network private-endpoint create](/cli/

```azurecli-interactive
az network private-endpoint create \
--resource-group <RESOURECE GROUP NAME> \
--resource-group <RESOURCE GROUP NAME> \
--name <PRIVATE ENDPOINT NAME> \
--vnet-name <VIRTUAL NETWORK NAME> \
--subnet <SUBNET NAME> \
Expand All @@ -191,7 +191,7 @@ For descriptions of the parameters used in the example, see documentation for [a
To delete a private endpoint, use the [az network private-endpoint delete](/cli/azure/network/private-endpoint?#az-network-private-endpoint-delete) method as shown in the following example:

```azurecli-interactive
az network private-endpoint delete --resource-group <RESOURECE GROUP NAME> --name <PRIVATE ENDPOINT NAME>
az network private-endpoint delete --resource-group <RESOURCE GROUP NAME> --name <PRIVATE ENDPOINT NAME>
```

> [!NOTE]
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@ For more information, see the following articles:

- In the URL, use the multitenant app object ID.
- For **Name**, provide a unique name for the federated client credential.
- For **Issuer**, use `https://login.microsoftonline.com/TENANTAID/v2.0` where `TENANTAID` is the ID of the tenant where the user-assigned identity is located.
- For **Issuer**, use `https://login.microsoftonline.com/TENANTID/v2.0` where `TENANTID` is the ID of the tenant where the user-assigned identity is located.
- For **Subject**, specify the client ID of the user-assigned identity.

Verify and wait for the API call to succeed.
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ The format used when storing dead-letter events is the [CloudEvents JSON format]
- `deliveryresult` - The last result during the last time the service attempted to deliver the event.
- `publishutc` - The UTC time at which the event was persisted and accepted (HTTP 200 OK, for example) by Event Grid.
- `deliveryattemptutc` - The UTC time of the last delivery attempt.
- `customDeliveryProperties` - Headers (custom push delivery properties) configured on the event subscription to go with every outgoing HTTP push delivery request. One or more of these custom properties might be present in the persisted dead-letter JSON. Custom properties identified as secrets aren't stored. This metadata are described using a separate object whose key name is `customDeliveryProperties`. The property key names inside that object and their values are exactly the same as the ones set in the event subscription. Here's an exmaple:
- `customDeliveryProperties` - Headers (custom push delivery properties) configured on the event subscription to go with every outgoing HTTP push delivery request. One or more of these custom properties might be present in the persisted dead-letter JSON. Custom properties identified as secrets aren't stored. This metadata are described using a separate object whose key name is `customDeliveryProperties`. The property key names inside that object and their values are exactly the same as the ones set in the event subscription. Here's an example:

```
Custom-Header-1: value1
Expand Down
2 changes: 1 addition & 1 deletion articles/event-grid/enable-diagnostic-logs-topic.md
Original file line number Diff line number Diff line change
Expand Up @@ -104,7 +104,7 @@ You can also enable collection of all **metrics** for the system topic.
```json
{
"time": "2019-11-01T00:17:13.4389048Z",
"resourceId": "/SUBSCRIPTIONS/SAMPLE-SUBSCTIPTION-ID /RESOURCEGROUPS/SAMPLE-RESOURCEGROUP-NAME/PROVIDERS/MICROSOFT.EVENTGRID/TOPICS/SAMPLE-TOPIC-NAME ",
"resourceId": "/SUBSCRIPTIONS/SAMPLE-SUBSCRIPTION-ID /RESOURCEGROUPS/SAMPLE-RESOURCEGROUP-NAME/PROVIDERS/MICROSOFT.EVENTGRID/TOPICS/SAMPLE-TOPIC-NAME ",
"eventSubscriptionName": "SAMPLEDESTINATION",
"category": "DeliveryFailures",
"operationName": "Deliver",
Expand Down
2 changes: 1 addition & 1 deletion articles/event-grid/event-schema-compatibility.md
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ ms.custom: FY25Q1-Linter
# Event schema compatibility
When a topic is created, an incoming event schema is defined. And, when a subscription is created, an outgoing event schema is defined. This article shows you the compatibility between input and output schema that's allowed when creating an event subscription.

## Input schema to outupt schema
## Input schema to output schema
The following table shows you the compatibility allowed when creating a subscription.

| Incoming event schema | Outgoing event schema | Supported |
Expand Down
4 changes: 2 additions & 2 deletions articles/event-grid/event-schema-resources.md
Original file line number Diff line number Diff line change
Expand Up @@ -243,7 +243,7 @@ This section shows the `CreatedOrUpdated` event generated when an Azure Storage
"data": {
"resourceInfo": {
"tags": {},
"id": "/subscriptions/{subcription-id}/resourceGroups/{rg-name}/providers/Microsoft.Storage/storageAccounts/{storageAccount-name}",
"id": "/subscriptions/{subscription-id}/resourceGroups/{rg-name}/providers/Microsoft.Storage/storageAccounts/{storageAccount-name}",
"name": "StorageAccount-name",
"type": "Microsoft.Storage/storageAccounts",
"location": "eastus",
Expand Down Expand Up @@ -320,7 +320,7 @@ This section shows the `CreatedOrUpdated` event generated when an Azure Storage
"data": {
"resourceInfo": {
"tags": {},
"id": "/subscriptions/{subcription-id}/resourceGroups/{rg-name}/providers/Microsoft.Storage/storageAccounts/{storageAccount-name}",
"id": "/subscriptions/{subscription-id}/resourceGroups/{rg-name}/providers/Microsoft.Storage/storageAccounts/{storageAccount-name}",
"name": "StorageAccount-name",
"type": "Microsoft.Storage/storageAccounts",
"location": "eastus",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -128,7 +128,7 @@ Here's a sample `AvailabilityStatusChanged` event. Notice that the `type` is set
"time": "2024-02-22T01:40:17.6532683Z",
"data": {
"resourceInfo": {
"id": "/subscriptions/sample-subscription/resourceGroups/sample-rg/providers/Microsoft.Compute/virtualMachines/sample-machinee/providers/Microsoft.ResourceHealth/availabilityStatuses/current",
"id": "/subscriptions/sample-subscription/resourceGroups/sample-rg/providers/Microsoft.Compute/virtualMachines/sample-machine/providers/Microsoft.ResourceHealth/availabilityStatuses/current",
"name": "current",
"type": "Microsoft.ResourceHealth/availabilityStatuses",
"properties": {
Expand Down
2 changes: 1 addition & 1 deletion articles/event-grid/manage-event-delivery.md
Original file line number Diff line number Diff line change
Expand Up @@ -75,7 +75,7 @@ New-AzEventGridSubscription `
To turn off dead-lettering, rerun the command to create the event subscription but don't provide a value for `DeadLetterEndpoint`. You don't need to delete the event subscription.

> [!NOTE]
> If you are using Azure Poweshell on your local machine, use Azure PowerShell version 1.1.0 or greater. Download and install the latest Azure PowerShell from [Azure downloads](https://azure.microsoft.com/downloads/).
> If you are using Azure PowerShell on your local machine, use Azure PowerShell version 1.1.0 or greater. Download and install the latest Azure PowerShell from [Azure downloads](https://azure.microsoft.com/downloads/).
## Set retry policy

Expand Down
Loading

0 comments on commit 15b598a

Please sign in to comment.