Skip to content

Commit 72dbddf

Browse files
authored
Merge pull request #206130 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 bcb0152 + f71125e commit 72dbddf

File tree

8 files changed

+15
-10
lines changed

8 files changed

+15
-10
lines changed

articles/chaos-studio/chaos-studio-fault-providers.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ ms.custom: ignite-fall-2021
1414

1515
The following are the supported resource types for faults, the target types, and suggested roles to use when giving an experiment permission to a resource of that type.
1616

17-
| Resource Type | Target name | Suggested role assignment |
17+
| Resource Type | Target name/type | Suggested role assignment |
1818
| - | - | - |
1919
| Microsoft.Cache/Redis (service-direct) | Microsoft-AzureCacheForRedis | Redis Cache Contributor |
2020
| Microsoft.ClassicCompute/domainNames (service-direct) | Microsoft-DomainNames | Classic Virtual Machine Contributor |

articles/chaos-studio/chaos-studio-samples-rest-api.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -90,7 +90,7 @@ az rest --method delete --url "https://management.azure.com/{experimentId}?api-v
9090
#### Start an experiment
9191

9292
```azurecli
93-
az rest --method get --url "https://management.azure.com/{experimentId}/start?api-version={apiVersion}" --resource "https://management.azure.com"
93+
az rest --method post --url "https://management.azure.com/{experimentId}/start?api-version={apiVersion}"
9494
```
9595

9696
#### Get statuses (History) of an experiment
@@ -133,4 +133,4 @@ az rest --method get --url "https://management.azure.com/{experimentId}/executio
133133
| {experimentName.json} | JSON containing the configuration of the chaos experiment | Generated by the user |
134134
| {subscriptionId} | Subscription Id where the target resource is located | Can be found in the [Subscriptions Portal Blade](https://portal.azure.com/#blade/Microsoft_Azure_Billing/SubscriptionsBlade) |
135135
| {resourceGroupName} | Name of the resource group where the target resource is located | Can be fond in the [Resource Groups Portal Blade](https://portal.azure.com/#blade/HubsExtension/BrowseResourceGroups) |
136-
| {executionDetailsId} | Execution Id of an experiment execution | Can be found in the [Chaos Studio Experiment Portal Blade](https://portal.azure.com/#blade/HubsExtension/BrowseResource/resourceType/Microsoft.chaos%2Fchaosexperiments) |
136+
| {executionDetailsId} | Execution Id of an experiment execution | Can be found in the [Chaos Studio Experiment Portal Blade](https://portal.azure.com/#blade/HubsExtension/BrowseResource/resourceType/Microsoft.chaos%2Fchaosexperiments) |

articles/chaos-studio/chaos-studio-tutorial-aks-portal.md

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,9 @@ Azure Chaos Studio uses [Chaos Mesh](https://chaos-mesh.org/), a free, open-sour
2323
> [!WARNING]
2424
> AKS Chaos Mesh faults are only supported on Linux node pools.
2525
26+
## Limitations
27+
- At present Chaos Mesh faults don’t work with private clusters.
28+
2629
## Set up Chaos Mesh on your AKS cluster
2730

2831
Before you can run Chaos Mesh faults in Chaos Studio, you need to install Chaos Mesh on your AKS cluster.

articles/chaos-studio/sample-template-experiment.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -119,7 +119,7 @@ In this sample, we create a chaos experiment with a single target resource and a
119119
"value": "eastus"
120120
},
121121
"chaosTargetResourceId": {
122-
"value": "eastus"
122+
"value": "/subscriptions/<subscription-id>/resourceGroups/<rg-name>/providers/Microsoft.DocumentDB/databaseAccounts/<account-name>"
123123
}
124124
}
125125
}

articles/cognitive-services/language-service/question-answering/includes/sdk-python.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -103,7 +103,7 @@ For information on how confident question answering is that this is the correct
103103
```python
104104
print("Q: {}".format(question))
105105
print("A: {}".format(output.answers[0].answer))
106-
print("Confidence Score: {}".format(output.answers[0].confidence_score)) # add this line
106+
print("Confidence Score: {}".format(output.answers[0].confidence)) # add this line
107107
```
108108

109109
You will now receive a result with a confidence score:

articles/communication-services/quickstarts/chat/includes/chat-swift.md

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -345,7 +345,11 @@ let user = ChatParticipant(
345345
chatThreadClient.add(participants: [user]) { result, _ in
346346
switch result {
347347
case let .success(result):
348-
(result.invalidParticipants != nil) ? print("Added participant") : print("Error adding participant")
348+
if let errors = result.invalidParticipants, !errors.isEmpty {
349+
print("Error adding participant")
350+
} else {
351+
print("Added participant")
352+
}
349353
case .failure:
350354
print("Failed to add the participant")
351355
}

articles/cosmos-db/sql/how-to-use-stored-procedures-triggers-udfs.md

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,6 @@ ms.custom: devx-track-python, devx-track-js, devx-track-csharp
1717

1818
The SQL API in Azure Cosmos DB supports registering and invoking stored procedures, triggers, and user-defined functions (UDFs) written in JavaScript. Once you've defined one or more stored procedures, triggers, and user-defined functions, you can load and view them in the [Azure portal](https://portal.azure.com/) by using Data Explorer.
1919

20-
SQL API SDKs are available for a wide variety of platforms and programming languages. If you haven't worked
21-
2220
You can use the SQL API SDK across multiple platforms including [.NET v2 (legacy)](sql-api-sdk-dotnet.md), [.NET v3](sql-api-sdk-dotnet-standard.md), [Java](sql-api-sdk-java.md), [JavaScript](sql-api-sdk-node.md), or [Python](sql-api-sdk-python.md) SDKs to perform these tasks. If you haven't worked with one of these SDKs before, see the *"Quickstart"* article for the appropriate SDK:
2321

2422
| SDK | Getting started |

articles/virtual-machines/disks-types.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -130,9 +130,9 @@ Premium SSD v2 supports a 4k physical sector size by default. A 512E sector size
130130

131131
The following table provides a comparison of disk capacities and performance maximums to help you decide which to use.
132132

133-
|Disk Size (GiB) |Maximum available IOPS |Maximum available throughput (MB/s) |
133+
|Disk Size |Maximum available IOPS |Maximum available throughput (MB/s) |
134134
|---------|---------|---------|
135-
|1-64 |3,000-80,000 (Increases by 500 IOPS per GiB) |125-1,200 (increases by 0.25 MB/s per set IOPS) |
135+
|1 GiB-64 TiB |3,000-80,000 (Increases by 500 IOPS per GiB) |125-1,200 (increases by 0.25 MB/s per set IOPS) |
136136

137137
To deploy a Premium SSD v2, see [Deploy a Premium SSD v2 (preview)](disks-deploy-premium-v2.md).
138138

0 commit comments

Comments
 (0)