Skip to content

Commit 2358926

Browse files
authored
Merge pull request #210463 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 e65315c + 883138c commit 2358926

File tree

3 files changed

+17
-2
lines changed

3 files changed

+17
-2
lines changed

articles/azure-vmware/install-vmware-hcx.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ ms.date: 03/29/2022
1010

1111
VMware HCX Advanced and its associated Cloud Manager are no longer pre-deployed in Azure VMware Solution. Instead, you'll install it through the Azure portal as an add-on. You'll still download the HCX Connector OVA and deploy the virtual appliance on your on-premises vCenter Server.
1212

13-
Any edition of VMware HCX supports 25 site pairings (on-premises to cloud or cloud to cloud) in a single HCX manager system. The default is HCX Advanced, but you can open a [support request](https://rc.portal.azure.com/#create/Microsoft.Support) to have HCX Enterprise Edition enabled. Once the service is generally available, you'll have 30 days to decide on your next steps. You can turn off or opt out of the HCX Enterprise Edition service but keep HCX Advanced as it's part of the node cost.
13+
Any edition of VMware HCX supports 25 site pairings (on-premises to cloud or cloud to cloud) in a single HCX manager system. The default is HCX Advanced, but you can open a [support request](https://rc.portal.azure.com/#create/Microsoft.Support) to have HCX Enterprise Edition enabled. VMware HCX Enterprise edition is available and supported on Azure VMware Solution, at no additional cost.
1414

1515
Downgrading from HCX Enterprise Edition to HCX Advanced is possible without redeploying. First, ensure you've reverted to an HCX Advanced configuration state and not using the Enterprise features. If you plan to downgrade, ensure that no scheduled migrations, features like RAV and [HCX Mobility Optimized Networking (MON)](https://docs.vmware.com/en/VMware-HCX/4.1/hcx-user-guide/GUID-0E254D74-60A9-479C-825D-F373C41F40BC.html) are in use.
1616

@@ -30,7 +30,7 @@ After you're finished, follow the recommended next steps at the end to continue
3030

3131
- [Prepare for HCX installations](https://docs.vmware.com/en/VMware-HCX/4.1/hcx-user-guide/GUID-A631101E-8564-4173-8442-1D294B731CEB.html)
3232

33-
- If you plan to use VMware HCX Enterprise, make sure you've enabled the [VMware HCX Enterprise](https://cloud.vmware.com/community/2019/08/08/introducing-hcx-enterprise/) add-on through a [support request](https://portal.azure.com/#create/Microsoft.Support). It's a free 12-month trial in Azure VMware Solution.
33+
- If you plan to use VMware HCX Enterprise, make sure you've enabled the [VMware HCX Enterprise](https://cloud.vmware.com/community/2019/08/08/introducing-hcx-enterprise/) add-on through a [support request](https://portal.azure.com/#create/Microsoft.Support).
3434

3535
- [VMware blog series - cloud migration](https://blogs.vmware.com/vsphere/2019/10/cloud-migration-series-part-2.html)
3636

articles/cognitive-services/language-service/question-answering/how-to/analytics.md

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -90,6 +90,20 @@ AzureDiagnostics
9090
| project question_, answer_, score_, kbId_
9191
```
9292

93+
### Prebuilt question answering inference calls
94+
95+
```kusto
96+
// Show logs from AzureDiagnostics table
97+
// Lists the latest logs in AzureDiagnostics table, sorted by time (latest first).
98+
AzureDiagnostics
99+
| where OperationName == "CustomQuestionAnswering QueryText"
100+
| extend answer_ = tostring(parse_json(properties_s).answer)
101+
| extend question_ = tostring(parse_json(properties_s).question)
102+
| extend score_ = tostring(parse_json(properties_s).score)
103+
| extend requestid = tostring(parse_json(properties_s)["apim-request-id"])
104+
| project TimeGenerated, requestid, question_, answer_, score_
105+
```
106+
93107
## Next steps
94108

95109
> [!div class="nextstepaction"]

articles/machine-learning/how-to-read-write-data-v2.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -44,6 +44,7 @@ When you provide a data input/output to a Job, you'll need to specify a `path` p
4444
|A path on a public http(s) server | `https://raw.githubusercontent.com/pandas-dev/pandas/main/doc/data/titanic.csv` |
4545
|A path on Azure Storage | `https://<account_name>.blob.core.windows.net/<container_name>/path` <br> `abfss://<file_system>@<account_name>.dfs.core.windows.net/<path>` |
4646
|A path on a Datastore | `azureml://datastores/<data_store_name>/paths/<path>` |
47+
|A path to a Data Asset | `azureml:<my_data>:<version>` |
4748

4849
## Supported modes
4950

0 commit comments

Comments
 (0)