From 4a56f3a4b4899166dd5ee148f311ea5527b8e464 Mon Sep 17 00:00:00 2001 From: "Peter A. Bigot" Date: Wed, 29 Jul 2020 15:37:28 -0500 Subject: [PATCH] rabbitmq: remove deprecated healthcheck (#7823) --- plugins/inputs/rabbitmq/README.md | 1 - plugins/inputs/rabbitmq/rabbitmq.go | 13 ------------- plugins/inputs/rabbitmq/rabbitmq_test.go | 3 --- plugins/inputs/rabbitmq/testdata/healthchecks.json | 1 - 4 files changed, 18 deletions(-) delete mode 100644 plugins/inputs/rabbitmq/testdata/healthchecks.json diff --git a/plugins/inputs/rabbitmq/README.md b/plugins/inputs/rabbitmq/README.md index 4a53ddc6c02b2..1274b4ee230f8 100644 --- a/plugins/inputs/rabbitmq/README.md +++ b/plugins/inputs/rabbitmq/README.md @@ -105,7 +105,6 @@ For additional details reference the [RabbitMQ Management HTTP Stats][management - sockets_used (int, sockets) - running (int, node up) - uptime (int, milliseconds) - - health_check_status (int, 1 or 0) - mnesia_disk_tx_count (int, number of disk transaction) - mnesia_ram_tx_count (int, number of ram transaction) - mnesia_disk_tx_count_rate (float, number of disk transaction per second) diff --git a/plugins/inputs/rabbitmq/rabbitmq.go b/plugins/inputs/rabbitmq/rabbitmq.go index fdec697a8a4fa..4d8050c33fbca 100644 --- a/plugins/inputs/rabbitmq/rabbitmq.go +++ b/plugins/inputs/rabbitmq/rabbitmq.go @@ -508,19 +508,6 @@ func gatherNodes(r *RabbitMQ, acc telegraf.Accumulator) { "running": boolToInt(node.Running), } - var health HealthCheck - err := r.requestJSON("/api/healthchecks/node/"+node.Name, &health) - if err != nil { - acc.AddError(err) - return - } - - if health.Status == "ok" { - fields["health_check_status"] = int64(1) - } else { - fields["health_check_status"] = int64(0) - } - var memory MemoryResponse err = r.requestJSON("/api/nodes/"+node.Name+"/memory", &memory) if err != nil { diff --git a/plugins/inputs/rabbitmq/rabbitmq_test.go b/plugins/inputs/rabbitmq/rabbitmq_test.go index c207706c90aec..869e8036d157d 100644 --- a/plugins/inputs/rabbitmq/rabbitmq_test.go +++ b/plugins/inputs/rabbitmq/rabbitmq_test.go @@ -26,8 +26,6 @@ func TestRabbitMQGeneratesMetrics(t *testing.T) { jsonFilePath = "testdata/queues.json" case "/api/exchanges": jsonFilePath = "testdata/exchanges.json" - case "/api/healthchecks/node/rabbit@vagrant-ubuntu-trusty-64": - jsonFilePath = "testdata/healthchecks.json" case "/api/federation-links": jsonFilePath = "testdata/federation-links.json" case "/api/nodes/rabbit@vagrant-ubuntu-trusty-64/memory": @@ -119,7 +117,6 @@ func TestRabbitMQGeneratesMetrics(t *testing.T) { "sockets_used": 45, "uptime": 7464827, "running": 1, - "health_check_status": 1, "mnesia_disk_tx_count": 16, "mnesia_ram_tx_count": 296, "mnesia_disk_tx_count_rate": 1.1, diff --git a/plugins/inputs/rabbitmq/testdata/healthchecks.json b/plugins/inputs/rabbitmq/testdata/healthchecks.json deleted file mode 100644 index 1a36cf5fc27a0..0000000000000 --- a/plugins/inputs/rabbitmq/testdata/healthchecks.json +++ /dev/null @@ -1 +0,0 @@ -{"status":"ok"} \ No newline at end of file