Skip to content

Commit a916049

Browse files
authored
Merge pull request #297760 from MicrosoftDocs/repo_sync_working_branch
Confirm merge from repo_sync_working_branch to main to sync with https://github.com/MicrosoftDocs/azure-docs (branch main)
2 parents b1d3869 + da482c6 commit a916049

File tree

10 files changed

+39
-26
lines changed

10 files changed

+39
-26
lines changed

articles/azure-vmware/deploy-arc-for-azure-vmware-solution.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -105,7 +105,7 @@ Use the following steps to guide you through the process to onboard Azure Arc fo
105105
- If all the parameters are provided, the firewall and proxy URLs must be allowlisted for the lps between K8sNodeIPPoolStart, k8sNodeIPPoolEnd.
106106
- If you're skipping the optional fields, the firewall and proxy URLs must be allowlisted the following IPs in the segment. If the networkCIDRForApplianceVM is x.y.z.1/28, the IPs to allowlist are between x.y.z.11 – x.y.z.14. See the [Azure Arc resource bridge network requirements](/azure/azure-arc/resource-bridge/network-requirements). 
107107

108-
**Json example**
108+
**JSON example**
109109
```json
110110
{
111111
"subscriptionId": "xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx",

articles/container-apps/azure-arc-overview.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -207,7 +207,7 @@ Arm64 based clusters aren't supported at this time.
207207
- Update Dapr to v1.12 and Dapr Metrics to v0.6
208208
- Allow customers to enabled Azure SDK debug logging in Dapr
209209
- Scale Envoy in response to memory usage
210-
- Change of Envoy log format to Json
210+
- Change of Envoy log format to JSON
211211
- Export additional Envoy metrics
212212
- Truncate Envoy log to first 1,024 characters when log content failed to parse
213213
- Handle SIGTERM gracefully in local proxy

articles/container-apps/health-probes.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -162,7 +162,7 @@ The optional `failureThreshold` setting defines the number of attempts Container
162162

163163
## Default configuration
164164

165-
If ingress is enabled, the following default probes are automatically added to the main app container if none is defined for each type.
165+
If ingress is enabled, the following default probes are automatically added to the main app container if none is defined for each type, except for GPU workload profiles (both dedicated and consumption).
166166

167167
| Probe type | Default values |
168168
| -- | -- |

articles/cost-management-billing/manage/avoid-unused-subscriptions.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
11
---
22
title: Avoid unused subscriptions
33
description: Learn how to prevent unused subscriptions from getting automatically blocked or deleted due to inactivity.
4-
author: bandersmsft
5-
ms.reviewer: mijeffer
4+
author: PreetiSGit
5+
ms.reviewer: presharm
66
ms.service: cost-management-billing
77
ms.subservice: billing
88
ms.topic: concept-article
99
ms.date: 01/22/2025
10-
ms.author: banders
10+
ms.author: presharm
1111
# customer intent: As a billing administrator, I want to prevent my subscriptions from getting blocked or deleted.
1212
---
1313

articles/cost-management-billing/manage/subscription-states.md

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,13 +2,13 @@
22
title: Azure subscription states
33
description: Learn about the different states of an Azure subscription, including active, deleted, and disabled states, and how they affect resource management.
44
keywords: azure subscription state status
5-
author: bandersmsft
6-
ms.reviewer: macyso
5+
author: PreetiSGit
6+
ms.reviewer: presharm
77
ms.service: cost-management-billing
88
ms.subservice: billing
99
ms.topic: concept-article
1010
ms.date: 01/08/2025
11-
ms.author: banders
11+
ms.author: presharm
1212
#customer intent: As a billing administrator, I want to understand the different states and status of an Azure subscription so that I can manage my subscriptions effectively.
1313
---
1414

@@ -63,4 +63,4 @@ Resources in this state go offline but can be recovered when the subscription re
6363
## Related content
6464

6565
- [Resolve past due balance for your Azure subscription.](resolve-past-due-balance.md)
66-
- [Reactivate a disabled Azure subscription](subscription-disabled.md)
66+
- [Reactivate a disabled Azure subscription](subscription-disabled.md)

articles/cost-management-billing/troubleshoot-billing/troubleshoot-threshold-billing.md

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
11
---
22
title: Troubleshoot threshold billing
33
description: Resolve threshold billing problems.
4-
author: bandersmsft
5-
ms.reviewer: ragrover
4+
author: Jkinma39
5+
ms.reviewer: Jkinma
66
ms.service: cost-management-billing
77
ms.subservice: billing
88
ms.topic: troubleshooting
99
ms.date: 05/20/2024
10-
ms.author: banders
10+
ms.author: Jkinma
1111
---
1212

1313
# Troubleshoot threshold billing
@@ -46,4 +46,4 @@ If you have questions or need help, [create a support request](https://portal.az
4646

4747
## Next steps
4848

49-
- If your card was declined and you need assistance with troubleshooting, see [Troubleshoot a declined card](troubleshoot-declined-card.md).
49+
- If your card was declined and you need assistance with troubleshooting, see [Troubleshoot a declined card](troubleshoot-declined-card.md).

articles/cost-management-billing/understand/understand-usage.md

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
11
---
22
title: Understand your detailed usage and charges
33
description: Learn how to read and understand your detailed usage and charges file. View a list of terms and descriptions used in the file.
4-
author: bandersmsft
5-
ms.reviewer: micflan
4+
author: Jkinma39
5+
ms.reviewer: jkinma
66
ms.service: cost-management-billing
77
ms.subservice: billing
88
ms.topic: concept-article
99
ms.date: 09/19/2024
10-
ms.author: banders
10+
ms.author: jkinma
1111
#customer intent: As a billing administrator, I want to understand usage and charges so that I can manage Azure billing.
1212
---
1313

@@ -64,4 +64,4 @@ If you have questions or need help, [create a support request](https://go.micros
6464
## Related content
6565

6666
- [View and download your Microsoft Azure invoice](download-azure-invoice.md)
67-
- [View and download your Microsoft Azure usage and charges](download-azure-daily-usage.md)
67+
- [View and download your Microsoft Azure usage and charges](download-azure-daily-usage.md)

articles/governance/machine-configuration/concepts/assignments.md

Lines changed: 14 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -67,12 +67,25 @@ An example deployment template:
6767
"contentHash": "SHA256HASH",
6868
"version": "1.0.0",
6969
"assignmentType": "ApplyAndMonitor",
70-
"configurationParameter": {}
70+
"configurationParameter": [
71+
"name":"configurationName",
72+
"value":"configurationValue"
73+
]
7174
}
7275
}
7376
}
7477
]
7578
}
79+
80+
```
81+
Example of configurationParameter:
82+
```
83+
"configurationParameter": [
84+
{
85+
"name": "[SecureWebServer]s1;MinimumTLSVersion",
86+
"value": "1.2"
87+
}
88+
],
7689
```
7790

