Skip to content

Commit e498d51

Browse files
Albertyang0Albertyang0
authored
Merge pull request #301952 from MicrosoftDocs/release-aio-2507
Release branch staging PR for AIO 2507 - DO NOT MERGE
2 parents c4ad91b + af4fee2 commit e498d51

File tree

218 files changed

+8581
-4507
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

218 files changed

+8581
-4507
lines changed

‎articles/iot-operations/.openpublishing.redirection.iot-operations.json

Lines changed: 111 additions & 36 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,16 @@
55
"redirect_url": "/cli/azure/iot/ops",
66
"redirect_document_id": false
77
},
8+
{
9+
"source_path_from_root": "/articles/iot-operations/discover-manage-assets/concept-opcua-message-format.md",
10+
"redirect_url": "/azure/iot-operations/discover-manage-assets/overview-opc-ua-connector",
11+
"redirect_document_id": false
12+
},
13+
{
14+
"source_path_from_root": "/articles/iot-operations/discover-manage-assets/concept-opc-ua-message-format.md",
15+
"redirect_url": "/azure/iot-operations/discover-manage-assets/overview-opc-ua-connector",
16+
"redirect_document_id": false
17+
},
818
{
919
"source_path_from_root": "/articles/iot-operations/manage-layered-network/howto-configure-mq-layered-network.md",
1020
"redirect_url": "/azure/iot-operations/manage-layered-network/overview-layered-network",
@@ -17,27 +27,27 @@
1727
},
1828
{
1929
"source_path_from_root": "/articles/iot-operations/send-view-analyze-data/tutorial-real-time-dashboard-fabric.md",
20-
"redirect_url": "/azure/iot-operations/view-analyze-telemetry/tutorial-real-time-dashboard-fabric",
30+
"redirect_url": "/azure/iot-operations/end-to-end-tutorials/tutorial-add-assets",
2131
"redirect_document_id": false
2232
},
2333
{
2434
"source_path_from_root": "/articles/iot-operations/send-view-analyze-data/tutorial-upload-mqtt-lakehouse.md",
25-
"redirect_url": "/azure/iot-operations/view-analyze-telemetry/tutorial-upload-mqtt-lakehouse",
35+
"redirect_url": "/azure/iot-operations/connect-to-cloud/howto-create-dataflow",
2636
"redirect_document_id": false
2737
},
2838
{
2939
"source_path_from_root": "/articles/iot-operations/send-view-analyze-data/tutorial-connect-event-grid.md",
30-
"redirect_url": "/azure/iot-operations/get-started-end-to-end-sample/quickstart-upload-telemetry-to-cloud",
40+
"redirect_url": "/azure/iot-operations/get-started-end-to-end-sample/quickstart-configure",
3141
"redirect_document_id": false
3242
},
3343
{
3444
"source_path_from_root": "/articles/iot-operations/send-view-analyze-data/tutorial-event-driven-with-dapr.md",
35-
"redirect_url": "/azure/iot-operations/create-edge-apps/tutorial-event-driven-with-dapr",
45+
"redirect_url": "/azure/iot-operations/develop-edge-apps/tutorial-event-driven-with-dapr",
3646
"redirect_document_id": false
3747
},
3848
{
3949
"source_path_from_root": "/articles/iot-operations/get-started/quickstart-process-telemetry.md",
40-
"redirect_url": "/azure/iot-operations/get-started-end-to-end-sample/quickstart-upload-telemetry-to-cloud",
50+
"redirect_url": "/azure/iot-operations/get-started-end-to-end-sample/quickstart-configure",
4151
"redirect_document_id": false
4252
},
4353
{
@@ -47,13 +57,13 @@
4757
},
4858
{
4959
"source_path_from_root": "/articles/iot-operations/get-started/quickstart-add-assets.md",
50-
"redirect_url": "/azure/iot-operations/get-started-end-to-end-sample/quickstart-add-assets",
51-
"redirect_document_id": true
60+
"redirect_url": "/azure/iot-operations/get-started-end-to-end-sample/quickstart-configure",
61+
"redirect_document_id": false
5262
},
5363
{
5464
"source_path_from_root": "/articles/iot-operations/get-started/quickstart-upload-telemetry-to-cloud.md",
55-
"redirect_url": "/azure/iot-operations/get-started-end-to-end-sample/quickstart-upload-telemetry-to-cloud",
56-
"redirect_document_id": true
65+
"redirect_url": "/azure/iot-operations/get-started-end-to-end-sample/quickstart-configure",
66+
"redirect_document_id": false
5767
},
5868
{
5969
"source_path_from_root": "/articles/iot-operations/get-started/quickstart-get-insights.md",
@@ -97,12 +107,22 @@
97107
},
98108
{
99109
"source_path_from_root": "/articles/iot-operations/manage-devices-assets/overview-opcua-broker.md",
100-
"redirect_url": "/azure/iot-operations/discover-manage-assets/overview-opcua-broker",
110+
"redirect_url": "/azure/iot-operations/discover-manage-assets/overview-opc-ua-connector",
111+
"redirect_document_id": false
112+
},
113+
{
114+
"source_path_from_root": "/articles/iot-operations/discover-manage-assets/overview-opcua-broker.md",
115+
"redirect_url": "/azure/iot-operations/discover-manage-assets/overview-opc-ua-connector",
101116
"redirect_document_id": true
102117
},
103118
{
104119
"source_path_from_root": "/articles/iot-operations/manage-devices-assets/overview-opcua-broker-certificates-management.md",
105-
"redirect_url": "/azure/iot-operations/discover-manage-assets/overview-opcua-broker-certificates-management",
120+
"redirect_url": "/azure/iot-operations/discover-manage-assets/overview-opc-ua-connector-certificates-management",
121+
"redirect_document_id": false
122+
},
123+
{
124+
"source_path_from_root": "/articles/iot-operations/discover-manage-assets/overview-opcua-broker-certificates-management.md",
125+
"redirect_url": "/azure/iot-operations/discover-manage-assets/overview-opc-ua-connector-certificates-management",
106126
"redirect_document_id": true
107127
},
108128
{
@@ -111,18 +131,23 @@
111131
"redirect_document_id": true
112132
},
113133
{
114-
"source_path_from_root": "/articles/iot-operations/manage-devices-assets/howto-manage-assets-remotely.md",
115-
"redirect_url": "/azure/iot-operations/discover-manage-assets/howto-manage-assets-remotely",
116-
"redirect_document_id": true
134+
"source_path_from_root": "/articles/iot-operations/manage-devices-assets/howto-configure-opcua-certificates-infrastructure.md",
135+
"redirect_url": "/azure/iot-operations/discover-manage-assets/howto-configure-opc-ua-certificates-infrastructure",
136+
"redirect_document_id": false
117137
},
118138
{
119-
"source_path_from_root": "/articles/iot-operations/manage-devices-assets/howto-configure-opcua-certificates-infrastructure.md",
120-
"redirect_url": "/azure/iot-operations/discover-manage-assets/howto-configure-opcua-certificates-infrastructure",
139+
"source_path_from_root": "/articles/iot-operations/discover-manage-assets/howto-configure-opcua-certificates-infrastructure.md",
140+
"redirect_url": "/azure/iot-operations/discover-manage-assets/howto-configure-opc-ua-certificates-infrastructure",
121141
"redirect_document_id": true
122142
},
123143
{
124144
"source_path_from_root": "/articles/iot-operations/manage-devices-assets/howto-configure-opcua-authentication-options.md",
125-
"redirect_url": "/azure/iot-operations/discover-manage-assets/howto-configure-opcua-authentication-options",
145+
"redirect_url": "/azure/iot-operations/discover-manage-assets/howto-configure-opc-ua-authentication-options",
146+
"redirect_document_id": false
147+
},
148+
{
149+
"source_path_from_root": "/articles/iot-operations/discover-manage-assets/howto-configure-opcua-authentication-options.md",
150+
"redirect_url": "/azure/iot-operations/discover-manage-assets/howto-configure-opc-ua-authentication-options",
126151
"redirect_document_id": true
127152
},
128153
{
@@ -212,8 +237,8 @@
212237
},
213238
{
214239
"source_path_from_root": "/articles/iot-operations/monitor/howto-configure-observability-manual.md",
215-
"redirect_url": "/azure/iot-operations/configure-observability-monitoring/howto-configure-observability-manual",
216-
"redirect_document_id": true
240+
"redirect_url": "/azure/iot-operations/configure-observability-monitoring/howto-configure-observability",
241+
"redirect_document_id": false
217242
},
218243
{
219244
"source_path_from_root": "/articles/iot-operations/monitor/howto-configure-diagnostics.md",
@@ -227,17 +252,17 @@
227252
},
228253
{
229254
"source_path_from_root": "/articles/iot-operations/monitor/howto-add-cluster.md",
230-
"redirect_url": "/azure/iot-operations/configure-observability-monitoring/howto-add-cluster",
231-
"redirect_document_id": true
255+
"redirect_url": "/azure/iot-operations/configure-observability-monitoring/howto-configure-observability",
256+
"redirect_document_id": false
232257
},
233258
{
234259
"source_path_from_root": "/articles/iot-operations/view-analyze-data/tutorial-upload-mqtt-lakehouse.md",
235-
"redirect_url": "/azure/iot-operations/view-analyze-telemetry/tutorial-upload-mqtt-lakehouse",
260+
"redirect_url": "/azure/iot-operations/connect-to-cloud/howto-create-dataflow",
236261
"redirect_document_id": true
237262
},
238263
{
239264
"source_path_from_root": "/articles/iot-operations/view-analyze-data/tutorial-real-time-dashboard-fabric.md",
240-
"redirect_url": "/azure/iot-operations/view-analyze-telemetry/tutorial-real-time-dashboard-fabric",
265+
"redirect_url": "/azure/iot-operations/end-to-end-tutorials/tutorial-add-assets",
241266
"redirect_document_id": true
242267
},
243268
{
@@ -252,33 +277,33 @@
252277
},
253278
{
254279
"source_path_from_root": "/articles/iot-operations/develop/concept-about-distributed-apps.md",
255-
"redirect_url": "/azure/iot-operations/create-edge-apps/edge-apps-overview",
256-
"redirect_document_id": true
280+
"redirect_url": "/azure/iot-operations/develop-edge-apps/overview-edge-apps",
281+
"redirect_document_id": false
257282
},
258283
{
259284
"source_path_from_root": "/articles/iot-operations/develop/concept-about-state-store-protocol.md",
260-
"redirect_url": "/azure/iot-operations/create-edge-apps/concept-about-state-store-protocol",
261-
"redirect_document_id": true
285+
"redirect_url": "/azure/iot-operations/develop-edge-apps/reference-state-store-protocol",
286+
"redirect_document_id": false
262287
},
263288
{
264289
"source_path_from_root": "/articles/iot-operations/develop/howto-deploy-dapr.md",
265-
"redirect_url": "/azure/iot-operations/create-edge-apps/howto-deploy-dapr",
266-
"redirect_document_id": true
290+
"redirect_url": "/azure/iot-operations/develop-edge-apps/howto-deploy-dapr",
291+
"redirect_document_id": false
267292
},
268293
{
269294
"source_path_from_root": "/articles/iot-operations/develop/howto-develop-dapr-apps.md",
270-
"redirect_url": "/azure/iot-operations/create-edge-apps/howto-develop-dapr-apps",
271-
"redirect_document_id": true
295+
"redirect_url": "/azure/iot-operations/develop-edge-apps/howto-develop-dapr-apps",
296+
"redirect_document_id": false
272297
},
273298
{
274299
"source_path_from_root": "/articles/iot-operations/develop/howto-develop-mqttnet-apps.md",
275-
"redirect_url": "/azure/iot-operations/create-edge-apps/howto-develop-mqttnet-apps",
276-
"redirect_document_id": true
300+
"redirect_url": "/azure/iot-operations/develop-edge-apps/overview-edge-apps",
301+
"redirect_document_id": false
277302
},
278303
{
279304
"source_path_from_root": "/articles/iot-operations/develop/tutorial-event-driven-with-dapr.md",
280-
"redirect_url": "/azure/iot-operations/create-edge-apps/tutorial-event-driven-with-dapr",
281-
"redirect_document_id": true
305+
"redirect_url": "/azure/iot-operations/develop-edge-apps/tutorial-event-driven-with-dapr",
306+
"redirect_document_id": false
282307
},
283308
{
284309
"source_path_from_root": "/articles/iot-operations/connect-to-cloud/howto-configure-destination-blob.md",
@@ -467,7 +492,7 @@
467492
},
468493
{
469494
"source_path_from_root": "/articles/iot-operations/connect-to-cloud/tutorial-connect-event-grid.md",
470-
"redirect_url": "/azure/iot-operations/get-started-end-to-end-sample/quickstart-upload-telemetry-to-cloud",
495+
"redirect_url": "/azure/iot-operations/get-started-end-to-end-sample/quickstart-configure",
471496
"redirect_document_id": false
472497
},
473498
{
@@ -554,6 +579,56 @@
554579
"source_path_from_root": "/articles/iot-operations/secure-iot-ops/concept-default-root-ca.md",
555580
"redirect_url": "/azure/iot-operations/secure-iot-ops/howto-manage-certificates",
556581
"redirect_document_id": true
582+
},
583+
{
584+
"source_path_from_root": "/articles/iot-operations/discover-manage-assets/concept-assets-asset-endpoints.md",
585+
"redirect_url": "/azure/iot-operations/discover-manage-assets/concept-assets-devices",
586+
"redirect_document_id": true
587+
},
588+
{
589+
"source_path_from_root": "/articles/iot-operations/discover-manage-assets/howto-manage-assets-remotely.md",
590+
"redirect_url": "/azure/iot-operations/discover-manage-assets/howto-manage-assets-devices",
591+
"redirect_document_id": true
592+
},
593+
{
594+
"source_path_from_root": "/articles/iot-operations/create-edge-apps/edge-apps-overview.md",
595+
"redirect_url": "/azure/iot-operations/develop-edge-apps/overview-edge-apps",
596+
"redirect_document_id": true
597+
},
598+
{
599+
"source_path_from_root": "/articles/iot-operations/create-edge-apps/concept-about-state-store-protocol.md",
600+
"redirect_url": "/azure/iot-operations/develop-edge-apps/reference-state-store-protocol",
601+
"redirect_document_id": false
602+
},
603+
{
604+
"source_path_from_root": "/articles/iot-operations/create-edge-apps/howto-deploy-dapr.md",
605+
"redirect_url": "/azure/iot-operations/develop-edge-apps/howto-deploy-dapr",
606+
"redirect_document_id": true
607+
},
608+
{
609+
"source_path_from_root": "/articles/iot-operations/create-edge-apps/howto-develop-dapr-apps.md",
610+
"redirect_url": "/azure/iot-operations/develop-edge-apps/howto-develop-dapr-apps",
611+
"redirect_document_id": true
612+
},
613+
{
614+
"source_path_from_root": "/articles/iot-operations/create-edge-apps/tutorial-event-driven-with-dapr.md",
615+
"redirect_url": "/azure/iot-operations/develop-edge-apps/tutorial-event-driven-with-dapr",
616+
"redirect_document_id": true
617+
},
618+
{
619+
"source_path_from_root": "/articles/iot-operations/create-edge-apps/overview-state-store.md",
620+
"redirect_url": "/azure/iot-operations/develop-edge-apps/overview-state-store",
621+
"redirect_document_id": true
622+
},
623+
{
624+
"source_path_from_root": "/articles/iot-operations/create-edge-apps/howto-develop-mqttnet-apps.md",
625+
"redirect_url": "/azure/iot-operations/develop-edge-apps/overview-edge-apps",
626+
"redirect_document_id": false
627+
},
628+
{
629+
"source_path_from_root": "/articles/iot-operations/develop-edge-apps/concept-about-state-store-protocol.md",
630+
"redirect_url": "/azure/iot-operations/develop-edge-apps/reference-state-store-protocol",
631+
"redirect_document_id": false
557632
}
558633
]
559634
}

