Skip to content

Commit 71bfa96

Browse files
committed
Merge branch 'main' of https://github.com/MicrosoftDocs/azure-docs-pr into rs-nexthop
2 parents 47d40c7 + bfd49fd commit 71bfa96

File tree

87 files changed

+765
-599
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

87 files changed

+765
-599
lines changed

.openpublishing.redirection.json

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5970,5 +5970,10 @@
59705970
"redirect_url": "/azure/nat-gateway/nat-overview",
59715971
"redirect_document_id": false
59725972
},
5973+
{
5974+
"source_path": "articles/sentinel/kusto-resources.md",
5975+
"redirect_url": "/kusto/query/kql-learning-resources?view=microsoft-sentinel?view=microsoft-sentinel&preserve-view=true&toc=/azure/sentinel/TOC.json&bc=/azure/sentinel/breadcrumb/toc.json",
5976+
"redirect_document_id": false
5977+
}
59735978
]
59745979
}

articles/api-management/api-management-howto-properties.md

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ ms.custom: engagement-fy23, devx-track-azurecli
1717

1818
[API Management policies](api-management-howto-policies.md) are a powerful capability of the system that allow the publisher to change the behavior of the API through configuration. Policies are a collection of statements that are executed sequentially on the request or response of an API. Policy statements can be constructed using literal text values, policy expressions, and named values.
1919

20-
*Named values* are a global collection of name/value pairs in each API Management instance. There is no imposed limit on the number of items in the collection. Named values can be used to manage constant string values and secrets across all API configurations and policies.
20+
*Named values* are a global collection of name/value pairs in each API Management instance. There's no imposed limit on the number of items in the collection. Named values can be used to manage constant string values and secrets across all API configurations and policies.
2121

2222
:::image type="content" source="media/api-management-howto-properties/named-values.png" alt-text="Named values in the Azure portal":::
2323

@@ -44,10 +44,10 @@ Using key vault secrets is recommended because it helps improve API Management s
4444
* Secrets updated in the key vault are automatically rotated in API Management. After update in the key vault, a named value in API Management is updated within 4 hours. You can also manually refresh the secret using the Azure portal or via the management REST API.
4545

4646
> [!NOTE]
47-
> The secrets stored in Azure Key Vault must be between 1 and 4096 characters, as API Management cannot retrieve values that exceed this limit.
47+
> The secrets stored in Azure Key Vault must be between 1 and 4096 characters, as API Management can't retrieve values that exceed this limit.
4848
## Prerequisites
4949

50-
* If you have not created an API Management service instance yet, see [Create an API Management service instance](get-started-create-service-instance.md).
50+
* If you haven't created an API Management service instance yet, see [Create an API Management service instance](get-started-create-service-instance.md).
5151

5252
### Prerequisites for key vault integration
5353

@@ -59,8 +59,7 @@ Using key vault secrets is recommended because it helps improve API Management s
5959

6060
- Enable a system-assigned or user-assigned [managed identity](api-management-howto-use-managed-service-identity.md) in the API Management instance.
6161

62-
[!INCLUDE [api-management-key-vault-access](../../includes/api-management-key-vault-access.md)]
63-
62+
[!INCLUDE [api-management-key-vault-secret-access](../../includes/api-management-key-vault-secret-access.md)]
6463

6564
[!INCLUDE [api-management-key-vault-network](../../includes/api-management-key-vault-network.md)]
6665

@@ -134,7 +133,7 @@ az apim nv show --resource-group apim-hello-word-resource-group \
134133
--service-name apim-hello-world --named-value-id named_value_01
135134
```
136135

137-
This example is a secret value. The previous command does not return the value. To see the value, run the [az apim nv show-secret](/cli/azure/apim/nv#az-apim-nv-show-secret) command:
136+
This example is a secret value. The previous command doesn't return the value. To see the value, run the [az apim nv show-secret](/cli/azure/apim/nv#az-apim-nv-show-secret) command:
138137

139138
```azurecli
140139
az apim nv show-secret --resource-group apim-hello-word-resource-group \

