Skip to content

Commit d194ef0

Browse files
committed
Merge branch 'main' of github.com:MicrosoftDocs/azure-docs-pr
2 parents 5d28803 + 1c43173 commit d194ef0

File tree

2,931 files changed

+46357
-27145
lines changed

Some content is hidden

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

2,931 files changed

+46357
-27145
lines changed

.openpublishing.publish.config.json

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1189,6 +1189,12 @@
11891189
"url": "https://github.com/Azure-Samples/explore-iot-operations",
11901190
"branch": "main",
11911191
"branch_mapping": {}
1192+
},
1193+
{
1194+
"path_to_root": "SupportArticles-docs",
1195+
"url": "https://github.com/MicrosoftDocs/SupportArticles-docs",
1196+
"branch": "main",
1197+
"branch_mapping": {}
11921198
}
11931199
],
11941200
"branch_target_mapping": {

.openpublishing.redirection.azure-monitor.json

Lines changed: 26 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6664,6 +6664,21 @@
66646664
"redirect_url": "/azure/azure-monitor/monitor-azure-monitor-reference",
66656665
"redirect_document_id": false
66666666
},
6667+
{
6668+
"source_path_from_root": "/articles/azure-monitor/ai-ops/responsible-ai-faq.md",
6669+
"redirect_url": "/azure/copilot/overview",
6670+
"redirect_document_id": false
6671+
},
6672+
{
6673+
"source_path_from_root": "/articles/azure-monitor/ai-ops/investigator-overview.md",
6674+
"redirect_url": "/azure/copilot/overview",
6675+
"redirect_document_id": false
6676+
},
6677+
{
6678+
"source_path_from_root": "/articles/azure-monitor/ai-ops/investigate-alert-instance.md",
6679+
"redirect_url": "/azure/copilot/overview",
6680+
"redirect_document_id": false
6681+
},
66676682
{
66686683
"source_path_from_root": "/articles/azure-monitor/azure-monitor-monitoring-reference.md",
66696684
"redirect_url": "/azure/azure-monitor/monitor-azure-monitor-reference",
@@ -6688,7 +6703,18 @@
66886703
"source_path_from_root": "/articles/azure-monitor/agents/resource-manager-data-collection-rules.md",
66896704
"redirect_url": "/azure/azure-monitor/essentials/data-collection-rule-create-edit?tabs=arm#manually-create-a-dcr",
66906705
"redirect_document_id": false
6706+
},
6707+
{
6708+
"source_path_from_root": "/articles/azure-monitor/essentials/remote-write-prometheus.md",
6709+
"redirect_url": "/azure/azure-monitor/essentials/prometheus-remote-write-virtual-machines",
6710+
"redirect_document_id": false
6711+
},
6712+
{
6713+
"source_path_from_root": "/articles/azure-monitor/essentials/prometheus-get-started.md",
6714+
"redirect_url": "/azure/azure-monitor/essentials/prometheus-metrics-overview",
6715+
"redirect_document_id": false
66916716
}
6717+
66926718

66936719
]
66946720
}

.openpublishing.redirection.defender-for-cloud.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -711,7 +711,7 @@
711711
"redirect_document_id": true
712712
},
713713
{
714-
"source_path_from_root": "/articles/security-center/update-regulatory-compliance-packages.md",
714+
"source_path_from_root": "/articles/security-center/update-regulatory-compliance-packages.yml",
715715
"redirect_url": "/azure/defender-for-cloud/update-regulatory-compliance-packages",
716716
"redirect_document_id": true
717717
},
@@ -721,7 +721,7 @@
721721
"redirect_document_id": true
722722
},
723723
{
724-
"source_path_from_root": "/articles/security-center/workflow-automation.md",
724+
"source_path_from_root": "/articles/security-center/workflow-automation.yml",
725725
"redirect_url": "/azure/defender-for-cloud/workflow-automation",
726726
"redirect_document_id": true
727727
},

.openpublishing.redirection.defender-for-iot.json