7891
The following table describes each property of guest assignment resources.

articles/governance/machine-configuration/how-to/develop-custom-package/1-set-up-authoring-environment.md

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -30,10 +30,10 @@ Operating systems where the module can be installed:
3030
The module can be installed on a machine running PowerShell 7.x. Install the versions of PowerShell
3131
listed in the following table for your operating system.
3232

33-
| OS | PowerShell Version |
34-
| --------- | ---------------------- |
35-
| Windows | [PowerShell 7.1.3][01] |
36-
| Ubuntu 18 | [PowerShell 7.2.4][02] |
33+
| OS | Minimum Required PowerShell Version | Installation |
34+
|------------|:-----------------------------------:|----------------------------------------|
35+
| Windows | `7.1.3` | [Installing PowerShell on Windows][01] |
36+
| Ubuntu 18+ | `7.2.4` | [Installing PowerShell on Ubuntu][02] |
3737

3838
The **GuestConfiguration** module requires the following software:
3939

@@ -64,6 +64,6 @@ Get-Command -Module 'GuestConfiguration'
6464
> [Create a custom machine configuration package](./2-create-package.md)
6565
6666
<!-- Reference link definitions -->
67-
[01]: https://github.com/PowerShell/PowerShell/releases/tag/v7.1.3
68-
[02]: https://github.com/PowerShell/PowerShell/releases/tag/v7.2.4
67+
[01]: /powershell/scripting/install/installing-powershell-on-windows
68+
[02]: /powershell/scripting/install/install-ubuntu
6969
[03]: /powershell/azure/install-az-ps

articles/oracle/oracle-db/faq-oracle-database-azure.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -163,7 +163,7 @@ Data is encrypted at rest. All traffic between sites, including to the Oracle Da
163163

164164
### Can I use Azure Monitor with Oracle Database@Azure?
165165

166-
Yes. Metrics are published for the Oracle Exadata infrastructure, for VM clusters, and for Oracle databases. The database metrics are listed under VM metrics. You can create custom dashboards for Azure Monitor to use with your application monitoring for a unified view. For more information, see [Exadata metrics](https://docs.oracle.com/en-us/iaas/Content/database-at-azure-exadata/odexa-monitoring-exadata-services.html) and [metrics for autonomous database](https://docs.oracle.com/en-us/iaas/Content/database-at-azure-autonomous/odadb-monitoring-autonomous-database-services.html).
166+
Yes. Metrics are published for the Oracle Exadata infrastructure, for VM clusters, and for Oracle databases. The database metrics are listed under VM metrics. You can create custom dashboards for Azure Monitor to use with your application monitoring for a unified view. For more information, see [Exadata metrics](https://docs.oracle.com/en-us/iaas/odexa/odexa-monitoring-exadata-services.html#ODEXA-GUID-A508A302-B8EC-4A78-B187-1237C6869A4B) and [metrics for autonomous database](https://docs.oracle.com/en-us/iaas/odadb/odadb-monitoring-autonomous-database-services.html#ODADB-GUID-871C7EA1-5CCC-4EF8-8C4D-396DD4CAEB32).
167167

168168
### What are the different options for backup on Oracle Database@Azure?
169169

0 commit comments

Comments
 (0)