Merge branch 'main' of https://github.com/MicrosoftDocs/azure-docs-pr into rolyon-includes-active-directory-cleanup-v15

Author: rolyon

articles/iot-operations/monitor/howto-add-cluster.md

@@ -0,0 +1,56 @@
+---
+title: Add a cluster
+description: How to add an Arc-enabled cluster to existing observability infrastructure in Azure IoT Operations.
+author: timlt
+ms.author: timlt
+ms.topic: how-to
+ms.date: 02/27/2024
+
+# CustomerIntent: As an IT admin or operator, I want to add more Arc-enabled clusters
+# to my existing observability infrastructure. 
+---
+
+# Add an Arc-enabled cluster to existing observability infrastructure
+
+[!INCLUDE [public-preview-note](../includes/public-preview-note.md)]
+
+You can share observability resources across multiple Arc-enabled clusters that run Azure IoT Operations. This article shows how to add another Arc-enabled cluster to the observability infrastructure that you created in [Get started: configure observability](howto-configure-observability.md).
+
+## Prerequisites
+
+- Azure IoT Operations installed. For more information, see [Get started: configure observability](howto-configure-observability.md).
+
+## Add an Arc-enabled cluster
+To create this setup, run the following command. Specify the two resource IDs for the observability components that were output when you ran the steps in [Install observability components](howto-configure-observability.md#install-observability-components). 
+
+Specify the resource group and name of the new Arc enabled cluster in the `resource-group` and `cluster-name` parameters:
+
+```azurecli
+az deployment group create \
+      --subscription <cluster-subscription-id> \
+      --resource-group <cluster-resource-group> \
+      --template-file cluster.bicep \
+      --parameters clusterName=<cluster-name> \
+                  azureMonitorId=<azure-monitor-resource-id> \
+                  logAnalyticsId=<log-analytics-resource-id>
+```
+
+If Azure Monitor or Log Analytics is in a different region from your cluster, the previous command produces an error. To resolve the error, pass the extra `azureMonitorLocation` and `logAnalyticsLocation` parameters:
+
+```azurecli
+az deployment group create \
+      --subscription <cluster-subscription-id> \
+      --resource-group <cluster-resource-group> \
+      --template-file cluster.bicep \
+      --parameters clusterName=<cluster-name> \
+                  azureMonitorId=<azure-monitor-resource-id> \
+                  logAnalyticsId=<log-analytics-resource-id> \
+                  azureMonitorLocation=<azure-monitor-location> \
+                  logAnalyticsLocation=<log-analytics-location>
+```
+
+To set up Prometheus metrics collection for the new Arc enabled cluster, follow the steps in [Configure Prometheus metrics collection](howto-configure-observability.md#configure-prometheus-metrics-collection).
+
+## Access Grafana dashboards
+
+Navigate to the endpoint for the Grafana instance that you created previously in [Get started: configure observability](howto-configure-observability.md). If you didn't already do so, create the relevant dashboards by going to the [dashboard list](https://github.com/Azure/azure-iot-operations/tree/main/samples/grafana-dashboards). In the dashboards, you see the name of the new Arc-enabled cluster in the **Cluster** selector dropdown. 

articles/iot-operations/monitor/howto-clean-up-observability-resources.md

@@ -0,0 +1,51 @@
+---
+title: Clean up observability resources
+description: How to clean up shared and data collection observability resources from an existing installation in Azure IoT Operations.
+author: timlt
+ms.author: timlt
+ms.topic: how-to
+ms.date: 02/27/2024
+
+# CustomerIntent: As an IT admin or operator, I want to be able to clean up and remove
+# observability resources installed on my cluster, without removing the cluster. 
+---
+
+# Clean up observability resources
+This article shows how to clean up the observability resources in your cluster without removing the cluster itself. 
+
+## Delete resources
+
+To uninstall the observability resources, complete the following steps.
+
+1. Navigate to the resource group where you installed the shared resources, and delete the following resources:
+
+    - Azure Monitor Workspace
+    - Azure Managed Grafana
+    - Log Analytics Workspace
+    - Container Insights Solution
+
+    For a resource group with a single cluster connected, the following screenshot shows what the list of resources looks like:
+    
+    :::image type="content" source="media/howto-clean-up-observability-resources/shared-resource-delete.png" alt-text="Screenshot that lists a set of shared resources."  lightbox="media/howto-clean-up-observability-resources/shared-resource-delete-expanded.png":::
+
+1. Navigate to the resource group where your cluster is located (if different from the resource group for the previous resources). Delete the following resources: 
+
+    - The data collection endpoint
+    - The two data collection rules (one ends with "logsDataCollectionRule" and the other ends with "metricsDataCollectionRule")
+    - The two recording rule groups (one ends with "KubernetesRecordingRuleGroup" and the other ends with "NodeRecordingRuleGroup")
+
+    > [!NOTE]  
+    > You might need to run the delete more than once for all resources to be successfully deleted. 
+
+## Delete the configuration from your cluster
+
+Finally, you can remove the configuration that was installed on your cluster. To do that, run the following command:
+
+```bash
+kubectl delete -f ama-metrics-prometheus-config.yaml
+```
+
+## Related content
+
+- [Get started: configure observability](howto-configure-observability.md)
+- [How to configure observability manually](howto-configure-observability-manual.md)

articles/iot-operations/monitor/howto-configure-diagnostics.md

@@ -1,20 +1,19 @@
 ---
 title: Configure MQ diagnostics service
-titleSuffix: Azure IoT MQ
-description: How to configure Azure IoT MQ diagnostics service.
+description: How to configure the Azure IoT MQ diagnostics service to create a Prometheus endpoint, and monitor the health of the system.
 author: timlt
 ms.author: timlt
 ms.subservice: mq
-ms.topic: how-to
+ms.topic: concept-article
 ms.custom:
   - ignite-2023
-ms.date: 11/14/2023
+ms.date: 02/27/2024
 
 #CustomerIntent: As an operator, I want to understand how to use observability and diagnostics 
 #to monitor the health of the MQ service.
 ---
 
-# Configure Azure IoT MQ diagnostic service settings
+# Configure Azure IoT MQ preview diagnostic service settings
 
 Azure IoT MQ includes a diagnostics service that periodically self tests Azure IoT MQ components and emits metrics. Operators can use these metrics to monitor the health of the system. The diagnostics service provides a Prometheus endpoint for metrics from all IoT MQ components including Broker self-test metrics.
 
@@ -37,7 +36,9 @@ The diagnostics service processes and collates diagnostic signals from various A
 | openTelemetryTracesCollectorAddr | false | String | `null` | Endpoint URL of the OpenTelemetry collector |
 | staleDataTimeoutSeconds | false | Int32 | `600` | Data timeouts in seconds |
 
-Here's an example of a Diagnostics service resource with basic configuration:
+## Example of a diagnostics service resource
+
+Here's an example of a diagnostics service resource with basic configuration:
 
 ```yaml
 apiVersion: mq.iotoperations.azure.com/v1beta1

articles/iot-operations/monitor/howto-configure-observability-manual.md

@@ -0,0 +1,56 @@
+---
+title: Configure observability manually
+description: How to configure observability features manually in Azure IoT Operations so that you can monitor your solution.
+author: timlt
+ms.author: timlt
+ms.topic: how-to
+ms.date: 02/27/2024
+
+# CustomerIntent: As an IT admin or operator, I want to monitor and visualize data
+# on the health of my industrial assets and edge environment.
+---
+
+# Configure observability manually
+
+[!INCLUDE [public-preview-note](../includes/public-preview-note.md)]
+
+This article shows how to install and configure Azure IoT Operations observability components manually. This approach provides more options and control over your environment. For a simplified setup process that installs all the components you need to get started, see [Get started: configure observability](howto-configure-observability.md).
+
+## Configure your subscription
+
+Run the following code to register providers with the subscription where your cluster is located:
+
+```azurecli
+az account set -s <subscription-id>
+az provider register -n "Microsoft.Insights"
+az provider register -n "Microsoft.AlertsManagement"
+```
+
+## Install Azure Monitor managed service for Prometheus
+Azure Monitor managed service for Prometheus is a component of Azure Monitor Metrics. This managed service provides flexibility in the types of metric data that you can collect and analyze with Azure Monitor. Prometheus metrics share some features with platform and custom metrics. Prometheus metrics also use some different features to better support open source tools such as PromQL and Grafana.
+
+Azure Monitor managed service for Prometheus allows you to collect and analyze metrics at scale using a Prometheus-compatible monitoring solution. This fully managed service is based on the Prometheus project from the Cloud Native Computing Foundation (CNCF). The service allows you to use the Prometheus query language (PromQL) to analyze and alert on the performance of monitored infrastructure and workloads, without having to operate the underlying infrastructure.
+
+To set up Prometheus metrics collection for the new Arc-enabled cluster, follow the steps in [Configure Prometheus metrics collection](howto-configure-observability.md#configure-prometheus-metrics-collection).
+
+## Install Container Insights
+Container Insights monitors the performance of container workloads deployed to the cloud. It gives you performance visibility by collecting memory and processor metrics from controllers, nodes, and containers that are available in Kubernetes through the Metrics API. After you enable monitoring from Kubernetes clusters, metrics and container logs are automatically collected through a containerized version of the Log Analytics agent for Linux. Metrics are sent to the metrics database in Azure Monitor. Log data is sent to your Log Analytics workspace.
+
+To monitor container workload performance, complete the steps to [enable container insights](../../azure-monitor/containers/container-insights-onboard.md).
+
+## Install Grafana
+Azure Managed Grafana is a data visualization platform built on top of the Grafana software by Grafana Labs. Azure Managed Grafana is a fully managed Azure service operated and supported by Microsoft. Grafana helps you bring together metrics, logs and traces into a single user interface. With its extensive support for data sources and graphing capabilities, you can view and analyze your application and infrastructure telemetry data in real-time.
+
+Azure IoT Operations provides a collection of dashboards designed to give you many of the visualizations you need to understand the health and performance of your Azure IoT Operations deployment.
+
+To install Azure Managed Grafana, complete the following steps:
+
+1. Use the Azure portal to [create an Azure Managed Grafana instance](../../managed-grafana/quickstart-managed-grafana-portal.md).
+
+1. Configure an [Azure Monitor managed service for Prometheus as a data source for Azure Managed Grafana](../../azure-monitor/essentials/prometheus-grafana.md).
+
+1. Configure the dashboards by following the steps in [Deploy dashboards to Grafana](howto-configure-observability.md#deploy-dashboards-to-grafana).
+
+## Related content
+
+- [Get started: configure observability](howto-configure-observability.md)