From 64e6e85ed99809e56f07642c57b3a4166c8c16a9 Mon Sep 17 00:00:00 2001 From: Rob Carlan Date: Fri, 25 Apr 2025 14:56:39 -0400 Subject: [PATCH 1/2] update documentation about RabbitMQ family types --- rabbitmq/README.md | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/rabbitmq/README.md b/rabbitmq/README.md index 7b6eab3bef050..cf22265422c2e 100644 --- a/rabbitmq/README.md +++ b/rabbitmq/README.md @@ -38,15 +38,14 @@ Configure the `prometheus_plugin` section in your instance configuration. When u url: http://:15692 ``` - This enables scraping of the [`/metrics` endpoint][20] on one RabbitMQ node. Datadog can also collect data from the [`/metrics/detailed` endpoint][22]. - - ```yaml + This enables scraping of the [`/metrics` endpoint][20] on one RabbitMQ node. Datadog can also collect data from the [`/metrics/detailed` endpoint][22]. The metrics collected will depend on which families are included. +```yaml instances: - prometheus_plugin: url: http://:15692 - unaggregated_endpoint: detailed?family=queue_coarse_metrics + unaggregated_endpoint: detailed?family=queue_coarse_metrics&family=queue_consumer_count&family=channel_exchange_metrics&family=channel_queue_exchange_metrics&family=node_coarse_metrics ``` - This enables scraping of the [`/metrics/detailed` endpoint][22] to collect queue coarse metrics. +This configuration will collect metrics for each queue, exchange, and node. See the [`/metrics/detailed` API documentation][22] for more information on the metrics provided by each family. ##### [RabbitMQ Management Plugin][4]. @@ -169,7 +168,7 @@ See [service_checks.json][14] for a list of service checks provided by this inte The Prometheus Plugin exposes a different set of metrics from the Management Plugin. Here is what to be aware of as you migrate from the Management to the Prometheus Plugin. -- Look up your metrics in [this table][23]. If a metric's description contains an `[OpenMetricsV2]` tag, then it is available in the Prometheus Plugin. Metrics available only in the Management Plugin do not have any tags in their descriptions. +- Look up your metrics in [this table][23]. If a metric's description contains an `[OpenMetrics]` tag, then it is available in the Prometheus Plugin. Metrics available only in the Management Plugin do not have any tags in their descriptions. - Any dashboards and monitors using Management Plugin metrics do not function. Switch to the dashboards and monitors marked as *OpenMetrics Version*. - The default configuration collects aggregated metrics. This means, for example, that there are no metrics tagged by queue. Configure the option `prometheus_plugin.unaggregated_endpoint` to get metrics without aggregation. - The `rabbitmq.status` service check is replaced by `rabbitmq.openmetrics.health`. The service check `rabbitmq.aliveness` has no equivalent in the Prometheus Plugin. From 8d9b273fdfc8b175f0d097c06ecc21536e7bfb72 Mon Sep 17 00:00:00 2001 From: robcarlan-datadog Date: Mon, 28 Apr 2025 10:40:47 -0400 Subject: [PATCH 2/2] Update rabbitmq/README.md Co-authored-by: Jen Gilbert --- rabbitmq/README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/rabbitmq/README.md b/rabbitmq/README.md index cf22265422c2e..b4cd947ce8841 100644 --- a/rabbitmq/README.md +++ b/rabbitmq/README.md @@ -45,7 +45,7 @@ Configure the `prometheus_plugin` section in your instance configuration. When u url: http://:15692 unaggregated_endpoint: detailed?family=queue_coarse_metrics&family=queue_consumer_count&family=channel_exchange_metrics&family=channel_queue_exchange_metrics&family=node_coarse_metrics ``` -This configuration will collect metrics for each queue, exchange, and node. See the [`/metrics/detailed` API documentation][22] for more information on the metrics provided by each family. +This configuration collects metrics for each queue, exchange, and node. See the [`/metrics/detailed` API documentation][22] for more information on the metrics provided by each family. ##### [RabbitMQ Management Plugin][4].