articles/api-management/api-management-howto-use-managed-service-identity.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -123,9 +123,9 @@ The `tenantId` property identifies which Microsoft Entra tenant the identity bel
123123
124124
## Configure Key Vault access using a managed identity
125125

126-
The following configurations are needed for API Management to access secrets and certificates from an Azure key vault.
126+
The following configurations are needed for API Management to access certificates from an Azure key vault.
127127

128-
[!INCLUDE [api-management-key-vault-access](../../includes/api-management-key-vault-access.md)]
128+
[!INCLUDE [api-management-key-vault-certificate-access](../../includes/api-management-key-vault-certificate-access.md)]
129129

130130
[!INCLUDE [api-management-key-vault-network](../../includes/api-management-key-vault-network.md)]
131131

articles/api-management/backends.md

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -52,6 +52,8 @@ After creating a backend, you can reference the backend in your APIs. Use th
5252
[...]
5353
<policies/>
5454
```
55+
> [!NOTE]
56+
> Alternatively, you can use `base-url`. Usually, the format is `https://backend.com/api`. Avoid adding a slash at the end to prevent misconfigurations. Typically, the `base-url` and HTTP(S) endpoint value in the backend should match to enable seamless integration between frontend and backend. Note that API Management instances append the backend service name to the `base-url`.
5557
5658
You can use conditional logic with the `set-backend-service` policy to change the effective backend based on location, gateway that was called, or other expressions.
5759

articles/api-management/configure-custom-domain.md

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -89,8 +89,7 @@ To fetch a TLS/SSL certificate, API Management must have the list and get secret
8989
1. On the **Managed identities** page of your API Management instance, enable a system-assigned or user-assigned [managed identity](api-management-howto-use-managed-service-identity.md). Note the principal ID on that page.
9090
1. Assign permissions to the managed identity to access the key vault. Use steps in the following section.
9191

92-
[!INCLUDE [api-management-key-vault-access](../../includes/api-management-key-vault-access.md)]
93-
92+
[!INCLUDE [api-management-key-vault-certificate-access](../../includes/api-management-key-vault-certificate-access.md)]
9493

9594
If the certificate is set to `autorenew` and your API Management tier has an SLA (that is, in all tiers except the Developer tier), API Management will pick up the latest version automatically, without downtime to the service.
9695

articles/app-service/environment/how-to-upgrade-preference.md

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -32,10 +32,10 @@ In smaller regions, Early and Late upgrade preferences might be very close to ea
3232

3333
## Manual upgrade preference
3434

35-
Manual upgrade preference gives you the option to receive a notification when an upgrade is available. The availability is also visible in the Azure portal. After the upgrade is available, you'll have 15 days to start the upgrade process. If you don't start the upgrade within the 15 days, the upgrade is processed with the remaining automatic upgrades in the region.
35+
Manual upgrade preference gives you the option to receive a notification when an upgrade is available. The availability is also visible in the Azure portal. After the upgrade is available, you'll typically have 15 days to start the upgrade process. If you don't start the upgrade within the 15 days, the upgrade is processed with the remaining automatic upgrades in the region.
3636