‎articles/iot-operations/configure-observability-monitoring/howto-configure-observability.md

Lines changed: 24 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -15,8 +15,6 @@ ms.date: 10/22/2024
1515

1616
Observability provides visibility into every layer of your Azure IoT Operations configuration. It gives you insight into the actual behavior of issues, which increases the effectiveness of site reliability engineering. Azure IoT Operations offers observability through custom curated Grafana dashboards that are hosted in Azure. These dashboards are powered by Azure Monitor managed service for Prometheus and by Container Insights. This guide shows you how to set up Azure Managed Prometheus and Grafana and enable monitoring for your Azure Arc cluster.
1717

18-
Complete the steps in this article *before* deploying Azure IoT Operations to your cluster.
19-
2018
## Prerequisites
2119

2220
* An Arc-enabled Kubernetes cluster.
@@ -43,8 +41,8 @@ Complete the steps in this article *before* deploying Azure IoT Operations to yo
4341
1. Install Azure CLI extensions for Metrics collection for Azure Arc-enabled clusters and Azure Managed Grafana.
4442

4543
```azurecli
46-
az extension add --name k8s-extension
47-
az extension add --name amg
44+
az extension add --upgrade --name k8s-extension
45+
az extension add --upgrade --name amg
4846
```
4947

5048
1. Create an Azure Monitor workspace to enable metric collection for your Azure Arc-enabled Kubernetes cluster.
@@ -231,6 +229,23 @@ Configure Prometheus metrics collection on your cluster.
231229
kubectl apply -f ama-metrics-prometheus-config.yaml
232230
```
233231

232+
233+
## Set up observability configuration
234+
235+
You can set up the observability configuration of your Azure IoT Operations deployment at any time. Once observability resources are configured, you can upgrade the observability configuration by running the `az iot ops upgrade` command with the `--ops-config` parameter to specify the new configuration values.
236+
237+
```azurecli
238+
az iot ops upgrade --resource-group <rg name> -n <instance name> --ops-config observability.metrics.openTelemetryCollectorAddress=<>
239+
```
240+
241+
| Parameter | Value | Description |
242+
| --------- | ----- | ----------- |
243+
| `--ops-config` | `observability.metrics.openTelemetryCollectorAddress=<FULLNAMEOVERRIDE>.azure-iot-operations.svc.cluster.local:<GRPC_ENDPOINT>` | Provide the OpenTelemetry (OTel) collector address you configured in the otel-collector-values.yaml file.<br><br>The [instructions in this article](#deploy-opentelemetry-collector) use the sample values **fullnameOverride=aio-otel-collector** and **grpc.endpoint=4317**. |
244+
| `--ops-config` | `observability.metrics.exportInternalSeconds=<CHECK_INTERVAL>` | Provide the **check_interval** value you configured in the otel-collector-values.yaml file.<br><br>The [instructions in this article](#deploy-opentelemetry-collector) use the sample value **check_interval=60**. |
245+
246+
> [!NOTE]
247+
> In preview releases, the `az iot ops upgrade` command doesn't work for upgrading to a preview version, but it works for configuring the Azure IoT Operations for observability.
248+
234249
## Deploy dashboards to Grafana
235250

236251
Azure IoT Operations provides a [sample dashboard](https://github.com/Azure/azure-iot-operations/tree/main/samples/grafana-dashboard) designed to give you many of the visualizations you need to understand the health and performance of your Azure IoT Operations deployment.
@@ -245,12 +260,15 @@ Complete the following steps to install the Azure IoT Operations curated Grafana
245260
az grafana show --name <GRAFANA_NAME> --resource-group <RESOURCE_GROUP> --query url -o tsv
246261
```
247262

