From 31d8d2baa7387b1adb24ac965b37c4b01b109644 Mon Sep 17 00:00:00 2001 From: Daniel Nelson Date: Thu, 26 Sep 2019 17:10:50 -0700 Subject: [PATCH] Update changelog --- CHANGELOG.md | 4 ++++ README.md | 1 + 2 files changed, 5 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 7bbfce4b..efe55171 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -5,6 +5,10 @@ - [azure_storage_queue](/plugins/inputs/azure_storage_queue/README.md) - Contributed by @mjiderhamn - [suricata](/plugins/inputs/suricata/README.md) - Contributed by @satta +#### New Aggregators + +- [merge](/plugins/aggregators/merge/README.md) - Contributed by @influxdata + #### Features - [#6326](https://github.com/influxdata/telegraf/pull/5842): Add per node memory stats to rabbitmq input. diff --git a/README.md b/README.md index 5f34ebf2..6601379b 100644 --- a/README.md +++ b/README.md @@ -354,6 +354,7 @@ For documentation on the latest development code see the [documentation index][d * [basicstats](./plugins/aggregators/basicstats) * [final](./plugins/aggregators/final) * [histogram](./plugins/aggregators/histogram) +* [merge](./plugins/aggregators/merge) * [minmax](./plugins/aggregators/minmax) * [valuecounter](./plugins/aggregators/valuecounter)