influxdata#6963 - Removing suffix _len

byjg · Feb 25, 2020 · ee10936 · ee10936
1 parent 8d92b44
commit ee10936
Show file tree

Hide file tree

Showing 2 changed files with 30 additions and 30 deletions.
diff --git a/plugins/inputs/rabbitmq/rabbitmq.go b/plugins/inputs/rabbitmq/rabbitmq.go
@@ -587,12 +587,12 @@ func gatherQueues(r *RabbitMQ, acc telegraf.Accumulator) {
 			"rabbitmq_queue",
 			map[string]interface{}{
 				// common information
-				"consumers":                    queue.Consumers,
-				"consumer_utilisation":         queue.ConsumerUtilisation,
-				"idle_since":                   queue.IdleSince,
-				"slave_nodes_len":              len(queue.SlaveNodes),
-				"synchronised_slave_nodes_len": len(queue.SynchronisedSlaveNodes),
-				"memory":                       queue.Memory,
+				"consumers":                queue.Consumers,
+				"consumer_utilisation":     queue.ConsumerUtilisation,
+				"idle_since":               queue.IdleSince,
+				"slave_nodes":              len(queue.SlaveNodes),
+				"synchronised_slave_nodes": len(queue.SynchronisedSlaveNodes),
+				"memory":                   queue.Memory,
 				// messages information
 				"message_bytes":             queue.MessageBytes,
 				"message_bytes_ready":       queue.MessageBytesReady,

diff --git a/plugins/inputs/rabbitmq/rabbitmq_test.go b/plugins/inputs/rabbitmq/rabbitmq_test.go
@@ -76,30 +76,30 @@ func TestRabbitMQGeneratesMetrics(t *testing.T) {
 	compareMetrics(t, overviewMetrics, acc, "rabbitmq_overview")
 
 	queuesMetrics := map[string]interface{}{
-		"consumers":                    3,
-		"consumer_utilisation":         1.0,
-		"memory":                       143776,
-		"message_bytes":                3,
-		"message_bytes_ready":          4,
-		"message_bytes_unacked":        5,
-		"message_bytes_ram":            6,
-		"message_bytes_persist":        7,
-		"messages":                     44,
-		"messages_ready":               32,
-		"messages_unack":               44,
-		"messages_ack":                 3457,
-		"messages_ack_rate":            9.9,
-		"messages_deliver":             22222,
-		"messages_deliver_rate":        333.4,
-		"messages_deliver_get":         3457,
-		"messages_deliver_get_rate":    0.2,
-		"messages_publish":             3457,
-		"messages_publish_rate":        11.2,
-		"messages_redeliver":           33,
-		"messages_redeliver_rate":      2.5,
-		"idle_since":                   "2015-11-01 8:22:14",
-		"slave_nodes_len":              1,
-		"synchronised_slave_nodes_len": 1,
+		"consumers":                 3,
+		"consumer_utilisation":      1.0,
+		"memory":                    143776,
+		"message_bytes":             3,
+		"message_bytes_ready":       4,
+		"message_bytes_unacked":     5,
+		"message_bytes_ram":         6,
+		"message_bytes_persist":     7,
+		"messages":                  44,
+		"messages_ready":            32,
+		"messages_unack":            44,
+		"messages_ack":              3457,
+		"messages_ack_rate":         9.9,
+		"messages_deliver":          22222,
+		"messages_deliver_rate":     333.4,
+		"messages_deliver_get":      3457,
+		"messages_deliver_get_rate": 0.2,
+		"messages_publish":          3457,
+		"messages_publish_rate":     11.2,
+		"messages_redeliver":        33,
+		"messages_redeliver_rate":   2.5,
+		"idle_since":                "2015-11-01 8:22:14",
+		"slave_nodes":               1,
+		"synchronised_slave_nodes":  1,
 	}
 	compareMetrics(t, queuesMetrics, acc, "rabbitmq_queue")