248-
1. In the Grafana application, select the **+** icon.
263+
1. On the Grafana landing page, select the **Create your first dashboard** tile.
249264

250-
1. Select **Import dashboard**.
265+
1. Select **Import Dashboard**.
251266

252267
1. Browse to the sample dashboard directory in your local copy of the Azure IoT Operations repository, **azure-iot-operations** > **samples** > **grafana-dashboard**, then select the `aio.sample.json` dashboard file.
253268

254269
1. When the application prompts, select your managed Prometheus data source.
255270

256271
1. Select **Import**.
272+
273+
274+

‎articles/iot-operations/connect-to-cloud/concept-dataflow-enrich.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ For example, consider the following dataset with a few records, using the [JSON
2626
{ "Position": "Receptionist", "BaseSalary": 43000, "WorkingHours": "Regular" }
2727
```
2828

29-
The mapper accesses the reference dataset stored in the Azure IoT Operations [state store](../create-edge-apps/concept-about-state-store-protocol.md) by using a key value based on a *condition* specified in the mapping configuration. Key names in the state store correspond to a dataset in the data flow configuration.
29+
The mapper accesses the reference dataset stored in the Azure IoT Operations [state store](../develop-edge-apps/reference-state-store-protocol.md) by using a key value based on a *condition* specified in the mapping configuration. Key names in the state store correspond to a dataset in the data flow configuration.
3030

3131
# [Bicep](#tab/bicep)
3232

0 commit comments

Comments
 (0)