Skip to content

Commit 34fd34d

Browse files
committed
Merge branch 'main' into release-monitor-alerts-backup
2 parents e61df72 + 52ee2f3 commit 34fd34d

File tree

247 files changed

+1853
-988
lines changed

Some content is hidden

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

247 files changed

+1853
-988
lines changed

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/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/managed-redis/managed-redis-architecture.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,7 @@ Each SKU of Azure Managed Redis is configured to run a specific number of Redis
7171
> The number of shards and vCPUs used on each SKU can change over time as performance is optimized by the Azure Managed Redis team.
7272
>
7373
74-
| Tiers | Flash Optimized | Memory Optimized | General Purpose | Compute Optimized |
74+
| Tiers | Flash Optimized | Memory Optimized | Balanced | Compute Optimized |
7575
|:-----------:|:-------------------:|:--------------------:|:--------------------:|:--------------------:|
7676
| Size (GB) | vCPUs/primary shards | vCPUs/primary shards | vCPUs/primary shards | vCPUs/primary shards |
7777
| 0.5 | - | - | 2/1 | - |

articles/azure-resource-manager/bicep/bicep-cli.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ title: Bicep CLI commands and overview
33
description: Describes the commands that you can use in the Bicep CLI. These commands include building Azure Resource Manager templates from Bicep.
44
ms.topic: reference
55
ms.custom: devx-track-azurecli, devx-track-bicep, devx-track-arm-template
6-
ms.date: 10/30/2024
6+
ms.date: 12/06/2024
77
---
88

99
# Bicep CLI commands
@@ -116,13 +116,13 @@ The `generate-params` command builds a parameters file from the given Bicep file
116116
az bicep generate-params --file main.bicep --output-format bicepparam --include-params all
117117
```
118118

119-
The command creates a Bicep parameters file named _main.bicepparam_. The parameter file contains all parameters in the Bicep file, whether configured with default values or not.
119+
The command creates a Bicep parameters file named _main.bicepparam_. The parameters file contains all parameters in the Bicep file, whether configured with default values or not.
120120

121121
```azurecli
122122
az bicep generate-params --file main.bicep --outfile main.parameters.json
123123
```
124124

125-
The command creates a parameter file named _main.parameters.json_. The parameter file only contains the parameters without default values configured in the Bicep file.
125+
The command creates a parameters file named _main.parameters.json_. The parameters file only contains the parameters without default values configured in the Bicep file.
126126

127127
## install
128128

articles/azure-resource-manager/bicep/bicep-functions-parameters-file.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
---
22
title: Bicep functions - parameters file
3-
description: This article describes the Bicep functions to be used in Bicep parameter files.
3+
description: This article describes the Bicep functions to be used in Bicep parameters files.
44
ms.topic: reference
55
ms.custom: devx-track-bicep
6-
ms.date: 08/09/2024
6+
ms.date: 12/06/2024
77
---
88

99
# Parameters file function for Bicep

articles/azure-resource-manager/bicep/bicep-functions.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ title: Bicep functions
33
description: Describes the functions to use in a Bicep file to retrieve values, work with strings and numerics, and retrieve deployment information.
44
ms.topic: reference
55
ms.custom: devx-track-bicep
6-
ms.date: 05/21/2024
6+
ms.date: 12/06/2024
77
---
88

99
# Bicep functions
@@ -128,7 +128,7 @@ The following functions are available for working with objects. All of these fun
128128

129129
## Parameters file functions
130130

131-
The following functions are available to be used in Bicep parameter files. All of these functions are in the `sys` namespace.
131+
The following functions are available to be used in Bicep parameters files. All of these functions are in the `sys` namespace.
132132

133133
* [getSecret](./bicep-functions-parameters-file.md)
134134
* [readEnvironmentVariable](./bicep-functions-parameters-file.md)

articles/azure-resource-manager/bicep/bicep-import.md

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ title: Imports in Bicep
33
description: This article describes how to import shared functionality and namespaces in Bicep.
44
ms.topic: conceptual
55
ms.custom: devx-track-bicep
6-
ms.date: 10/23/2024
6+
ms.date: 12/06/2024
77
---
88

99
# Imports in Bicep
@@ -80,7 +80,7 @@ output greeting string = sayHello('Bicep user')
8080
output exampleObject myImports.myObjectType = exampleObject
8181
```
8282

83-
## Import namespaces and extensions (preview)
83+
## Import namespaces and extensions (Preview)
8484

