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

Add supported versions file in Metricbeat module for Consul #24123

Merged
merged 5 commits into from
Mar 4, 2021
Merged

Add supported versions file in Metricbeat module for Consul #24123

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
a9b9c09
Add supported versions file in Metricbeat module for Consul
jsoriano Feb 19, 2021
5408935
Make update
jsoriano Feb 19, 2021
816082a
Add changelog
jsoriano Mar 1, 2021
fcebbce
Merge remote-tracking branch 'origin/master' into consul-supported-ve…
jsoriano Mar 1, 2021
9d233af
Fix changelog
jsoriano Mar 1, 2021
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
2 changes: 1 addition & 1 deletion metricbeat/docs/modules/consul.asciidoc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ This is the https://www.consul.io[Hashicorp's Consul] Metricbeat module. It is s
[float]
=== Compatibility

The module is being tested with https://github.com/hashicorp/docker-consul/blob/9bd2aa7ecf2414b8712e055f2374699148e8941c/0.X/Dockerfile[1.4.2] version
The module is being tested with 1.4.2 and 1.9.3 versions of Consul.

[float]
=== Dashboard
Expand Down
2 changes: 1 addition & 1 deletion metricbeat/module/consul/_meta/docs.asciidoc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ This is the https://www.consul.io[Hashicorp's Consul] Metricbeat module. It is s
[float]
=== Compatibility

The module is being tested with https://github.com/hashicorp/docker-consul/blob/9bd2aa7ecf2414b8712e055f2374699148e8941c/0.X/Dockerfile[1.4.2] version
The module is being tested with 1.4.2 and 1.9.3 versions of Consul.

[float]
=== Dashboard
Expand Down
3 changes: 3 additions & 0 deletions metricbeat/module/consul/_meta/supported-versions.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
variants:
- CONSUL_VERSION: 1.4.2
- CONSUL_VERSION: 1.9.3
4 changes: 2 additions & 2 deletions metricbeat/module/consul/docker-compose.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,10 @@ version: '2.3'

services:
consul:
image: docker.elastic.co/integrations-ci/beats-consul:${CONSUL_VERSION:-1.4.2}-1
image: docker.elastic.co/integrations-ci/beats-consul:${CONSUL_VERSION:-1.9.3}-1
build:
context: ./_meta
args:
CONSUL_VERSION: ${CONSUL_VERSION:-1.4.2}
CONSUL_VERSION: ${CONSUL_VERSION:-1.9.3}
ports:
- 8500
1 change: 1 addition & 0 deletions metricbeat/module/consul/test_consul.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@
]


@metricbeat.parameterized_with_supported_versions
class ConsulAgentTest(metricbeat.BaseTest):

COMPOSE_SERVICES = ['consul']
Expand Down