Skip to content

Commit fc37393

Browse files
authored
Merge pull request #252120 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 7219427 + a0d1bb0 commit fc37393

File tree

9 files changed

+19
-12
lines changed

9 files changed

+19
-12
lines changed

articles/ai-services/openai/concepts/use-your-data.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -98,6 +98,7 @@ To add a new data source to your Azure OpenAI resource, you need the following A
9898
|---------|---------|
9999
|[Cognitive Services Contributor](../how-to/role-based-access-control.md#cognitive-services-contributor) | You want to use Azure OpenAI on your data. |
100100
|[Search Index Data Contributor](/azure/role-based-access-control/built-in-roles#search-index-data-contributor) | You have an existing Azure Cognitive Search index that you want to use, instead of creating a new one. |
101+
|[Search Service Contributor](/azure/role-based-access-control/built-in-roles#search-service-contributor) | You plan to create a new Azure Cognitive Search index. |
101102
|[Storage Blob Data Contributor](/azure/role-based-access-control/built-in-roles#storage-blob-data-contributor) | You have an existing Blob storage container that you want to use, instead of creating a new one. |
102103

103104
## Document-level access control

articles/aks/auto-upgrade-node-image.md

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -109,7 +109,11 @@ For more information on Planned Maintenance, see [Use Planned Maintenance to sch
109109

110110
* How can I check the current nodeOsUpgradeChannel value on a cluster?
111111

112-
Run the `az aks show` command and check the "autoUpgradeProfile" to determine what value the `nodeOsUpgradeChannel` is set to.
112+
Run the `az aks show` command and check the "autoUpgradeProfile" to determine what value the `nodeOsUpgradeChannel` is set to:
113+
114+
```azurecli-interactive
115+
az aks show --resource-group myResourceGroup --name myAKSCluster --query "autoUpgradeProfile"
116+
```
113117

114118
* How can I monitor the status of node OS auto-upgrades?
115119

articles/aks/ingress-basic.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -77,7 +77,7 @@ SOURCE_REGISTRY=registry.k8s.io
7777
CONTROLLER_IMAGE=ingress-nginx/controller
7878
CONTROLLER_TAG=v1.8.1
7979
PATCH_IMAGE=ingress-nginx/kube-webhook-certgen
80-
PATCH_TAG=v2023040
80+
PATCH_TAG=v20230407
8181
DEFAULTBACKEND_IMAGE=defaultbackend-amd64
8282
DEFAULTBACKEND_TAG=1.5
8383

articles/aks/open-ai-quickstart.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -297,7 +297,7 @@ Now that the application is deployed, you can deploy the Python-based microservi
297297
memory: 46Mi
298298
limits:
299299
cpu: 30m
300-
memory: 50Mi
300+
memory: 65Mi
301301
---
302302
apiVersion: v1
303303
kind: Service

articles/automation/troubleshoot/managed-identity.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -108,7 +108,7 @@ CategoryInfo : CloseError: (:) [Connect-AzureRmAccount], HttpRequestException +
108108
The most common cause for this is that you didn't enable the identity before trying to use it. To verify this, run the following PowerShell runbook in the affected Automation account.
109109

110110
```powershell
111-
resource= "?resource=https://management.azure.com/"
111+
$resource= "?resource=https://management.azure.com/"
112112
$url = $env:IDENTITY_ENDPOINT + $resource
113113
$Headers = New-Object "System.Collections.Generic.Dictionary[[String],[String]]"
114114
$Headers.Add("X-IDENTITY-HEADER", $env:IDENTITY_HEADER)
@@ -143,4 +143,4 @@ If this article doesn't resolve your issue, try one of the following channels fo
143143

144144
* Get answers from Azure experts through [Azure Forums](https://azure.microsoft.com/support/forums/).
145145
* Connect with [@AzureSupport](https://twitter.com/azuresupport). This is the official Microsoft Azure account for connecting the Azure community to the right resources: answers, support, and experts.
146-
* File an Azure support incident. Go to the [Azure support site](https://azure.microsoft.com/support/options/), and select **Get Support**.
146+
* File an Azure support incident. Go to the [Azure support site](https://azure.microsoft.com/support/options/), and select **Get Support**.

articles/governance/policy/concepts/remediation-structure.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -66,9 +66,9 @@ resource hierarchy or individual resource to remediate.
6666

6767
## Policy definition ID
6868

69-
If the `policyAssignmentId` is for an initiative assignment, the **policyDefinitionReferenceId** property must be used to specify which policy definition(s) in the initiative the subject resource(s) are to be remediated. As a remediation can only remediation in a scope of one definition,
70-
this property is a _string_. The value must match the value in the initiative definition in the
71-
`policyDefinitions.policyDefinitionReferenceId` field.
69+
If the `policyAssignmentId` is for an initiative assignment, the **policyDefinitionReferenceId** property must be used to specify which policy definition in the initiative the subject resource(s) are to be remediated. As a remediation can only remediate in a scope of one definition,
70+
this property is a _string_ and not an array. The value must match the value in the initiative definition in the
71+
`policyDefinitions.policyDefinitionReferenceId` field instead of the global identifier for policy definition `Id`.
7272

7373
## Resource count and parallel deployments
7474

articles/iot-hub-device-update/device-update-ubuntu-agent.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -83,7 +83,7 @@ For convenience, this tutorial uses a [cloud-init](../virtual-machines/linux/usi
8383
1. Open the configuration details (See how to [set up configuration file here](device-update-configuration-file.md) with the command below. Set your connectionType as 'AIS' and connectionData as empty string. Please note that all values with the 'Place value here' tag must be set. See [Configuring a DU agent](./device-update-configuration-file.md#example-du-configjson-file-contents).
8484

8585
```bash
86-
sudo /etc/adu/du-config.json
86+
sudo nano /etc/adu/du-config.json
8787
```
8888

8989
1. Restart the Device Update agent.

articles/sentinel/data-transformation.md

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -105,13 +105,13 @@ Only the following tables are currently supported for custom log ingestion:
105105
- [**ASimNetworkSessionLogs**](/azure/azure-monitor/reference/tables/asimnetworksessionlogs)
106106
- [**ASimWebSessionLogs**](/azure/azure-monitor/reference/tables/asimwebsessionlogs)
107107

108-
## Known issues
108+
## Limitations
109109

110110
Ingestion-time data transformation currently has the following known issues for Microsoft Sentinel data connectors:
111111

112112
- Data transformations using *workspace transformation DCRs* are supported only per table, and not per connector.
113113

114-
There can only be one workspace transformation DCR for an entire workspace. Within that DCR, each table can use a separate input stream with its own transformation. However, if you have two different MMA-based data connectors sending data to the *Syslog* table, they will both have to use the same input stream configuration in the DCR.
114+
There can only be one workspace transformation DCR for an entire workspace. Within that DCR, each table can use a separate input stream with its own transformation. However, if you have two different MMA-based data connectors sending data to the *Syslog* table, they will both have to use the same input stream configuration in the DCR. Splitting data to multiple destinations (Log Analytics workspaces) with a workspace transformation DCR is not possible.
115115

116116
- The following configurations are supported only via API:
117117

@@ -123,6 +123,8 @@ Ingestion-time data transformation currently has the following known issues for
123123

124124
- KQL syntax: Not all operators are supported. For more information, see [**KQL limitations** and **Supported KQL features**](../azure-monitor/essentials/data-collection-transformations-structure.md#kql-limitations) in the Azure Monitor documentation.
125125

126+
- You can only send logs from one specific data source to one workspace. To send data from a single data source to multiple workspaces (destinations) with a standard DCR, please create one DCR per workspace.
127+
126128
## Next steps
127129

128130
[Get started configuring ingestion-time data transformation in Microsoft Sentinel](configure-data-transformation.md).

articles/virtual-machines/extensions/features-windows.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@ Extension packages are downloaded from the Azure Storage extension repository. E
5555
If you use a [supported version of the Azure VM Agent](/troubleshoot/azure/virtual-machines/support-extensions-agent-version), you don't need to allow access to Azure Storage in the VM region. You can use the VM Agent to redirect the communication to the Azure fabric controller for agent communications (via the `HostGAPlugin` feature through the privileged channel on private IP address [168.63.129.16](/azure/virtual-network/what-is-ip-address-168-63-129-16)). If you're on an unsupported version of the VM Agent, you need to allow outbound access to Azure Storage in that region from the VM.
5656

5757
> [!IMPORTANT]
58-
> If you block access to IP address 168.63.129.16 by using the guest firewall or via a proxy, extensions fail. Failure occurs even if you use a supported version of the VM Agent or you configure outbound access. Ports 80, 443, and 32526 are required.
58+
> If you block access to IP address 168.63.129.16 by using the guest firewall or via a proxy, extensions fail. Failure occurs even if you use a supported version of the VM Agent or you configure outbound access. Ports 80 and 32526 are required.
5959
6060
Agents can only be used to download extension packages and report status. For example, if an extension installation needs to download a script from GitHub (Custom Script Extension) or requires access to Azure Storage (Azure Backup), then you need to open other firewall or network security group (NSG) ports. Different extensions have different requirements because they're applications in their own right. For extensions that require access to Azure Storage or Azure Active Directory, you can allow access by using Azure NSG [service tags](/azure/virtual-network/network-security-groups-overview#service-tags).
6161

0 commit comments

Comments
 (0)