Skip to content

Commit 836cb78

Browse files
authored
Merge pull request #268696 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 6511794 + 44e5fa5 commit 836cb78

File tree

8 files changed

+18
-159
lines changed

8 files changed

+18
-159
lines changed

articles/ai-services/document-intelligence/studio-overview.md

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -19,9 +19,7 @@ monikerRange: '>=doc-intel-3.0.0'
1919

2020
[!INCLUDE [applies to v4.0 v3.1 v3.0](includes/applies-to-v40-v31-v30.md)]
2121

22-
Document Intelligence Studio is an online tool to visually explore, understand, train, and integrate features from the Document Intelligence service into your applications. The studio provides a platform for you to experiment with the different Document Intelligence models and sample returned data in an interactive manner without the need to write code.
23-
24-
[Document Intelligence Studio](https://documentintelligence.ai.azure.com/studio/) is an online tool for visually exploring, understanding, and integrating features from the Document Intelligence service into your applications. Use the Document Intelligence Studio to:
22+
[Document Intelligence Studio](https://documentintelligence.ai.azure.com/studio/) is an online tool to visually explore, understand, train, and integrate features from the Document Intelligence service into your applications. The studio provides a platform for you to experiment with the different Document Intelligence models and sample returned data in an interactive manner without the need to write code. Use the Document Intelligence Studio to:
2523
* Learn more about the different capabilities in Document Intelligence.
2624
* Use your Document Intelligence resource to test models on sample documents or upload your own documents.
2725
* Experiment with different add-on and preview features to adapt the output to your needs.

articles/aks/ai-toolchain-operator.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -135,7 +135,7 @@ The following sections describe how to create an AKS cluster with the AI toolcha
135135
-o tsv)
136136
export PRINCIPAL_ID=$(az identity show --name "ai-toolchain-operator-${CLUSTER_NAME}" \
137137
--resource-group "${MC_RESOURCE_GROUP}" \
138-
--query 'principalId'
138+
--query 'principalId' \
139139
-o tsv)
140140
export KAITO_IDENTITY_NAME="ai-toolchain-operator-${CLUSTER_NAME}"
141141
```

articles/aks/cluster-autoscaler.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -160,8 +160,8 @@ The following table lists the available settings for the cluster autoscaler prof
160160
| `scale-down-utilization-threshold` | Node utilization level, defined as sum of requested resources divided by capacity, in which a node can be considered for scale down. | 0.5 |
161161
| `max-graceful-termination-sec` | Maximum number of seconds the cluster autoscaler waits for pod termination when trying to scale down a node. | 600 seconds |
162162
| `balance-similar-node-groups` | Detects similar node pools and balances the number of nodes between them. | `false` |
163-
| `expander` | Type of node pool [expander](https://github.com/kubernetes/autoscaler/blob/master/cluster-autoscaler/FAQ.md#what-are-expanders) uses in scale up. Possible values include `most-pods`, `random`, `least-waste`, and `priority`. | |
164-
| `skip-nodes-with-local-storage` | If `true`, cluster autoscaler doesn't delete nodes with pods with local storage, for example, EmptyDir or HostPath. | `true` |
163+
| `expander` | Type of node pool [expander](https://github.com/kubernetes/autoscaler/blob/master/cluster-autoscaler/FAQ.md#what-are-expanders) uses in scale up. Possible values include `most-pods`, `random`, `least-waste`, and `priority`. | `random` |
164+
| `skip-nodes-with-local-storage` | If `true`, cluster autoscaler doesn't delete nodes with pods with local storage, for example, EmptyDir or HostPath. | `false` |
165165
| `skip-nodes-with-system-pods` | If `true`, cluster autoscaler doesn't delete nodes with pods from kube-system (except for DaemonSet or mirror pods). | `true` |
166166
| `max-empty-bulk-delete` | Maximum number of empty nodes that can be deleted at the same time. | 10 nodes |
167167
| `new-pod-scale-up-delay` | For scenarios such as burst/batch scale where you don't want CA to act before the Kubernetes scheduler could schedule all the pods, you can tell CA to ignore unscheduled pods before they reach a certain age. | 0 seconds |

articles/azure-monitor/agents/azure-monitor-agent-troubleshoot-linux-vm-rsyslog.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ The next sections describe the issue.
4646
Azure Monitor Agent for Linux buffers events to `/var/opt/microsoft/azuremonitoragent/events` prior to ingestion. On a default Azure Monitor Agent for Linux installation, this directory takes ~650 MB of disk space at idle. The size on disk increases when it's under sustained logging load. It gets cleaned up about every 60 seconds and reduces back to ~650 MB when the load returns to idle.
4747

4848
#### Confirm the issue of a full disk
49-
The `df` command shows almost no space available on `/dev/sda1`, as shown here:
49+
The `df` command shows almost no space available on `/dev/sda1`, as shown in the following output. Note that you should examine the line item that correlates to the log directory (for example, `/var/log` or `/var` or `/`).
5050

5151
```bash
5252
df -h

articles/iot-operations/connect-to-cloud/tutorial-connect-event-grid.md

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -346,6 +346,9 @@ You can also check the Event Grid metrics to verify the messages are delivered t
346346

347347
:::image type="content" source="media/tutorial-connect-event-grid/event-grid-metrics.png" alt-text="Screenshot of the metrics view in Azure portal to show successful MQTT messages.":::
348348

349+
> [!TIP]
350+
> You can check the configurations of topic maps, QoS, and message routes with the [CLI extension](/cli/azure/iot/ops#az-iot-ops-check-examples) `az iot ops check --detail-level 2`.
351+
349352
## Next steps
350353

351354
In this tutorial, you learned how to configure IoT MQ for bi-directional MQTT bridge with Azure Event Grid MQTT broker. As next steps, explore the following scenarios:

articles/iot-operations/deploy-iot-ops/howto-deploy-iot-operations.md

Lines changed: 8 additions & 150 deletions
Original file line numberDiff line numberDiff line change
@@ -57,63 +57,7 @@ A cluster host:
5757

5858
## Deploy extensions
5959

60-
#### [Azure portal](#tab/portal)
61-
62-
Use the Azure portal to deploy Azure IoT Operations components to your Arc-enabled Kubernetes cluster.
63-
64-
1. In the Azure portal search bar, search for and select **Azure Arc**.
65-
66-
1. Select **Azure IoT Operations (preview)** from the **Application Services** section of the Azure Arc menu.
67-
68-
1. Select **Create**.
69-
70-
1. On the **Basic** tab of the **Install Azure IoT Operations Arc Extension** page, provide the following information:
71-
72-
| Field | Value |
73-
| ----- | ----- |
74-
| **Subscription** | Select the subscription that contains your Arc-enabled Kubernetes cluster. |
75-
| **Resource group** | Select the resource group that contains your Arc-enabled Kubernetes cluster. |
76-
| **Cluster name** | Select your cluster. When you do, the **Custom location** and **Deployment details** sections autofill. |
77-
78-
1. Select **Next: Configuration**.
79-
80-
1. On the **Configuration** tab, provide the following information:
81-
82-
| Field | Value |
83-
| ----- | ----- |
84-
| **Deploy a simulated PLC** | Switch this toggle to **Yes**. The simulated PLC creates demo telemetry data that you use in the following quickstarts. |
85-
| **Mode** | Set the MQ configuration mode to **Auto**. |
86-
87-
1. Select **Next: Automation**.
88-
89-
1. On the **Automation** tab, provide the following information:
90-
91-
| Field | Value |
92-
| ----- | ----- |
93-
| **Subscription** | Select the subscription that contains your Arc-enabled Kubernetes cluster. |
94-
| **Azure Key vault** | Choose an existing key vault from the drop-down list or create a new one by selecting **Create new**. |
95-
96-
1. Once you select a key vault, the **Automation** tab uses all the information you've selected so far to populate an Azure CLI command that configures your cluster and deploys Azure IoT Operations. Copy the CLI command.
97-
98-
:::image type="content" source="../get-started/media/quickstart-deploy/install-extension-automation.png" alt-text="Screenshot of copying the CLI command from the automation tab for installing the Azure IoT Operations Arc extension in the Azure portal.":::
99-
100-
1. Sign in to Azure CLI on your development machine. To prevent potential permission issues later, sign in interactively with a browser here even if you've already logged in before.
101-
102-
```azurecli
103-
az login
104-
```
105-
106-
> [!NOTE]
107-
> If you're using GitHub Codespaces in a browser, `az login` returns a localhost error in the browser window after logging in. To fix, either:
108-
>
109-
> * Open the codespace in VS Code desktop, and then run `az login` again in the browser terminal.
110-
> * After you get the localhost error on the browser, copy the URL from the browser and run `curl "<URL>"` in a new terminal tab. You should see a JSON response with the message "You have logged into Microsoft Azure!."
111-
112-
1. Run the copied [az iot ops init](/cli/azure/iot/ops#az-iot-ops-init) command on your development machine.
113-
114-
Wait for the command to complete.
115-
116-
#### [Azure CLI](#tab/cli)
60+
### Azure CLI
11761

11862
Use the Azure CLI to deploy Azure IoT Operations components to your Arc-enabled Kubernetes cluster.
11963

@@ -146,101 +90,12 @@ az iot ops init --cluster <CLUSTER_NAME> -g <RESOURCE_GROUP> --kv-id $(az keyvau
14690
14791
If you don't have **Microsoft.Authorization/roleAssignment/write** permissions in your Azure subscription, include the `--disable-rsync-rules` feature flag.
14892

149-
Use optional flags to customize the `az iot ops init` command. To learn more, see [az iot ops init](/cli/azure/iot/ops#az-iot-ops-init).
150-
151-
#### [GitHub Actions](#tab/github)
152-
153-
Use GitHub Actions to deploy Azure IoT Operations components to your Arc-enabled Kubernetes cluster.
154-
155-
Before you begin deploying, use the [az iot ops init](/cli/azure/iot/ops#az-iot-ops-init) command to configure your cluster with a secrets store and a service principal so that it can connect securely to cloud resources.
156-
157-
1. Sign in to Azure CLI on your development machine. To prevent potential permission issues later, sign in interactively with a browser here even if you already logged in before.
158-
159-
```azurecli
160-
az login
161-
```
93+
If you encounter an issue with the KeyVault access policy and the Service Principal (SP) permissions, [pass service principal and KeyVault arguments](howto-manage-secrets.md#pass-service-principal-and-key-vault-arguments-to-azure-iot-operations-deployment).
16294

163-
1. Run the `az iot ops init` command to do the following:
164-
165-
* Create a key vault in your resource group.
166-
* Set up a service principal to give your cluster access to the key vault.
167-
* Configure TLS certificates.
168-
* Configure a secrets store on your cluster that connects to the key vault.
169-
170-
```azurecli-interactive
171-
az iot ops init --cluster <CLUSTER_NAME> -g <RESOURCE_GROUP> --kv-id $(az keyvault create -n <NEW_KEYVAULT_NAME> -g <RESOURCE_GROUP> -o tsv --query id) --no-deploy
172-
```
173-
174-
>[!TIP]
175-
>If you get an error that says *Your device is required to be managed to access your resource*, go back to the previous step and make sure that you signed in interactively.
176-
177-
Now, you can deploy Azure IoT Operations to your cluster.
178-
179-
1. On GitHub, fork the [azure-iot-operations repo](https://github.com/azure/azure-iot-operations).
180-
181-
>[!IMPORTANT]
182-
>You're going to be adding secrets to the repo to run the deployment steps. It's important that you fork the repo and do all of the following steps in your own fork.
183-
184-
1. Review the [azure-iot-operations.json](https://github.com/Azure/azure-iot-operations/blob/main/release/azure-iot-operations.json) file in the repo. This template defines the Azure IoT Operations deployment.
185-
186-
1. Create a service principal for the repository to use when deploying to your cluster. Use the [az ad sp create-for-rbac](/cli/azure/ad/sp#az-ad-sp-create-for-rbac) command.
187-
188-
```azurecli
189-
az ad sp create-for-rbac --name <NEW_SERVICE_PRINCIPAL_NAME> \
190-
--role owner \
191-
--scopes /subscriptions/<YOUR_SUBSCRIPTION_ID>
192-
--json-auth
193-
```
194-
195-
1. Copy the JSON output from the service principal creation command.
196-
197-
1. On GitHub, navigate to your fork of the azure-iot-operations repo.
198-
199-
1. Select **Settings** > **Secrets and variables** > **Actions**.
200-
201-
1. Create a repository secret named `AZURE_CREDENTIALS` and paste the service principal JSON as the secret value.
202-
203-
1. Create a parameter file in your forked repo to specify the environment configuration for your Azure IoT Operations deployment. For example, `envrionments/parameters.json`.
204-
205-
1. Paste the following snippet into the parameters file, replacing the `clusterName` placeholder value with your own information:
206-
207-
```json
208-
{
209-
"$schema": "https://schema.management.azure.com/schemas/2019-04-01/deploymentParameters.json#",
210-
"contentVersion": "1.0.0.0",
211-
"parameters": {
212-
"clusterName": {
213-
"value": "<CLUSTER_NAME>"
214-
}
215-
}
216-
}
217-
```
218-
219-
1. Add any of the following optional parameters as needed for your deployment:
220-
221-
| Parameter | Type | Description |
222-
| --------- | ---- | ----------- |
223-
| `clusterLocation` | string | Specify the cluster's location if it's different than the resource group's location. Otherwise, this parameter defaults to the resource group's location. |
224-
| `location` | string | If the resource group's location isn't supported for Azure IoT Operations deployments, use this parameter to override the default and set the location for the Azure IoT Operations resources. |
225-
| `simulatePLC` | Boolean | Set to `true` if you want to include a simulated component to generate test data. |
226-
| `dataProcessorSecrets` | object | Pass a secret to an Azure IoT Data Processor resource. |
227-
| `mqSecrets` | object | Pass a secret to an Azure IoT MQ resource. |
228-
| `opcUaBrokerSecrets` | object | Pass a secret to an Azure IoT OPC UA Broker resource. |
229-
| `deployResourceSyncRules` | Set to `false` if you don't have **Microsoft.Authorization/roleAssignment/write** permissions in your Azure subscription. |
230-
231-
1. Save your changes to the parameters file.
232-
233-
1. On the GitHub repo, select **Actions** and confirm **I understand my workflows, go ahead and enable them.**
234-
235-
1. Run the **GitOps Deployment of Azure IoT Operations** action and provide the following information:
236-
237-
| Parameter | Value |
238-
| --------- | ----- |
239-
| **Subscription** | Your Azure subscription ID. |
240-
| **Resource group** | The name of the resource group that contains your Arc-enabled cluster. |
241-
| **Environment parameters file** | The path to the parameters file that you created. |
95+
Use optional flags to customize the `az iot ops init` command. To learn more, see [az iot ops init](/cli/azure/iot/ops#az-iot-ops-init).
24296

243-
---
97+
> [!TIP]
98+
> You can check the configurations of topic maps, QoS, message routes with the [CLI extension](/cli/azure/iot/ops#az-iot-ops-check-examples) `az iot ops check --detail-level 2`.
24499
245100
### Configure cluster network (AKS EE)
246101

@@ -288,6 +143,9 @@ To view your cluster on the Azure portal, use the following steps:
288143

289144
There's also an extension called **akvsecretsprovider**. This extension is the secrets provider that you configured and installed on your cluster with the `az iot ops init` command. You might delete and reinstall the Azure IoT Operations components during testing, but keep the secrets provider extension on your cluster.
290145

146+
> [!TIP]
147+
> You can run `az iot ops check` to assess health and configurations of deployed AIO workloads. By default, MQ including cloud connectors are assessed and you can [specifiy the service](/cli/azure/iot/ops#az-iot-ops-check-examples) with `--ops-service --svc`.
148+
291149
## Update a deployment
292150

293151
Currently, there is no support for updating an existing Azure IoT Operations deployment. Instead, start with a clean cluster for a new deployment.

articles/iot-operations/manage-mqtt-connectivity/howto-configure-authentication.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -386,7 +386,7 @@ A sample custom authentication server and instructions are available on [GitHub]
386386

387387
#### API
388388

389-
The API between Azure IoT MQ and the custom authentication server follow the API specification for custom authentication. The OpenAPI specification is available on [GitHub](https://github.com/Azure-Samples/explore-iot-operations/blob/main/samples/auth-server-template/api.yaml).
389+
The API between Azure IoT MQ and the custom authentication server follow the API specification for custom authentication. The OpenAPI specification is available on [GitHub](https://github.com/Azure-Samples/explore-iot-operations/blob/main/samples/auth-server-template/api/0.5.0.yaml).
390390

391391
#### HTTPS with TLS encryption is required
392392

articles/machine-learning/how-to-managed-network.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1013,7 +1013,7 @@ If you plan to use __Azure Machine Learning batch endpoints__ for deployment, ad
10131013
* `queue`
10141014
* `table`
10151015

1016-
### Scenario: Use prompt flow with Azure Open AI, content safety, and Azure AI Search
1016+
### Scenario: Use prompt flow with Azure OpenAI, content safety, and Azure AI Search
10171017

10181018
* Private endpoint to Azure AI Services
10191019
* Private endpoint to Azure AI Search

0 commit comments

Comments
 (0)