Skip to content

Commit 0e4215a

Browse files
committed
Merge branch 'main' of https://github.com/MicrosoftDocs/azure-docs-pr into rolyon-rbac-elevate-access-manage-users
2 parents d710e31 + 1c1ac0b commit 0e4215a

File tree

1,003 files changed

+5340
-3933
lines changed

Some content is hidden

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

1,003 files changed

+5340
-3933
lines changed

.openpublishing.redirection.json

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4024,6 +4024,26 @@
40244024
"source_path_from_root": "/articles/managed-grafana/how-to-transition-domain.md",
40254025
"redirect_url": "/azure/managed-grafana/overview",
40264026
"redirect_document_id": false
4027+
},
4028+
{
4029+
"source_path_from_root": "/articles/load-balancer/move-across-regions-external-load-balancer-portal.md",
4030+
"redirect_url": "/azure/load-balancer/move-across-regions-azure-load-balancer",
4031+
"redirect_document_id": false
4032+
},
4033+
{
4034+
"source_path_from_root": "/articles/load-balancer/move-across-regions-external-load-balancer-powershell.md",
4035+
"redirect_url": "/azure/load-balancer/move-across-regions-azure-load-balancer",
4036+
"redirect_document_id": false
4037+
},
4038+
{
4039+
"source_path_from_root": "/articles/load-balancer/move-across-regions-internal-load-balancer-portal.md",
4040+
"redirect_url": "/azure/load-balancer/move-across-regions-azure-load-balancer",
4041+
"redirect_document_id": false
4042+
},
4043+
{
4044+
"source_path_from_root": "/articles/load-balancer/move-across-regions-internal-load-balancer-powershell.md",
4045+
"redirect_url": "/azure/load-balancer/move-across-regions-azure-load-balancer",
4046+
"redirect_document_id": false
40274047
}
40284048
]
40294049
}

articles/api-center/index.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,7 @@ landingContent:
6161
- linkListType: how-to-guide
6262
links:
6363
- text: Analyze APIs using linting rules
64-
url: enable-api-analysis-linting.md
64+
url: enable-managed-api-analysis-linting.md
6565
- linkListType: concept
6666
links:
6767
- text: Use metadata for governance

articles/api-management/inject-vnet-v2.md

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -68,9 +68,11 @@ The subnet needs to be delegated to the **Microsoft.Web/hostingEnvironments** se
6868
6969
For more information about configuring subnet delegation, see [Add or remove a subnet delegation](../virtual-network/manage-subnet-delegation.md).
7070

71+
[!INCLUDE [api-management-virtual-network-address-prefix](../../includes/api-management-virtual-network-address-prefix.md)]
72+
7173
### Permissions
7274

73-
You must have at least the following role-based access control permissions on the subnet or at a higher level to configure virtual network integration:
75+
You must have at least the following role-based access control permissions on the subnet or at a higher level to configure virtual network injection:
7476

7577
| Action | Description |
7678
|-|-|
@@ -86,13 +88,11 @@ When you [create](get-started-create-service-instance.md) a Premium v2 instance
8688

8789
1. In the **Create API Management service** wizard, select the **Networking** tab.
8890
1. In **Connectivity type**, select **Virtual network**.
89-
1. In **Type**, select **Internal**.
90-
1. In **Configure virtual networks**, select the virtual network and the delegated subnet that you want to integrate.
91-
92-
Optionally, provide a public IP address resource if you want to own and control an IP address that's used only for outbound connection to the internet.
91+
1. In **Type**, select **Injection**.
92+
1. In **Configure virtual networks**, select the virtual network and the delegated subnet that you want to inject.
9393
1. Complete the wizard to create the API Management instance.
9494

95-
## DNS settings for integration with private IP address
95+
## DNS settings for access to private IP address
9696

9797
When a Premium v2 API Management instance is injected in a virtual network, you have to manage your own DNS to enable inbound access to API Management.
9898

