Skip to content

Commit d617c4f

Browse files
authored
Merge pull request #239327 from MicrosoftDocs/repo_sync_working_branch
Resolve syncing conflicts from repo_sync_working_branch to main
2 parents e4399c5 + e6a8e62 commit d617c4f

File tree

3 files changed

+7
-3
lines changed

3 files changed

+7
-3
lines changed

articles/advisor/advisor-cost-recommendations.md

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -82,6 +82,10 @@ In some cases recommendations can't be adopted or might not be applicable, such
8282

8383
In such cases, simply use the Dismiss/Postpone options associated with the recommendation.
8484

85+
### Limitations
86+
- The savings associated with the recommendations are based on retail rates and don't take into account any temporary or long-term discounts that might apply to your account. As a result, the listed savings might be higher than actually possible.
87+
- The recommendations don't take into account the presence of Reserved Instances (RI) / Savings plan purchases. As a result, the listed savings might be higher than actually possible. In some cases, for example in the case of cross-series recommendations, depending on the types of SKUs that reserved instances have been purchased for, the costs might increase when the optimization recommendations are followed. We caution you to consider your RI/Savings plan purchases when you act on the right-size recommendations.
88+
8589
We're constantly working on improving these recommendations. Feel free to share feedback on [Advisor Forum](https://aka.ms/advisorfeedback).
8690

8791
## Next steps

articles/aks/monitor-apiserver.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ Kubernetes audit logging isn't enabled by default on an AKS cluster on account o
2222
* **Destination details:** Select the checkbox for **Log Analytics**.
2323

2424
> [!NOTE]
25-
> There could be substantial cost involved once kube-audit logs are enabled. Consider disabling kube-audit logging when not required.
25+
> There could be substantial cost involved once kube-audit logs are enabled. Consider disabling kube-audit logging when not required. An alternative approach to significantly reduce the number of logs and help reduce cost is by enabling collection from kube-audit-admin, which excludes the get and list audit events.
2626
> For strategies to reduce your Azure Monitor costs, see [Cost optimization and Azure Monitor][cost-optimization-azure-monitor].
2727
2828
After a few moments, the new setting appears in your list of settings for this resource. Logs are streamed to the specified destinations as new event data is generated. It might take up to 15 minutes between when an event is emitted and when it appears in a [Log Analytics workspace][log-analytics-workspace-overview].
@@ -63,4 +63,4 @@ For more information about AKS metrics, logs, and other important values, see [M
6363
[cost-optimization-azure-monitor]: ../azure-monitor/best-practices-cost.md
6464
[azure-diagnostics-table]: /azure/azure-monitor/reference/tables/azurediagnostics
6565
[container-insights-overview]: ..//azure-monitor/containers/container-insights-overview.md
66-
[monitoring-aks-data-reference]: monitor-aks-reference.md
66+
[monitoring-aks-data-reference]: monitor-aks-reference.md

articles/app-service/routine-maintenance.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@ Azure App Service represents a fleet of scale units, which provide hosting of we
5454

5555
### Are business hours reflected?
5656

57-
Maintenance operations are optimized to run outside standard business hours (9-5pm) as statistically that is a better timing for any interruptions and restarts of workloads as there is a less stress on the system (in customer applications and transitively also on the platform itself).
57+
Maintenance operations are optimized to start outside standard business hours (9-5pm) as statistically that is a better timing for any interruptions and restarts of workloads as there is a less stress on the system (in customer applications and transitively also on the platform itself). For App Service Plan and App Service Environment v2, maintenance can continue into business hours during longer maintenance events.
5858

5959
### What are my options to control routine maintenance?
6060

0 commit comments

Comments
 (0)