From 82a65fd70e062e4eae2d1de80d8e74a560ce664e Mon Sep 17 00:00:00 2001 From: Daniel Nelson Date: Tue, 26 Sep 2017 17:42:38 -0700 Subject: [PATCH] Update changelog and readme for jolokia2 plugin --- CHANGELOG.md | 6 ++++++ README.md | 3 ++- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 6cfdfca7e..48eea3a96 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,7 @@ ### New Plugins - [nginx_plus](./plugins/inputs/nginx_plus/README.md) - Thanks to @mplonka & @poblahblahblah +- [jolokia2](./plugins/inputs/jolokia2/README.md) - Thanks to @dylanmei ### Release Notes @@ -10,6 +11,10 @@ `partition` subtable. This allows for more flexible methods to set the partition key such as by metric name or by tag. +- With the release of the new improved `jolokia2` input, the legacy `jolokia` + plugin is deprecated and will be removed in a future release. Users of this + plugin are encouraged to update to the new `jolokia2` plugin. + ### Features - [#3170](https://github.com/influxdata/telegraf/pull/3170): Add support for sharding based on metric name. @@ -26,6 +31,7 @@ - [#3245](https://github.com/influxdata/telegraf/pull/3245): Add configurable metrics endpoint to prometheus output. - [#3214](https://github.com/influxdata/telegraf/pull/3214): Add new nginx_plus input plugin. - [#3215](https://github.com/influxdata/telegraf/pull/3215): Add support for NSQLookupd to nsq_consumer. +- [#2278](https://github.com/influxdata/telegraf/pull/2278): Add redesigned Jolokia input plugin. ### Bugfixes diff --git a/README.md b/README.md index 76ccf7977..49c0446f6 100644 --- a/README.md +++ b/README.md @@ -158,7 +158,8 @@ configuration options. * [interrupts](./plugins/inputs/interrupts) * [ipmi_sensor](./plugins/inputs/ipmi_sensor) * [iptables](./plugins/inputs/iptables) -* [jolokia](./plugins/inputs/jolokia) +* [jolokia](./plugins/inputs/jolokia) (deprecated, use [jolokia2](./plugins/inputs/jolokia2)) +* [jolokia2](./plugins/inputs/jolokia2) * [kapacitor](./plugins/inputs/kapacitor) * [kubernetes](./plugins/inputs/kubernetes) * [leofs](./plugins/inputs/leofs)