Skip to content

Commit c99d760

Browse files
authored
Merge pull request #269285 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 0460359 + 0ad663f commit c99d760

File tree

7 files changed

+11
-24
lines changed

7 files changed

+11
-24
lines changed

articles/ai-services/openai/how-to/assistant.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -365,7 +365,7 @@ We had requested that the model generate an image of a sine wave. In order to do
365365

366366
```python
367367
data = json.loads(messages.model_dump_json(indent=2)) # Load JSON data into a Python object
368-
image_file_id = data['data'][1]['content'][0]['image_file']['file_id']
368+
image_file_id = data['data'][0]['content'][0]['image_file']['file_id']
369369

370370
print(image_file_id) # Outputs: assistant-1YGVTvNzc2JXajI5JU9F0HMD
371371
```

articles/azure-arc/servers/overview.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ You can install the Connected Machine agent manually, or on multiple machines at
2626
When you connect your machine to Azure Arc-enabled servers, you can perform many operational functions, just as you would with native Azure virtual machines. Below are some of the key supported actions for connected machines.
2727

2828
* **Govern**:
29-
* Assign [Azure Automanage machine configurations](../../governance/machine-configuration/overview.md) to audit settings inside the machine. To understand the cost of using Azure Automanage Machine Configuration policies with Arc-enabled servers, see Azure Policy [pricing guide](https://azure.microsoft.com/pricing/details/azure-policy/).
29+
* Assign [Azure machine configurations](../../governance/machine-configuration/overview.md) to audit settings inside the machine. To understand the cost of using Azure Machine Configuration policies with Arc-enabled servers, see Azure Policy [pricing guide](https://azure.microsoft.com/pricing/details/azure-policy/).
3030
* **Protect**:
3131
* Protect non-Azure servers with [Microsoft Defender for Endpoint](/microsoft-365/security/defender-endpoint), included through [Microsoft Defender for Cloud](../../security-center/defender-for-servers-introduction.md), for threat detection, for vulnerability management, and to proactively monitor for potential security threats. Microsoft Defender for Cloud presents the alerts and remediation suggestions from the threats detected.
3232
* Use [Microsoft Sentinel](scenario-onboard-azure-sentinel.md) to collect security-related events and correlate them with other data sources.

articles/azure-monitor/vm/vminsights-overview.md

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ ms.date: 09/28/2023
99

1010
# Overview of VM insights
1111

12-
VM insights provides a quick and easy method for getting started monitoring the client workloads on your virtual machines and virtual machine scale sets. It displays an inventory of your existing VMs and provides a guided experience to enable base monitoring for them. It also monitors the performance and health of your virtual machines and virtual machine scale sets by collecting data on their running processes and dependencies on other resources.
12+
VM insights provides a quick and easy method for getting started monitoring the client workloads on your virtual machines and virtual machine scale sets. It displays an inventory of your existing VMs and provides a guided experience to enable base monitoring for them. It also monitors the performance of your virtual machines and virtual machine scale sets by collecting data on their running processes and dependencies on other resources.
1313

1414
VM insights supports Windows and Linux operating systems on:
1515

@@ -29,8 +29,7 @@ VM insights provides a set of predefined workbooks that allow you to view trendi
2929
There's no direct cost for VM insights, but you're charged for its activity in the Log Analytics workspace. Based on the pricing that's published on the [Azure Monitor pricing page](https://azure.microsoft.com/pricing/details/monitor/), VM insights is billed for:
3030

3131
- Data ingested from agents and stored in the workspace.
32-
- Health state data collected from guest health (preview).
33-
- Alert rules based on log and health data.
32+
- Alert rules based on log data.
3433
- Notifications sent from alert rules.
3534

3635
The log size varies by the string lengths of performance counters. It can increase with the number of logical disks and network adapters allocated to the VM. If you're already using Service Map, the only change you'll see is the extra performance data that's sent to the Azure Monitor `InsightsMetrics` data type.​

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

Lines changed: 3 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -3,26 +3,14 @@ title: User-defined functions in Bicep
33
description: Describes how to define and use user-defined functions in Bicep.
44
ms.topic: conceptual
55
ms.custom: devx-track-bicep
6-
ms.date: 11/03/2023
6+
ms.date: 03/15/2024
77
---
88

9-
# User-defined functions in Bicep (Preview)
9+
# User-defined functions in Bicep
1010

1111
Within your Bicep file, you can create your own functions. These functions are available for use in your Bicep files. User-defined functions are separate from the [standard Bicep functions](./bicep-functions.md) that are automatically available within your Bicep files. Create your own functions when you have complicated expressions that are used repeatedly in your Bicep files.
1212

13-
[Bicep CLI version 0.20.X or higher](./install.md) is required to use this feature.
14-
15-
## Enable the preview feature
16-
17-
To enable this preview, modify your project's [bicepconfig.json](./bicep-config.md) file to include the following JSON:
18-
19-
```json
20-
{
21-
"experimentalFeaturesEnabled": {
22-
"userDefinedFunctions": true
23-
}
24-
}
25-
```
13+
[Bicep CLI version 0.26.X or higher](./install.md) is required to use this feature.
2614

2715
## Limitations
2816

articles/backup/azure-kubernetes-service-cluster-manage-backups.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -120,7 +120,7 @@ To stop the Backup Extension install operation, use the following command:
120120
To provide *Storage Account Contributor Permission* to the Extension Identity on storage account, run the following command:
121121

122122
```azurecli-interactive
123-
az role assignment create --assignee-object-id $(az k8s-extension show --name azure-aks-backup --cluster-name <aksclustername> --resource-group <aksclusterrg> --cluster-type managedClusters --query identity.principalId --output tsv) --role 'Storage Blob Data Contributor' --scope /subscriptions/<subscriptionid>/resourceGroups/<storageaccountrg>/providers/Microsoft.Storage/storageAccounts/<storageaccountname>
123+
az role assignment create --assignee-object-id $(az k8s-extension show --name azure-aks-backup --cluster-name <aksclustername> --resource-group <aksclusterrg> --cluster-type managedClusters --query aksAssignedIdentity.principalId --output tsv) --role 'Storage Blob Data Contributor' --scope /subscriptions/<subscriptionid>/resourceGroups/<storageaccountrg>/providers/Microsoft.Storage/storageAccounts/<storageaccountname>
124124
```
125125

126126

articles/key-vault/general/rbac-guide.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ Azure role-based access control (Azure RBAC) is an authorization system built on
2222

2323
Azure RBAC allows users to manage Key, Secrets, and Certificates permissions. It provides one place to manage all permissions across all key vaults.
2424

25-
The Azure RBAC model allows uses to set permissions on different scope levels: management group, subscription, resource group, or individual resources. Azure RBAC for key vault also allows users to have separate permissions on individual keys, secrets, and certificates
25+
The Azure RBAC model allows users to set permissions on different scope levels: management group, subscription, resource group, or individual resources. Azure RBAC for key vault also allows users to have separate permissions on individual keys, secrets, and certificates
2626

2727
For more information, see [Azure role-based access control (Azure RBAC)](../../role-based-access-control/overview.md).
2828

articles/sentinel/normalization-schema-dhcp.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ The following list mentions fields that have specific guidelines for DHCP events
4949
| --- | --- | --- | --- |
5050
| **EventType** | Mandatory | Enumerated | Indicate the operation reported by the record. <br><Br> Possible values are `Assign`, `Renew`, `Release` and `DNS Update`. <br><br>Example: `Assign`|
5151
| **EventSchemaVersion** | Mandatory | String | The version of the schema documented here is **0.1**. |
52-
| **EventSchema** | Mandatory | String | The name of the schema documented here is **Dhcp**. |
52+
| **EventSchema** | Mandatory | String | The name of the schema documented here is **DhcpEvent**. |
5353
| **Dvc** fields| - | - | For DHCP events, device fields refer to the system that reports the DHCP event. |
5454

5555

@@ -87,7 +87,7 @@ The fields below are specific to DHCP events, but many are similar to fields in
8787
| <a name="srcuserid"></a>**SrcUserId** | Optional | String | A machine-readable, alphanumeric, unique representation of the source user. Format and supported types include:<br>- **SID** (Windows): `S-1-5-21-1377283216-344919071-3415362939-500`<br>- **UID** (Linux): `4578`<br>- **AADID** (Microsoft Entra ID): `9267d02c-5f76-40a9-a9eb-b686f3ca47aa`<br>- **OktaId**: `00urjk4znu3BcncfY0h7`<br>- **AWSId**: `72643944673`<br><br>Store the ID type in the [SrcUserIdType](#srcuseridtype) field. If other IDs are available, we recommend that you normalize the field names to SrcUserSid, SrcUserUid, SrcUserAadId, SrcUserOktaId and UserAwsId, respectively.<br><br>Example: `S-1-12` |
8888
| <a name="srcuseridtype"></a>**SrcUserIdType** | Conditional | Enumerated | The type of the ID stored in the [SrcUserId](#srcuserid) field. Supported values include: `SID`, `UIS`, `AADID`, `OktaId`, and `AWSId`. |
8989
| <a name="srcusername"></a>**SrcUsername** | Optional | String | The Source username, including domain information when available. Use one of the following formats and in the following order of priority:<br>- **Upn/Email**: `[email protected]`<br>- **Windows**: `Contoso\johndow`<br>- **DN**: `CN=Jeff Smith,OU=Sales,DC=Fabrikam,DC=COM`<br>- **Simple**: `johndow`. Use the Simple form only if domain information is not available.<br><br>Store the Username type in the [SrcUsernameType](#srcusernametype) field. If other IDs are available, we recommend that you normalize the field names to **SrcUserUpn**, **SrcUserWindows** and **SrcUserDn**.<br><br>For more information, see [The User entity](normalization-about-schemas.md#the-user-entity).<br><br>Example: `AlbertE` |
90-
| **Username** | Alias | | Alias for [SrcUsername](#srcusername) |
90+
| **User** | Alias | | Alias for [SrcUsername](#srcusername) |
9191
| <a name="srcusernametype"></a>**SrcUsernameType** | Conditional | Enumerated | Specifies the type of the username stored in the [SrcUsername](#srcusername) field. Supported values are: `UPN`, `Windows`, `DN`, and `Simple`. For more information, see [The User entity](normalization-about-schemas.md#the-user-entity).<br><br>Example: `Windows` |
9292
| **SrcUserType** | Optional | Enumerated | The type of Actor. Allowed values are:<br>- `Regular`<br>- `Machine`<br>- `Admin`<br>- `System`<br>- `Application`<br>- `Service Principal`<br>- `Other`<br><br>**Note**: The value may be provided in the source record using different terms, which should be normalized to these values. Store the original value in the [EventOriginalUserType](#srcoriginalusertype) field. |
9393
| <a name="srcoriginalusertype"></a>**SrcOriginalUserType** | | | The original source user type, if provided by the source. |

0 commit comments

Comments
 (0)