8585
> [!NOTE]
8686
> The experimental feature `extensibility` must be enabled from the [Bicep config file](./bicep-config.md#enable-experimental-features) to use this feature.
@@ -112,7 +112,8 @@ For an example, see [Bicep Kubernetes extension](./bicep-kubernetes-extension.md
112112

113113
## Related content
114114

115-
- To learn about Bicep data types, see [Data types](./data-types.md).
116-
- To learn about Bicep functions, see [Bicep functions](./bicep-functions.md).
117-
- To learn how to use the Bicep Kubernetes extension, see [Bicep Kubernetes extension](./bicep-kubernetes-extension.md).
118-
- To go through a Kubernetes extension tutorial, see [Quickstart: Deploy Azure applications to Azure Kubernetes Services by using the Bicep Kubernetes extension](/azure/aks/learn/quick-kubernetes-deploy-bicep-kubernetes-extension).
115+
- To learn about the Bicep data types, see [Data types](./data-types.md).
116+
- To learn about the Bicep functions, see [Bicep functions](./bicep-functions.md).
117+
- To learn about how to use the Kubernetes extension, see [Bicep Kubernetes extension](./bicep-kubernetes-extension.md).
118+
- To go through a Kubernetes extension tutorial, see [Quickstart - Deploy Azure applications to Azure Kubernetes Services by using Bicep Kubernetes extension.](/azure/aks/learn/quick-kubernetes-deploy-bicep-kubernetes-extension).
119+
- To learn about how to use the Microsoft Graph extension, see [Bicep templates for Microsoft Graph](https://aka.ms/graphbicep).

articles/azure-resource-manager/bicep/bicep-kubernetes-extension.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,6 @@ The Kubernetes extension allows you to create Kubernetes resources directly with
2424
> }
2525
>
2626
> ```
27-
>
2827
2928
## Enable the preview feature
3029
@@ -81,4 +80,5 @@ From Visual Studio Code, you can import Kubernetes manifest files to create Bice
8180

8281
## Next steps
8382

84-
- [Quickstart - Deploy Azure applications to Azure Kubernetes Services by using Bicep Kubernetes extension](/azure/aks/learn/quick-kubernetes-deploy-bicep-kubernetes-extension)
83+
- To walk through a quickstart, see [Quickstart - Deploy Azure applications to Azure Kubernetes Services by using Bicep Kubernetes extension](/azure/aks/learn/quick-kubernetes-deploy-bicep-kubernetes-extension).
84+
- To learn about how to use the Microsoft Graph extension, see [Bicep templates for Microsoft Graph](https://aka.ms/graphbicep).

articles/azure-resource-manager/bicep/bicep-using.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,12 +3,12 @@ title: Using statement
33
description: Describes how to use the using statement in Bicep.
44
ms.topic: conceptual
55
ms.custom: devx-track-bicep
6-
ms.date: 06/28/2024
6+
ms.date: 12/06/2024
77
---
88

99
# Using statement
1010

11-
The `using` statement in [Bicep parameter files](./parameter-files.md) ties the [Bicep parameters file](./parameter-files.md) to a [Bicep file](./file.md), an [ARM JSON template](../templates/syntax.md), or a [Bicep module](./modules.md), or a [template spec](./template-specs.md). A `using` declaration must be present in any Bicep parameters file.
11+
The `using` statement in [Bicep parameters files](./parameter-files.md) ties the [Bicep parameters file](./parameter-files.md) to a [Bicep file](./file.md), an [ARM JSON template](../templates/syntax.md), or a [Bicep module](./modules.md), or a [template spec](./template-specs.md). A `using` declaration must be present in any Bicep parameters file.
1212

1313
> [!NOTE]
1414
> The Bicep parameters file is only supported in [Bicep CLI](./install.md) version 0.18.4 or newer, [Azure CLI](/cli/azure/install-azure-cli) version 2.47.0 or newer, and [Azure PowerShell](/powershell/azure/install-azure-powershell) version 9.7.1 or newer.

articles/azure-resource-manager/bicep/data-types.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ title: Data types in Bicep
33
description: This article describes the data types that are available in Bicep.
44
ms.topic: reference
55
ms.custom: devx-track-bicep
6-
ms.date: 11/12/2024
6+
ms.date: 12/06/2024
77
---
88

99
# Data types in Bicep
@@ -111,7 +111,7 @@ When you specify integer values, don't use quotation marks.
111111
param exampleInt int = 1
112112
```
113113

114-
Bicep integers are 64-bit integers. When they're passed as inline parameters, the SDK or command-line tool you use for deployment can limit the range of values. For example, when you use PowerShell to deploy Bicep, integer types can range from -2147483648 to 2147483647. To avoid this limitation, specify large integer values in a [parameter file](parameter-files.md). Resource types apply their own limits for integer properties.
114+
Bicep integers are 64-bit integers. When they're passed as inline parameters, the SDK or command-line tool you use for deployment can limit the range of values. For example, when you use PowerShell to deploy Bicep, integer types can range from -2147483648 to 2147483647. To avoid this limitation, specify large integer values in a [parameters file](parameter-files.md). Resource types apply their own limits for integer properties.
115115

116116
Bicep supports an integer literal type that refers to a specific value that's an exact integer. In the following example, `1` is an integer literal type, and `foo` can only be assigned the value `1` and no other value.
117117

0 commit comments

Comments
 (0)