fixing options (#1622)

dloucasfx · web-flow · commit 4def33abfab2 · 2021-03-08T10:40:42.000-05:00
Signed-off-by: Dani Louca &lt;dlouca@splunk.com&gt;
diff --git a/pkg/monitors/collectd/rabbitmq/rabbitmq.go b/pkg/monitors/collectd/rabbitmq/rabbitmq.go
@@ -80,19 +80,19 @@ func (m *Monitor) Configure(conf *Config) error {
 	sendNodeMetrics := conf.CollectNodes
 	sendQueueMetrics := conf.CollectQueues
 
-	if m.Output.HasEnabledMetricInGroup(groupChannel) {
+	if m.Output.HasEnabledMetricInGroup(groupChannel) && sendChannelMetrics == nil {
 		sendChannelMetrics = pointer.Bool(true)
 	}
-	if m.Output.HasEnabledMetricInGroup(groupConnection) {
+	if m.Output.HasEnabledMetricInGroup(groupConnection) && sendConnectionMetrics == nil {
 		sendConnectionMetrics = pointer.Bool(true)
 	}
-	if m.Output.HasEnabledMetricInGroup(groupExchange) {
+	if m.Output.HasEnabledMetricInGroup(groupExchange) && sendExchangeMetrics == nil {
 		sendExchangeMetrics = pointer.Bool(true)
 	}
-	if m.Output.HasEnabledMetricInGroup(groupNode) {
+	if m.Output.HasEnabledMetricInGroup(groupNode) && sendNodeMetrics == nil {
 		sendNodeMetrics = pointer.Bool(true)
 	}
-	if m.Output.HasEnabledMetricInGroup(groupQueue) {
+	if m.Output.HasEnabledMetricInGroup(groupQueue) && sendQueueMetrics == nil {
 		sendQueueMetrics = pointer.Bool(true)
 	}
 

Original file line number	Diff line number	Diff line change
`@@ -80,19 +80,19 @@ func (m Monitor) Configure(conf Config) error {`
`80`	`80`	`sendNodeMetrics := conf.CollectNodes`
`81`	`81`	`sendQueueMetrics := conf.CollectQueues`
`82`	`82`
`83`		`- if m.Output.HasEnabledMetricInGroup(groupChannel) {`
	`83`	`+ if m.Output.HasEnabledMetricInGroup(groupChannel) && sendChannelMetrics == nil {`
`84`	`84`	`sendChannelMetrics = pointer.Bool(true)`
`85`	`85`	`}`
`86`		`- if m.Output.HasEnabledMetricInGroup(groupConnection) {`
	`86`	`+ if m.Output.HasEnabledMetricInGroup(groupConnection) && sendConnectionMetrics == nil {`
`87`	`87`	`sendConnectionMetrics = pointer.Bool(true)`
`88`	`88`	`}`
`89`		`- if m.Output.HasEnabledMetricInGroup(groupExchange) {`
	`89`	`+ if m.Output.HasEnabledMetricInGroup(groupExchange) && sendExchangeMetrics == nil {`
`90`	`90`	`sendExchangeMetrics = pointer.Bool(true)`
`91`	`91`	`}`
`92`		`- if m.Output.HasEnabledMetricInGroup(groupNode) {`
	`92`	`+ if m.Output.HasEnabledMetricInGroup(groupNode) && sendNodeMetrics == nil {`
`93`	`93`	`sendNodeMetrics = pointer.Bool(true)`
`94`	`94`	`}`
`95`		`- if m.Output.HasEnabledMetricInGroup(groupQueue) {`
	`95`	`+ if m.Output.HasEnabledMetricInGroup(groupQueue) && sendQueueMetrics == nil {`
`96`	`96`	`sendQueueMetrics = pointer.Bool(true)`
`97`	`97`	`}`
`98`	`98`