diff --git a/CHANGELOG.next.asciidoc b/CHANGELOG.next.asciidoc index 262592c8efe9..c4cb4af190cc 100644 --- a/CHANGELOG.next.asciidoc +++ b/CHANGELOG.next.asciidoc @@ -233,6 +233,7 @@ https://github.com/elastic/beats/compare/v7.0.0-alpha2...master[Check the HEAD d - Add collecting AuroraDB metrics in rds metricset. {issue}14142[14142] {pull}16004[16004] - Reuse connections in SQL module. {pull}16001[16001] - Improve the `logstash` module (when `xpack.enabled` is set to `true`) to use the override `cluster_uuid` returned by Logstash APIs. {issue}15772[15772] {pull}15795[15795] +- Add support for NATS 2.1. {pull}16317[16317] *Packetbeat* diff --git a/metricbeat/docs/modules/nats.asciidoc b/metricbeat/docs/modules/nats.asciidoc index 75b3b8a33062..df5c6508fc78 100644 --- a/metricbeat/docs/modules/nats.asciidoc +++ b/metricbeat/docs/modules/nats.asciidoc @@ -12,7 +12,7 @@ The default metricsets are `stats`, `connections`, `routes` and `subscriptions`. [float] === Compatibility -The Nats module is tested with Nats 1.3.0 and 2.0.4 +The Nats module is tested with Nats 1.3.0, 2.0.4 and 2.1.4 [float] diff --git a/metricbeat/module/nats/_meta/Dockerfile.2.0.X b/metricbeat/module/nats/_meta/Dockerfile similarity index 71% rename from metricbeat/module/nats/_meta/Dockerfile.2.0.X rename to metricbeat/module/nats/_meta/Dockerfile index 84c571893198..f846c9689732 100644 --- a/metricbeat/module/nats/_meta/Dockerfile.2.0.X +++ b/metricbeat/module/nats/_meta/Dockerfile @@ -4,11 +4,10 @@ FROM nats:$NATS_VERSION # create an enhanced container with nc command available since nats is based # on scratch image making healthcheck impossible FROM alpine:latest -COPY --from=0 /nats-server /nats-server -COPY --from=0 nats-server.conf nats-server.conf +COPY --from=0 / /opt/nats +COPY run.sh /run.sh # Expose client, management, and cluster ports EXPOSE 4222 8222 6222 HEALTHCHECK --interval=1s --retries=10 CMD nc -w 1 0.0.0.0 8222