From e31d91f0f9ef2959f8db3567b70a6b3a86930f13 Mon Sep 17 00:00:00 2001
From: Daniel Nelson <daniel@wavesofdawn.com>
Date: Thu, 17 Aug 2017 18:52:27 -0700
Subject: [PATCH] Add queues to rabbitmq documentation (#3135)
---
plugins/inputs/rabbitmq/README.md | 8 ++++++--
plugins/inputs/rabbitmq/rabbitmq.go | 9 ++++++---
2 files changed, 12 insertions(+), 5 deletions(-)
diff --git a/plugins/inputs/rabbitmq/README.md b/plugins/inputs/rabbitmq/README.md
index 6216a220..8f9a77aa 100644
--- a/plugins/inputs/rabbitmq/README.md
+++ b/plugins/inputs/rabbitmq/README.md
@@ -33,9 +33,13 @@ For additional details reference the [RabbitMQ Management HTTP Stats](https://cd
## Includes connection time, any redirects, and reading the response body.
# client_timeout = "4s"
- ## A list of nodes to pull metrics about. If not specified, metrics for
- ## all nodes are gathered.
+ ## A list of nodes to gather as the rabbitmq_node measurement. If not
+ ## specified, metrics for all nodes are gathered.
# nodes = ["rabbit@node1", "rabbit@node2"]
+
+ ## A list of queues to gather as the rabbitmq_queue measurement. If not
+ ## specified, metrics for all queues are gathered.
+ # queues = ["telegraf"]
```
### Measurements & Fields:
diff --git a/plugins/inputs/rabbitmq/rabbitmq.go b/plugins/inputs/rabbitmq/rabbitmq.go
index 1f13263c..f51cb123 100644
--- a/plugins/inputs/rabbitmq/rabbitmq.go
+++ b/plugins/inputs/rabbitmq/rabbitmq.go
@@ -48,7 +48,6 @@ type RabbitMQ struct {
ResponseHeaderTimeout internal.Duration `toml:"header_timeout"`
ClientTimeout internal.Duration `toml:"client_timeout"`
- // InsecureSkipVerify bool
Nodes []string
Queues []string
@@ -165,9 +164,13 @@ var sampleConfig = `
## Includes connection time, any redirects, and reading the response body.
# client_timeout = "4s"
- ## A list of nodes to pull metrics about. If not specified, metrics for
- ## all nodes are gathered.
+ ## A list of nodes to gather as the rabbitmq_node measurement. If not
+ ## specified, metrics for all nodes are gathered.
# nodes = ["rabbit@node1", "rabbit@node2"]
+
+ ## A list of queues to gather as the rabbitmq_queue measurement. If not
+ ## specified, metrics for all queues are gathered.
+ # queues = ["telegraf"]
`
// SampleConfig ...
--
GitLab