Make rabbitmq_queue gathering be configurable

plugins/inputs/rabbitmq/README.md

@@ -33,6 +33,9 @@ For additional details reference the [RabbitMQ Management HTTP Stats](https://cd
   ## Includes connection time, any redirects, and reading the response body.
   # client_timeout = "4s"
 
+  ## Whether to gather queues metrics.
+  # gather_queues = true
+
   ## 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"]

plugins/inputs/rabbitmq/rabbitmq.go

@@ -48,6 +48,8 @@ type RabbitMQ struct {
 	ResponseHeaderTimeout internal.Duration `toml:"header_timeout"`
 	ClientTimeout         internal.Duration `toml:"client_timeout"`
 
+	GatherQueues bool
+
 	Nodes     []string
 	Queues    []string
 	Exchanges []string
@@ -149,7 +151,7 @@ type Exchange struct {
 // gatherFunc ...
 type gatherFunc func(r *RabbitMQ, acc telegraf.Accumulator)
 
-var gatherFunctions = []gatherFunc{gatherOverview, gatherNodes, gatherQueues, gatherExchanges}
+var gatherFunctions = []gatherFunc{gatherOverview, gatherNodes, gatherExchanges}
 
 var sampleConfig = `
   ## Management Plugin url. (default: http://localhost:15672)
@@ -177,6 +179,9 @@ var sampleConfig = `
   ## Includes connection time, any redirects, and reading the response body.
   # client_timeout = "4s"
 
+  ## Whether to gather queues metrics.
+  # gather_queues = true
+
   ## 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"]
@@ -186,7 +191,7 @@ var sampleConfig = `
   # queues = ["telegraf"]
 
   ## A list of exchanges to gather as the rabbitmq_exchange measurement. If not
-  ## specified, metrics for all exchanges are gathered. 
+  ## specified, metrics for all exchanges are gathered.
   # exchanges = ["telegraf"]
 `
 
@@ -226,6 +231,13 @@ func (r *RabbitMQ) Gather(acc telegraf.Accumulator) error {
 			gf(r, acc)
 		}(f)
 	}
+	if r.GatherQueues {
+		wg.Add(1)
+		go func() {
+			defer wg.Done()
+			gatherQueues(r, acc)
+		}()
+	}
 	wg.Wait()
 
 	return nil
@@ -472,6 +484,7 @@ func init() {
 		return &RabbitMQ{
 			ResponseHeaderTimeout: internal.Duration{Duration: DefaultResponseHeaderTimeout * time.Second},
 			ClientTimeout:         internal.Duration{Duration: DefaultClientTimeout * time.Second},
+			GatherQueues:          true,
 		}
 	})
 }