Lines changed: 32 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,35 @@
11
{
2-
"redirections": [
2+
"redirections": [
3+
{
4+
"source_path_from_root": "/articles/defender-for-iot/device-builders/how-to-azure-rtos-security-module.md",
5+
"redirect_url": "/azure/defender-for-iot/device-builders/how-to-threadx-security-module",
6+
"redirect_document_id": false
7+
},
8+
{
9+
"source_path_from_root": "/articles/defender-for-iot/device-builders/iot-security-azure-rtos.md",
10+
"redirect_url": "/azure/defender-for-iot/device-builders/iot-security-threadx",
11+
"redirect_document_id": false
12+
},
13+
{
14+
"source_path_from_root": "/articles/defender-for-iot/device-builders/azure-rtos-security-module-api.md",
15+
"redirect_url": "/azure/defender-for-iot/device-builders/threadx-security-module-api",
16+
"redirect_document_id": false
17+
},
18+
{
19+
"source_path_from_root": "/articles/defender-for-iot/device-builders/concept-rtos-security-alerts-recommendations.md",
20+
"redirect_url": "/azure/defender-for-iot/device-builders/concept-threadx-security-alerts-recommendations",
21+
"redirect_document_id": false
22+
},
23+
{
24+
"source_path_from_root": "/articles/defender-for-iot/device-builders/concept-rtos-security-module.md",
25+
"redirect_url": "/azure/defender-for-iot/device-builders/concept-threadx-security-module",
26+
"redirect_document_id": false
27+
},
28+
{
29+
"source_path_from_root": "/articles/defender-for-iot/device-builders/how-to-rtos-security-module.md",
30+
"redirect_url": "/azure/defender-for-iot/device-builders/how-to-threadx-security-module",
31+
"redirect_document_id": false
32+
},
333
{
434
"source_path_from_root": "/articles/defender-for-iot/organizations/resources-manage-proprietary-protocols.md",
535
"redirect_url": "/azure/defender-for-iot/organizations/how-to-manage-individual-sensors#manage-custom-plugins-legacy",
@@ -730,7 +760,7 @@
730760
"redirect_document_id": false
731761
},
732762
{
733-
"source_path_from_root": "/articles/defender-for-iot/how-to-deploy-edge.md",
763+
"source_path_from_root": "/articles/defender-for-iot/how-to-deploy-edge.yml",
734764
"redirect_url": "/azure/defender-for-iot/device-builders/how-to-deploy-edge",
735765
"redirect_document_id": false
736766
},

.openpublishing.redirection.json

Lines changed: 28 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1712,12 +1712,22 @@
17121712
},
17131713
{
17141714
"source_path_from_root": "/articles/guides/developer/index.md",
1715-
"redirect_url": "/azure/guides/developer/azure-developer-guide",
1715+
"redirect_url": "/azure/developer/",
1716+
"redirect_document_id": false
1717+
},
1718+
{
1719+
"source_path_from_root": "/articles/guides/developer/azure-developer-guide.md",
1720+
"redirect_url": "/azure/developer/",
17161721
"redirect_document_id": false
17171722
},
17181723
{
17191724
"source_path_from_root": "/articles/guides/operations/index.md",
1720-
"redirect_url": "/azure/guides/operations/azure-operations-guide",
1725+
"redirect_url": "/azure/developer/intro/azure-developer-key-concepts",
1726+
"redirect_document_id": false
1727+
},
1728+
{
1729+
"source_path_from_root": "/articles/guides/operations/azure-operations-guide.md",
1730+
"redirect_url": "/azure/developer/intro/azure-developer-key-concepts",
17211731
"redirect_document_id": false
17221732
},
17231733
{
@@ -3839,9 +3849,19 @@
38393849
"redirect_url": "/azure/reliability/reliability-guidance-overview",
38403850
"redirect_document_id": false
38413851
},
3852+
{
3853+
"source_path_from_root": "/articles/aks/cluster-configuration.md",
3854+
"redirect_url": "/azure/aks/concepts-clusters-workloads",
3855+
"redirect_document_id": false
3856+
},
38423857
{
38433858
"source_path_from_root": "/articles/orbital/overview-analytics.md",
38443859
"redirect_url": "/azure/orbital/overview",
3860+
"redirect_document_id": false
3861+
},
3862+
{
3863+
"source_path_from_root": "/articles/aks/intro-kubernetes.md",
3864+
"redirect_url": "/azure/aks/what-is-aks",
38453865
"redirect_document_id": false
38463866
},
38473867
{
@@ -3974,6 +3994,11 @@
39743994
"source_path_from_root":"/articles/container-instances/availability-zones.md",
39753995
"redirect_url":"/azure/reliability/reliability-containers",
39763996
"redirect_document_id":false
3977-
}
3997+
},
3998+
{
3999+
"source_path_from_root":"/articles/service-connector/quickstart-cli-aks-connection.md",
4000+
"redirect_url":"/azure/service-connector/quickstart-portal-aks-connection",
4001+
"redirect_document_id":false
4002+
}
39784003
]
39794004
}

.openpublishing.redirection.sentinel.json

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1089,6 +1089,11 @@
10891089
"source_path_from_root": "/articles/sentinel/notebooks-with-synapse-hunt.md",
10901090
"redirect_url": "/azure/sentinel/notebooks-hunt",
10911091
"redirect_document_id": false
1092+
},
1093+
{
1094+
"source_path_from_root": "/articles/sentinel/data-connectors/dns.md",
1095+
"redirect_url": "/azure/sentinel/data-connectors/windows-dns-events-via-ama",
1096+
"redirect_document_id": false
10921097
}
10931098
]
10941099
}

articles/active-directory-b2c/azure-monitor.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,7 @@ In summary, you'll use Azure Lighthouse to allow a user or group in your Azure A
6464

