Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Enhance RabbitMQ test to use real data and test with 3.6 #10667

Merged
merged 4 commits into from
Jul 5, 2019
Merged

Enhance RabbitMQ test to use real data and test with 3.6 #10667

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
d33fd03
Atomic commit
sayden May 6, 2019
cd128c7
make fmt
sayden May 7, 2019
6354b32
Update compatibility docs
sayden Jun 7, 2019
79bc558
Docs updated
sayden Jun 11, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 1 addition & 3 deletions metricbeat/docs/modules/rabbitmq.asciidoc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,9 +14,7 @@ If `management.path_prefix` is set in RabbitMQ configuration, `management_path_p
[float]
=== Compatibility

The rabbitmq module is tested with RabbitMQ 3.7.4, and it should be compatible
with any version supporting the management plugin. This plugin needs to be
enabled.
The rabbitmq module is fully tested with RabbitMQ 3.7.4 and it should be compatible with any version supporting the management plugin (which needs to be installed and enabled). Exchange metricset is also tested with 3.6.0, 3.6.5 and 3.7.14


[float]
Expand Down
4 changes: 1 addition & 3 deletions metricbeat/module/rabbitmq/_meta/docs.asciidoc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,4 @@ If `management.path_prefix` is set in RabbitMQ configuration, `management_path_p
[float]
=== Compatibility

