From 027016aea2cd65254cdf11d70413fb74dbd763a0 Mon Sep 17 00:00:00 2001
From: Greg Linton <g2linton@gmail.com>
Date: Tue, 14 Aug 2018 14:41:24 -0600
Subject: [PATCH] Update changelog

---
 CHANGELOG.md               | 7 +++++++
 docs/DATA_FORMATS_INPUT.md | 7 ++-----
 etc/telegraf.conf          | 2 +-
 3 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 461f4425d..89bbfe90e 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -64,6 +64,13 @@
 - [#4537](https://github.com/influxdata/telegraf/pull/4537): Add message 'max_bytes' configuration to kafka input.
 - [#4546](https://github.com/influxdata/telegraf/pull/4546): Add gopsutil meminfo fields to mem plugin.
 
+## v1.7.4 [unreleased]
+
+### Bugfixes
+
+- [#4534](https://github.com/influxdata/telegraf/pull/4534): Skip unserializable metric in influxDB UDP output.
+- [#4554](https://github.com/influxdata/telegraf/pull/4554): Fix powerdns input tests.
+
 ## v1.7.3 [2018-08-07]
 
 ### Bugfixes
diff --git a/docs/DATA_FORMATS_INPUT.md b/docs/DATA_FORMATS_INPUT.md
index 00ead6e38..753523843 100644
--- a/docs/DATA_FORMATS_INPUT.md
+++ b/docs/DATA_FORMATS_INPUT.md
@@ -10,7 +10,7 @@ Telegraf is able to parse the following input data formats into metrics:
 1. [Collectd](#collectd)
 1. [Dropwizard](#dropwizard)
 1. [Grok](#grok)
-1. [Wavefront](https://github.com/influxdata/telegraf/blob/master/docs/DATA_FORMATS_INPUT.md#wavefront)
+1. [Wavefront](#wavefront)
 
 Telegraf metrics, like InfluxDB
 [points](https://docs.influxdata.com/influxdb/v0.10/write_protocols/line/),
@@ -661,7 +661,7 @@ For more information about the dropwizard json format see
   #   tag2 = "tags.tag2"
 ```
 
-# Grok
+# Grok:
 
 The grok data format parses line delimited data using a regular expression like
 language.
@@ -881,9 +881,6 @@ the file output will only print once per `flush_interval`.
 - If successful, add the next token, update the pattern and retest.
 - Continue one token at a time until the entire line is successfully parsed.
 
-
-```
-
 # Wavefront:
 
 Wavefront Data Format is metrics are parsed directly into Telegraf metrics.
diff --git a/etc/telegraf.conf b/etc/telegraf.conf
index c3a84569d..9315aa457 100644
--- a/etc/telegraf.conf
+++ b/etc/telegraf.conf
@@ -1980,7 +1980,7 @@
 #   timeout = "20s"
 
 #   ## Schema Version: (Optional, defaults to version 1)
-#   schemaVersion = 2
+#   metric_version = 2
 
 
 # # Gather packets and bytes counters from Linux ipsets