Merge pull request #289255 from kgremban/m3-observ

Observability fixes

Author: prmerger-automator[bot]

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

@@ -123,6 +123,7 @@ Define and deploy an [OpenTelemetry (OTel) Collector](https://opentelemetry.io/d
          endpoint: ':8889'
          resource_to_telemetry_conversion:
            enabled: true
+         add_metric_suffixes: false
      service:
        extensions:
          - health_check
@@ -158,7 +159,7 @@ Define and deploy an [OpenTelemetry (OTel) Collector](https://opentelemetry.io/d
        enabled: false
    ```
 
-1. In the `otel-collector-values.yaml` file, make a note of the following values that you use in the `az iot ops init` command when you deploy Azure IoT Operations on the cluster:
+1. In the `otel-collector-values.yaml` file, make a note of the following values that you use in the `az iot ops create` command when you deploy Azure IoT Operations on the cluster:
 
    * **fullnameOverride**
    * **grpc.endpoint**
@@ -234,11 +235,11 @@ Configure Prometheus metrics collection on your cluster.
 
 ## Deploy dashboards to Grafana
 
-Azure IoT Operations provides a [collection of dashboards](https://github.com/Azure/azure-iot-operations/tree/main/samples/grafana-dashboards) designed to give you many of the visualizations you need to understand the health and performance of your Azure IoT Operations deployment.
+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.
 
 Complete the following steps to install the Azure IoT Operations curated Grafana dashboards.
 
-1. Clone or download the **azure-iot-operations** repository to get the sample Grafana Dashboard json files locally: [https://github.com/Azure/azure-iot-operations](https://github.com/Azure/azure-iot-operations).
+1. Clone or download the **azure-iot-operations** repository to get the sample Grafana Dashboard json file locally: [https://github.com/Azure/azure-iot-operations](https://github.com/Azure/azure-iot-operations).
 
 1. Sign in to the Grafana console. You can access the console through the Azure portal or use the `az grafana show` command to retrieve the URL.
 
@@ -250,7 +251,7 @@ Complete the following steps to install the Azure IoT Operations curated Grafana
 
 1. Select **Import dashboard**.
 
-1. Browse to the sample dashboards directory in your local copy of the Azure IoT Operations repository, **azure-iot-operations** > **samples** > **grafana-dashboards**, then select a JSON dashboard file.
+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.
 
 1. When the application prompts, select your managed Prometheus data source.
 

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

@@ -144,20 +144,20 @@ Use these steps if you chose the **Test settings** option on the **Dependency ma
 
    1. Prepare the cluster for Azure IoT Operations deployment. Copy and run the provided [az iot ops init](/cli/azure/iot/ops#az-iot-ops-init) command.
 
-      If you followed the optional prerequisites to prepare your cluster for observability, add the following optional parameters to the `init` command:
-
-      | Optional parameter | Value | Description |
-      | --------- | ----- | ----------- |
-      | `--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 sample values used in [Configure observability](../configure-observability-monitoring/howto-configure-observability.md) are **fullnameOverride=aio-otel-collector** and **grpc.enpoint=4317**. |
-      | `--ops-config` | `observability.metrics.exportInternalSeconds=<CHECK_INTERVAL>` | Provide the **check_interval** value you configured in the otel-collector-values.yaml file.<br><br>The sample value used in [Configure observability](../configure-observability-monitoring/howto-configure-observability.md) is **check_interval=60**. |
-
       >[!TIP]
       >The `init` command only needs to be run once per cluster. If you're reusing a cluster that already had Azure IoT Operations version 0.8.0 deployed on it, you can skip this step.
 
       This command might take several minutes to complete. You can watch the progress in the deployment progress display in the terminal.
 
    1. Deploy Azure IoT Operations. Copy and run the provided [az iot ops create](/cli/azure/iot/ops#az-iot-ops-create) command.
 
+      If you followed the optional prerequisites to prepare your cluster for observability, add the following optional parameters to the `create` command:
+
+      | Optional parameter | Value | Description |
+      | --------- | ----- | ----------- |
+      | `--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 sample values used in [Configure observability](../configure-observability-monitoring/howto-configure-observability.md) are **fullnameOverride=aio-otel-collector** and **grpc.enpoint=4317**. |
+      | `--ops-config` | `observability.metrics.exportInternalSeconds=<CHECK_INTERVAL>` | Provide the **check_interval** value you configured in the otel-collector-values.yaml file.<br><br>The sample value used in [Configure observability](../configure-observability-monitoring/howto-configure-observability.md) is **check_interval=60**. |
+
       This command might take several minutes to complete. You can watch the progress in the deployment progress display in the terminal.
 
 1. Once all of the Azure CLI commands complete successfully, you can close the **Install Azure IoT Operations** wizard.
@@ -209,20 +209,20 @@ Use these steps if you chose the **Secure settings** option on the **Dependency
 
    1. Prepare the cluster for Azure IoT Operations deployment. Copy and run the provided [az iot ops init](/cli/azure/iot/ops#az-iot-ops-init) command.
 
-      If you followed the optional prerequisites to prepare your cluster for observability, add the following optional parameters to the `init` command:
-
-      | Optional parameter | Value | Description |
-      | --------- | ----- | ----------- |
-      | `--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 sample values used in [Configure observability](../configure-observability-monitoring/howto-configure-observability.md) are **fullnameOverride=aio-otel-collector** and **grpc.enpoint=4317**. |
-      | `--ops-config` | `observability.metrics.exportInternalSeconds=<CHECK_INTERVAL>` | Provide the **check_interval** value you configured in the otel-collector-values.yaml file.<br><br>The sample value used in [Configure observability](../configure-observability-monitoring/howto-configure-observability.md) is **check_interval=60**. |
-
       >[!TIP]
       >The `init` command only needs to be run once per cluster. If you're reusing a cluster that already had Azure IoT Operations version 0.8.0 deployed on it, you can skip this step.
 
       This command might take several minutes to complete. You can watch the progress in the deployment progress display in the terminal.
 
    1. Deploy Azure IoT Operations. Copy and run the provided [az iot ops create](/cli/azure/iot/ops#az-iot-ops-create) command.
 
+      If you followed the optional prerequisites to prepare your cluster for observability, add the following optional parameters to the `create` command:
+
+      | Optional parameter | Value | Description |
+      | --------- | ----- | ----------- |
+      | `--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 sample values used in [Configure observability](../configure-observability-monitoring/howto-configure-observability.md) are **fullnameOverride=aio-otel-collector** and **grpc.enpoint=4317**. |
+      | `--ops-config` | `observability.metrics.exportInternalSeconds=<CHECK_INTERVAL>` | Provide the **check_interval** value you configured in the otel-collector-values.yaml file.<br><br>The sample value used in [Configure observability](../configure-observability-monitoring/howto-configure-observability.md) is **check_interval=60**. |
+
       This command might take several minutes to complete. You can watch the progress in the deployment progress display in the terminal.
 
    1. Enable secret sync for the deployed Azure IoT Operations instance. Copy and run the provided [az iot ops secretsync enable](/cli/azure/iot/ops/secretsync#az-iot-ops-secretsync-enable) command.