articles/app-service/configure-ssl-certificate.md

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -341,6 +341,9 @@ This is only supported for Windows container apps in multi-tenant App Service. I
341341
### Can I load a private CA certificate in my App Service Trusted Root Store?
342342
You can load your own CA certificate into the Trusted Root Store in [App Service Environment version 3](./environment/overview-certificates.md). You can't modify the list of Trusted Root Certificates in App Service (multi-tenant). For more information on App Service multi-tenant vs. single-tenant, see [App Service Environment v3 and App Service public multitenant comparison](./environment/ase-multi-tenant-comparison.md).
343343

344+
### Can App Service Certificate be used for other services?
345+
Yes, certificates purchased via App Service Certificate can be exported and used with Application Gateway or other services. Refer to the following blog article for more information: [Creating a local PFX copy of App Service Certificate](https://azure.github.io/AppService/2017/02/24/Creating-a-local-PFX-copy-of-App-Service-Certificate.html).
346+
344347
## More resources
345348

346349
* [Secure a custom DNS name with a TLS/SSL binding in Azure App Service](configure-ssl-bindings.md)

articles/app-service/environment/auto-migration.md

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -74,7 +74,7 @@ The following errors might be displayed in the portal if you're ineligible for a
7474

7575
## What to do if your App Service Environment is suspended
7676

77-
If your App Service Environment is suspended, you have two options.
77+
If your App Service Environment is suspended, you have three options.
7878

7979
### Unsuspend and self-migrate
8080

@@ -88,6 +88,14 @@ If you want to expedite migration, you can resume/unsuspend your environment as
8888

8989
:::image type="content" source="./media/migration/resume-as-asev3.png" alt-text="Screenshot that shows the button on the Migration page where you can resume as an App Service Environment v3.":::
9090

91+
### Delete your App Service Environment
92+
93+
If you no longer need your App Service Environment, you can delete your environment using the following CLI command. Replace the placeholders for the subscription id, environment name, and resource group with your values for the App Service Environment that you want to delete. The Azure CLI is the only available method for deleting your environment. If you haven't previously used the Azure CLI, [install the Azure CLI](/cli/azure/install-azure-cli) or use [Azure Cloud Shell](https://shell.azure.com/) and use a Bash shell. Deleting your environment will also delete the associated apps and App Service plans. This action is irreversible.
94+
95+
```azurecli
96+
az rest --method delete --url "https://management.azure.com/subscriptions/<SUBSCRIPTION-ID>/resourceGroups/<RESOURCE-GROUP>/providers/Microsoft.Web/hostingEnvironments/<ASE-NAME>?api-version=2020-12-01" --url-parameters forceDelete=true --verbose
97+
```
98+
9199
## Features to limit the effects of auto-migrations
92100

93101
To limit the effect of auto-migrations, we implemented the following features to the auto-migration feature.

articles/app-service/tutorial-python-postgresql-app.md

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -289,6 +289,22 @@ The creation wizard generated the connectivity variables for you already as [app
289289
:::column:::
290290
:::column-end:::
291291
:::row-end:::
292+
:::row:::
293+
:::column span="2":::
294+
**Step 4:** Back in the **Configuration** page, select **New application setting**. Name the setting `SECRET_KEY`. Paste the value from the previous value. Select **OK**.
295+
:::column-end:::
296+
:::column:::
297+
:::image type="content" source="./media/tutorial-python-postgresql-app/azure-portal-app-service-app-setting.png" alt-text="A screenshot showing how to set the SECRET_KEY app setting in the Azure portal (Django)." lightbox="./media/tutorial-python-postgresql-app/azure-portal-app-service-app-setting.png":::
298+
:::column-end:::
299+
:::row-end:::
300+
:::row:::
301+
:::column span="2":::
302+
**Step 5:** Select **Save**.
303+
:::column-end:::
304+
:::column:::
305+
:::image type="content" source="./media/tutorial-python-postgresql-app/azure-portal-app-service-app-setting-save.png" alt-text="A screenshot showing how to save the SECRET_KEY app setting in the Azure portal (Django)." lightbox="./media/tutorial-python-postgresql-app/azure-portal-app-service-app-setting-save.png":::
306+
:::column-end:::
307+
:::row-end:::
292308

293309
### [Django](#tab/django)
294310

articles/automation/change-tracking/overview-monitoring-agent.md

Lines changed: 15 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ title: Azure Automation Change Tracking and Inventory overview using Azure Monit
33
description: This article describes the Change Tracking and Inventory feature using Azure monitoring agent, which helps you identify software and Microsoft service changes in your environment.
44
services: automation
55
ms.subservice: change-inventory-management
6-
ms.date: 11/15/2024
6+
ms.date: 12/09/2024
77
ms.topic: overview
88
ms.service: azure-automation
99
---
@@ -21,6 +21,20 @@ This article explains on the latest version of change tracking support using Azu
2121
> - [FIM with Change Tracking and Inventory using AMA](https://learn.microsoft.com/azure/defender-for-cloud/migrate-file-integrity-monitoring#migrate-from-fim-over-ama).
2222
> - [FIM with Change Tracking and Inventory using MMA](https://learn.microsoft.com/azure/defender-for-cloud/migrate-file-integrity-monitoring#migrate-from-fim-over-mma).
2323
24+
## What is Change Tracking & Inventory
25+
26+
Azure Change Tracking & Inventory service enhances the auditing and governance for in-guest operations by monitoring changes and providing detailed inventory logs for servers across Azure, on-premises, and other cloud environments.
27+
28+
1. **Change Tracking**
29+
30+
a. Monitors changes, including modifications to files, registry keys, software installations, and Windows services or Linux daemons.</br>
31+
b. Provides detailed logs of what and when the changes were made, who made them, enabling you to quickly detect configuration drifts or unauthorized changes.
32+
33+
1. **Inventory**
34+
35+
a. Collects and maintains an updated list of installed software, operating system details, and other server configurations in linked LA workspace </br>
36+
b. Helps create an overview of system assets, which is useful for compliance, audits, and proactive maintenance.
37+
2438
## Support matrix
2539

2640
|**Component**| **Applies to**|

articles/azure-cache-for-redis/cache-how-to-premium-vnet.md

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -27,9 +27,10 @@ ms.date: 08/29/2023
2727
- failure of replica node to replicate data from primary node
2828
- potential data loss
2929
- failure of management operations like scaling
30+
- intermittent or complete SSL/TLS failures
3031
- in the most severe scenarios, loss of availability
3132
- VNet injected caches are only available for Premium-tier Azure Cache for Redis, not other tiers.
32-
- When using a VNet injected cache, you must change your VNet to cache dependencies such as CRLs/PKI, AKV, Azure Storage, Azure Monitor, and more.
33+
- When using a VNet injected cache, you must change your VNet to cache dependencies such as Certificate Revocation Lists/Public Key Instructure, Azure Key Vault, Azure Storage, Azure Monitor, and more.
3334
- You can't inject an existing Azure Cache for Redis instance into a Virtual Network. You must select this option when you _create_ the cache.
3435

3536
## Set up virtual network support
@@ -166,9 +167,9 @@ There are network connectivity requirements for Azure Cache for Redis that might
166167

167168
- Outbound network connectivity to Azure Key Vault endpoints worldwide. Azure Key Vault endpoints resolve under the DNS domain `vault.azure.net`.
168169
- Outbound network connectivity to Azure Storage endpoints worldwide. Endpoints located in the same region as the Azure Cache for Redis instance and storage endpoints located in _other_ Azure regions are included. Azure Storage endpoints resolve under the following DNS domains: `table.core.windows.net`, `blob.core.windows.net`, `queue.core.windows.net`, and `file.core.windows.net`.
169-
- Outbound network connectivity to `ocsp.digicert.com`, `crl4.digicert.com`, `ocsp.msocsp.com`, `mscrl.microsoft.com`, `crl3.digicert.com`, `cacerts.digicert.com`, `oneocsp.microsoft.com`, and `crl.microsoft.com`. This connectivity is needed to support TLS/SSL functionality.
170+
- Outbound network connectivity to `ocsp.digicert.com`, `crl4.digicert.com`, `ocsp.msocsp.com`, `mscrl.microsoft.com`, `crl3.digicert.com`, `cacerts.digicert.com`, `oneocsp.microsoft.com`, and `crl.microsoft.com`, `cacerts.geotrust.com`, `www.microsoft.com`, `cdp.geotrust.com`, `status.geotrust.com`. This connectivity is needed to support TLS/SSL functionality.
170171
- The DNS configuration for the virtual network must be able to resolve all of the endpoints and domains mentioned in the earlier points. These DNS requirements can be met by ensuring a valid DNS infrastructure is configured and maintained for the virtual network.
171-
- Outbound network connectivity to the following Azure Monitor endpoints, which resolve under the following DNS domains: `shoebox2-black.shoebox2.metrics.nsatc.net`, `north-prod2.prod2.metrics.nsatc.net`, `azglobal-black.azglobal.metrics.nsatc.net`, `shoebox2-red.shoebox2.metrics.nsatc.net`, `east-prod2.prod2.metrics.nsatc.net`, `azglobal-red.azglobal.metrics.nsatc.net`, `shoebox3.prod.microsoftmetrics.com`, `shoebox3-red.prod.microsoftmetrics.com`, `shoebox3-black.prod.microsoftmetrics.com`, `azredis-red.prod.microsoftmetrics.com` and `azredis-black.prod.microsoftmetrics.com`.
172+
- Outbound network connectivity to the following Azure Monitor endpoints, which resolve under the following DNS domains: `shoebox3.prod.microsoftmetrics.com`, `shoebox3-red.prod.microsoftmetrics.com`, `shoebox3-black.prod.microsoftmetrics.com`, `azredis.prod.microsoftmetrics.com`, `azredis-red.prod.microsoftmetrics.com`, and `azredis-black.prod.microsoftmetrics.com`.
172173

173174
### How can I verify that my cache is working in a virtual network?
174175

@@ -206,6 +207,8 @@ If you're unable to resolve the DNS name, some client libraries include configur
206207

207208
`10.128.2.84:6380,password=xxxxxxxxxxxxxxxxxxxx,ssl=True,abortConnect=False;sslHost=[mycachename].redis.cache.windows.net`
208209

210+
In addition, if the subnet where Azure Cache for Redis is hosted is blocking TCP outbound connections over port 80 for SSL/TLS functionality, clients might experience intermittent TLS certificate validation errors.
211+
209212
### Can I use virtual networks with a standard or basic cache?
210213

211214
Virtual networks can only be used with Premium-tier caches.

articles/azure-cache-for-redis/cache-how-to-scale.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -120,7 +120,7 @@ For more information on scaling with PowerShell, see [To scale an Azure Cache fo
120120

121121
#### Scale up and down using Azure CLI
122122

123-
To scale your Azure Cache for Redis instances using Azure CLI, call the [az redis update](/cli/azure/redis#az-redis-update) command. Use the `sku.capcity` property to scale within a tier, for example from a Standard C0 to Standard C1 cache:
123+
To scale your Azure Cache for Redis instances using Azure CLI, call the [az redis update](/cli/azure/redis#az-redis-update) command. Use the `sku.capacity` property to scale within a tier, for example from a Standard C0 to Standard C1 cache:
124124

125125
```azurecli
126126
az redis update --cluster-name myCache --resource-group myGroup --set "sku.capacity"="2"

articles/azure-cache-for-redis/cache-how-to-upgrade.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -86,7 +86,7 @@ To defer upgrades to your cache, navigate to the **Advanced Settings** on the Re
8686
8787
## Considerations before upgrading Redis versions
8888

89-
Each new Redis version is intended to be a seamless upgrade from previous versions with backwards-compatibilty as a design principle. However, small changes and bug fixes do occur which can cause application changes. Being conscious of these changes is always a good idea.
89+
Each new Redis version is intended to be a seamless upgrade from previous versions with backwards-compatibility as a design principle. However, small changes and bug fixes do occur which can cause application changes. Being conscious of these changes is always a good idea.
9090

9191
### Client version
9292

0 commit comments

Comments
 (0)