6565
- An Azure AD B2C account with [Global Administrator](../active-directory/roles/permissions-reference.md#global-administrator) role on the Azure AD B2C tenant.
6666

67-
- A Microsoft Entra account with the [Owner](../role-based-access-control/built-in-roles.md#owner) role in the Microsoft Entra subscription. See how to [Assign a user as an administrator of an Azure subscription](../role-based-access-control/role-assignments-portal-subscription-admin.md).
67+
- A Microsoft Entra account with the [Owner](../role-based-access-control/built-in-roles.md#owner) role in the Microsoft Entra subscription. See how to [Assign a user as an administrator of an Azure subscription](../role-based-access-control/role-assignments-portal-subscription-admin.yml).
6868

6969
## 1. Create or choose resource group
7070

articles/active-directory-b2c/configure-authentication-in-azure-static-app.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ When the access token expires or the app session is invalidated, Azure Static We
3737
- A premium Azure subscription.
3838
- If you haven't created an app yet, follow the guidance how to create an [Azure Static Web App](../static-web-apps/overview.md).
3939
- Familiarize yourself with the Azure Static Web App [staticwebapp.config.json](../static-web-apps/configuration.md) configuration file.
40-
- Familiarize yourself with the Azure Static Web App [App Settings](../static-web-apps/application-settings.md).
40+
- Familiarize yourself with the Azure Static Web App [App Settings](../static-web-apps/application-settings.yml).
4141

4242
## Step 1: Configure your user flow
4343

@@ -78,7 +78,7 @@ To register your application, follow these steps:
7878

7979
## Step 3: Configure the Azure Static App
8080

81-
Once the application is registered with Azure AD B2C, create the following application secrets in the Azure Static Web App's [application settings](../static-web-apps/application-settings.md). You can configure application settings via the Azure portal or with the Azure CLI. For more information, check out the [Configure application settings for Azure Static Web Apps](../static-web-apps/application-settings.md#configure-application-settings) article.
81+
Once the application is registered with Azure AD B2C, create the following application secrets in the Azure Static Web App's [application settings](../static-web-apps/application-settings.yml). You can configure application settings via the Azure portal or with the Azure CLI. For more information, check out the [Configure application settings for Azure Static Web Apps](../static-web-apps/application-settings.yml#configure-application-settings) article.
8282

8383
Add the following keys to the app settings:
8484

articles/advisor/advisor-how-to-calculate-total-cost-savings.md

Lines changed: 16 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,15 @@
11
---
2-
title: Export cost savings in Azure Advisor
2+
title: Calculate cost savings in Azure Advisor
33
ms.topic: article
44
ms.date: 02/06/2024
55
description: Export cost savings in Azure Advisor and calculate the aggregated potential yearly savings by using the cost savings amount for each recommendation.
66
---
77

8-
# Export cost savings
8+
# Calculate cost savings
9+
10+
This article provides guidance on how to calculate total cost savings in Azure Advisor.
11+
12+
## Export cost savings for recommendations
913

1014
To calculate aggregated potential yearly savings, follow these steps:
1115

@@ -21,5 +25,14 @@ The Advisor **Overview** page opens.
2125
[![Screenshot of the Azure Advisor cost recommendations page that shows download option.](./media/advisor-how-to-calculate-total-cost-savings.png)](./media/advisor-how-to-calculate-total-cost-savings.png#lightbox)
2226

2327
> [!NOTE]
24-
> Recommendations show savings individually, and may overlap with the savings shown in other recommendations, for example – you can only benefit from savings plans for compute or reservations for virtual machines, but not from both.
28+
> Different types of cost savings recommendations are generated using overlapping datasets (for example, VM rightsizing/shutdown, VM reservations and savings plan recommendations all consider on-demand VM usage). As a result, resource changes (e.g., VM shutdowns) or reservation/savings plan purchases will impact on-demand usage, and the resulting recommendations and associated savings forecast.
29+
30+
## Understand cost savings
31+
32+
Azure Advisor provides recommendations for resizing/shutting down underutilized resources, purchasing compute reserved instances, and savings plans for compute.
33+
34+
These recommendations contain one or more calls-to-action and forecasted savings from following the recommendations. Recommendations should be followed in a specific order: rightsizing/shutdown, followed by reservation purchases, and finally, the savings plan purchase. This sequence allows each step to impact the subsequent ones positively.
35+
36+
For example, rightsizing or shutting down resources reduces on-demand costs immediately. This change in your usage pattern essentially invalidates your existing reservation and savings plan recommendations, as they were based on your pre-rightsizing usage and costs. Updated reservation and savings plan recommendations (and their forecasted savings) should appear within three days.
2537

38+
The forecasted savings from reservations and savings plans are based on actual rates and usage, while the forecasted savings from rightsizing/shutdown are based on retail rates. The actual savings may vary depending on the usage patterns and rates. Assuming there are no material changes to your usage patterns, your actual savings from reservations and savings plan should be in line with the forecasts. Savings from rightsizing/shutdown vary based on your actual rates. This is important if you intend to track cost savings forecasts from Azure Advisor.

articles/advisor/toc.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -74,7 +74,7 @@
7474
href: advisor-azure-resource-graph.md
7575
- name: Consume Advisor score
7676
href: azure-advisor-score.md
77-
- name: Export cost savings
77+
- name: Calculate total cost savings
7878
href: advisor-how-to-calculate-total-cost-savings.md
7979
- name: Reference
8080
items:

0 commit comments

Comments
 (0)