diff --git a/CHANGELOG.md b/CHANGELOG.md index 6e472fb48de80b57718f7064683a75aa48209e38..cdb9ce8a25bc7b9627d223f4a33d1ef257c989c3 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -4,6 +4,7 @@ - [basicstats](./plugins/aggregators/basicstats/README.md) - Thanks to @toni-moreno - [bond](./plugins/inputs/bond/README.md) - Thanks to @ildarsv - [cratedb](./plugins/outputs/wavefront/README.md) - Thanks to @felixge +- [dcos](./plugins/inputs/dcos/README.md) - Thanks to @influxdata - [jolokia2](./plugins/inputs/jolokia2/README.md) - Thanks to @dylanmei - [nginx_plus](./plugins/inputs/nginx_plus/README.md) - Thanks to @mplonka & @poblahblahblah - [opensmtpd](./plugins/inputs/opensmtpd/README.md) - Thanks to @aromeyer @@ -72,6 +73,7 @@ - [#2553](https://github.com/influxdata/telegraf/pull/2553): Add postfix input plugin. - [#3424](https://github.com/influxdata/telegraf/pull/3424): Add bond input plugin. - [#3518](https://github.com/influxdata/telegraf/pull/3518): Add slab to mem plugin. +- [#3519](https://github.com/influxdata/telegraf/pull/3519): Add input plugin for DC/OS. ### Bugfixes diff --git a/README.md b/README.md index 2de05d7a474d1e56accbd14a9978b99fde72ddcf..65b101dcb07f459a19aca9d9aa35c21ca44212dd 100644 --- a/README.md +++ b/README.md @@ -138,6 +138,7 @@ configuration options. * [conntrack](./plugins/inputs/conntrack) * [couchbase](./plugins/inputs/couchbase) * [couchdb](./plugins/inputs/couchdb) +* [DC/OS](./plugins/inputs/dcos) * [disque](./plugins/inputs/disque) * [dmcache](./plugins/inputs/dmcache) * [dns query time](./plugins/inputs/dns_query)