The rabbitmq module is tested with RabbitMQ 3.7.4, and it should be compatible
with any version supporting the management plugin. This plugin needs to be
enabled.
The rabbitmq module is fully tested with RabbitMQ 3.7.4 and it should be compatible with any version supporting the management plugin (which needs to be installed and enabled). Exchange metricset is also tested with 3.6.0, 3.6.5 and 3.7.14
8 changes: 2 additions & 6 deletions metricbeat/module/rabbitmq/exchange/_meta/data.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,5 @@
{
"@timestamp": "2017-10-12T08:05:34.853Z",
"agent": {
"hostname": "host.example.com",
"name": "host.example.com"
},
"@timestamp": "2019-03-01T08:05:34.853Z",
"event": {
"dataset": "rabbitmq.exchange",
"duration": 115000,
Expand Down Expand Up @@ -38,7 +34,7 @@
"vhost": "/"
},
"service": {
"address": "127.0.0.1:53926",
"address": "127.0.0.1:55555",
"type": "rabbitmq"
},
"user": {
Expand Down
22 changes: 22 additions & 0 deletions metricbeat/module/rabbitmq/exchange/_meta/testdata/docs.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
[
{
"message_stats": {
"publish_in": 100,
"publish_in_details": {
"rate": 0.5
},
"publish_out": 99,
"publish_out_details": {
"rate": 0.9
}
},
"user_who_performed_action": "guest",
"name": "exchange.name",
"vhost": "/",
"type": "fanout",
"durable": true,
"auto_delete": false,
"internal": false,
"arguments": {}
}
]
44 changes: 44 additions & 0 deletions metricbeat/module/rabbitmq/exchange/_meta/testdata/docs.json-expected.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,44 @@
[
{
"event": {
"dataset": "rabbitmq.exchange",
"duration": 115000,
"module": "rabbitmq"
},
"metricset": {
"name": "exchange"
},
"rabbitmq": {
"exchange": {
"arguments": {},
"auto_delete": false,
"durable": true,
"internal": false,
"messages": {
"publish_in": {
"count": 100,
"details": {
"rate": 0.5
}
},
"publish_out": {
"count": 99,
"details": {
"rate": 0.9
}
}
},
"name": "exchange.name",
"type": "fanout"
},
"vhost": "/"
},
"service": {
"address": "127.0.0.1:55555",
"type": "rabbitmq"
},
"user": {
"name": "guest"
}
}
]
74 changes: 74 additions & 0 deletions metricbeat/module/rabbitmq/exchange/_meta/testdata/exchange-3.6.0.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,74 @@
[
{
"name": "",
"vhost": "/",
"type": "direct",
"durable": true,
"auto_delete": false,
"internal": false,
"arguments": {}
},
{
"name": "amq.direct",
"vhost": "/",
"type": "direct",
"durable": true,
"auto_delete": false,
"internal": false,
"arguments": {}
},
{
"name": "amq.fanout",
"vhost": "/",
"type": "fanout",
"durable": true,
"auto_delete": false,
"internal": false,
"arguments": {}
},
{
"name": "amq.headers",
"vhost": "/",
"type": "headers",
"durable": true,
"auto_delete": false,
"internal": false,
"arguments": {}
},
{
"name": "amq.match",
"vhost": "/",
"type": "headers",
"durable": true,
"auto_delete": false,
"internal": false,
"arguments": {}
},
{
"name": "amq.rabbitmq.log",
"vhost": "/",
"type": "topic",
"durable": true,
"auto_delete": false,
"internal": true,
"arguments": {}
},
{
"name": "amq.rabbitmq.trace",
"vhost": "/",
"type": "topic",
"durable": true,
"auto_delete": false,
"internal": true,
"arguments": {}
},
{
"name": "amq.topic",
"vhost": "/",
"type": "topic",
"durable": true,
"auto_delete": false,
"internal": false,
"arguments": {}
}
]
202 changes: 202 additions & 0 deletions metricbeat/module/rabbitmq/exchange/_meta/testdata/exchange-3.6.0.json-expected.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,202 @@
[
{
"event": {
"dataset": "rabbitmq.exchange",
"duration": 115000,
"module": "rabbitmq"
},
"metricset": {
"name": "exchange"
},
"rabbitmq": {
"exchange": {
"arguments": {},
"auto_delete": false,
"durable": true,
"internal": false,
"name": "amq.fanout",
"type": "fanout"
},
"vhost": "/"
},
"service": {
"address": "127.0.0.1:55555",
"type": "rabbitmq"
}
},
{
"event": {
"dataset": "rabbitmq.exchange",
"duration": 115000,
"module": "rabbitmq"
},
"metricset": {
"name": "exchange"
},
"rabbitmq": {
"exchange": {
"arguments": {},
"auto_delete": false,
"durable": true,
"internal": true,
"name": "amq.rabbitmq.trace",
"type": "topic"
},
"vhost": "/"
},
"service": {
"address": "127.0.0.1:55555",
"type": "rabbitmq"
}
},
{
"event": {
"dataset": "rabbitmq.exchange",
"duration": 115000,
"module": "rabbitmq"
},
"metricset": {
"name": "exchange"
},
"rabbitmq": {
"exchange": {
"arguments": {},
"auto_delete": false,
"durable": true,
"internal": false,
"name": "amq.match",
"type": "headers"
},
"vhost": "/"
},
"service": {
"address": "127.0.0.1:55555",
"type": "rabbitmq"
}
},
{
"event": {
"dataset": "rabbitmq.exchange",
"duration": 115000,
"module": "rabbitmq"
},
"metricset": {
"name": "exchange"
},
"rabbitmq": {
"exchange": {
"arguments": {},
"auto_delete": false,
"durable": true,
"internal": true,
"name": "amq.rabbitmq.log",
"type": "topic"
},
"vhost": "/"
},
"service": {
"address": "127.0.0.1:55555",
"type": "rabbitmq"
}
},
{
"event": {
"dataset": "rabbitmq.exchange",
"duration": 115000,
"module": "rabbitmq"
},
"metricset": {
"name": "exchange"
},
"rabbitmq": {
"exchange": {
"arguments": {},
"auto_delete": false,
"durable": true,
"internal": false,
"name": "amq.topic",
"type": "topic"
},
"vhost": "/"
},
"service": {
"address": "127.0.0.1:55555",
"type": "rabbitmq"
}
},
{
"event": {
"dataset": "rabbitmq.exchange",
"duration": 115000,
"module": "rabbitmq"
},
"metricset": {
"name": "exchange"
},
"rabbitmq": {
"exchange": {
"arguments": {},
"auto_delete": false,
"durable": true,
"internal": false,
"name": "amq.headers",
"type": "headers"
},
"vhost": "/"
},
"service": {
"address": "127.0.0.1:55555",
"type": "rabbitmq"
}
},
{
"event": {
"dataset": "rabbitmq.exchange",
"duration": 115000,
"module": "rabbitmq"
},
"metricset": {
"name": "exchange"
},
"rabbitmq": {
"exchange": {
"arguments": {},
"auto_delete": false,
"durable": true,
"internal": false,
"name": "",
"type": "direct"
},
"vhost": "/"
},
"service": {
"address": "127.0.0.1:55555",
"type": "rabbitmq"
}
},
{
"event": {
"dataset": "rabbitmq.exchange",
"duration": 115000,
"module": "rabbitmq"
},
"metricset": {
"name": "exchange"
},
"rabbitmq": {
"exchange": {
"arguments": {},
"auto_delete": false,
"durable": true,
"internal": false,
"name": "amq.direct",
"type": "direct"
},
"vhost": "/"
},
"service": {
"address": "127.0.0.1:55555",
"type": "rabbitmq"
}
}
]
Loading