37-
> [!IMPORTANT]
38-
> In rare cases, you might see an upgrade is available in the **Configuration** page for your App Service Environment, but you don't receive a **Service Health** notification (if you [configure notifications](#configure-notifications)). If you don't receive a Service Health notification, this available upgrade isn't required and the 15-day time limit doesn't apply. This is a known bug that we are working to fix.
37+
> [!NOTE]
38+
> Our goal is to provide you with a 15-day notice before the upgrade is applied automatically. In rare cases, the notice period is less than 15 days. The "End Time" for the planned maintenance event that you receive always indicates the end of the notice period.
3939
>
4040
4141
Upgrades normally don't affect the availability of your apps. The upgrade adds extra instances to ensure that the same capacity is available during upgrade. Patched and restarted instances are added back in rotation, and when you have workloads sensitive to restarts you should plan to start the maintenance during non-business hours. The full upgrade process normally finishes within 18 hours, but could take longer. Once the upgrade is started the upgrade runs until it's complete and isn't paused during standard business hours.
@@ -44,6 +44,10 @@ Upgrades normally don't affect the availability of your apps. The upgrade adds e
4444
> In rare cases, the upgrade availability might be impacted by a security hotfix superseding the planned upgrade, or a regression found in the planned upgrade before it has been applied to your instance. In these rare cases, the available upgrade will be removed and will transition to automatic upgrade.
4545
>
4646
47+
> [!IMPORTANT]
48+
> In rare cases, you might see an upgrade is available in the **Configuration** page for your App Service Environment, but you don't receive a **Service Health** notification (if you [configure notifications](#configure-notifications)). If you don't receive a Service Health notification, this available upgrade isn't required and the 15-day time limit doesn't apply. This is a known bug that we are working to fix.
49+
>
50+
4751
## Configure notifications
4852

4953
When an upgrade is available, Azure adds a planned maintenance event in the Service Health dashboard of Azure Monitor. To see past notifications in the [Azure portal](https://portal.azure.com), navigate to **Home > Monitor > Service Health > Planned maintenance**. To make it easy to find the relevant events, select the **Service** box and check only the App Service type. You can also filter by subscription and region.

articles/app-service/includes/configure-azure-storage/azure-storage-linux-container-pivot.md

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -218,6 +218,9 @@ To validate that the Azure Storage is mounted successfully for the app:
218218
1. Regenerate **key2**.
219219
1. In the storage mount configuration, update the access the key to use the regenerated **key2**.
220220
1. Regenerate **key1**.
221+
222+
#### Configuration
223+
- If needing to use a real time file system, where changes to alter, add, or remove files are expected to be shown quickly, then use _Azure Files_ as the storage type when mounting storage. Azure Blob should be used when files are static and aren't expected to be changed.
221224
222225
#### Troubleshooting
223226

articles/azure-cache-for-redis/cache-how-to-redis-cli-tool.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -107,7 +107,7 @@ You're now connected to your Azure Cache for Redis instance using the _redis-cli
107107
While the _redis-cli_ is a useful tool, you can connect to your cache in other ways for troubleshooting or testing:
108108

109109
- Azure Cache for Redis offers a [Redis Console](cache-configure.md#redis-console) built into the Azure portal where you can issue commands without needing to install the command-line tool. The Redis Console feature is currently only available in the Basic, Standard, and Premium tiers.
110-
- [RedisInsight](https://redis.com/redis-enterprise/redis-insight/) is a rich open source graphical tool for issuing Redis commands and viewing the contents of a Redis instance. It works with Azure Cache for Redis and is supported on Linux, Windows, and macOS.
110+
- [RedisInsight](https://redis.io/insight/) is a rich open source graphical tool for issuing Redis commands and viewing the contents of a Redis instance. It works with Azure Cache for Redis and is supported on Linux, Windows, and macOS.
111111

112112
## Related content
113113

articles/azure-health-insights/includes/example-inference-complete-order-discrepancy-json-request.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -79,7 +79,7 @@ ms.service: azure-health-insights
7979
"code": {
8080
"coding": [
8181
{
82-
"system": "Http://hl7.org/fhir/ValueSet/cpt-all",
82+
"system": "http://hl7.org/fhir/ValueSet/cpt-all",
8383
"code": "76856",
8484
"display": "USPELVIS - US PELVIS COMPLETE"
8585
}

articles/azure-health-insights/includes/example-inference-radiology-procedure-json-request.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -79,7 +79,7 @@ ms.service: azure-health-insights
7979
"code": {
8080
"coding": [
8181
{
82-
"system": "Http://hl7.org/fhir/ValueSet/cpt-all",
82+
"system": "http://hl7.org/fhir/ValueSet/cpt-all",
8383
"code": "70460",
8484
"display": "Ct head/brain w/dye"
8585
}

0 commit comments

Comments
 (0)