From 1929e48e6159ad9bb8fce01bca11fd50be55676a Mon Sep 17 00:00:00 2001
From: David Reimschussel <dreimschussel@influxdata.com>
Date: Thu, 20 May 2021 16:40:15 -0600
Subject: [PATCH] Update changelog

(cherry picked from commit 3fe5e3ff3d84ce0c6a758064065b591cdaddd526)
---
 CHANGELOG.md      | 27 +++++++++++++++++++++++++++
 etc/telegraf.conf |  2 ++
 2 files changed, 29 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 51af7faf9..a85038587 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,30 @@
+## v1.18.3 [2021-05-20]
+
+#### Release Notes
+
+  - Added FreeBSD armv7 build
+
+#### Bugfixes
+
+  - [#9271](https://github.com/influxdata/telegraf/pull/9271) `inputs.prometheus` Set user agent when scraping prom metrics
+  - [#9203](https://github.com/influxdata/telegraf/pull/9203) Migrate from soniah/gosnmp to gosnmp/gosnmp and update to 1.32.0
+  - [#9169](https://github.com/influxdata/telegraf/pull/9169) `inputs.kinesis_consumer` Fix repeating parser error
+  - [#9130](https://github.com/influxdata/telegraf/pull/9130) `inputs.sqlserver` Remove disallowed whitespace from sqlServerRingBufferCPU query
+  - [#9238](https://github.com/influxdata/telegraf/pull/9238) Update hashicorp/consul/api module to v1.8.1
+  - [#9235](https://github.com/influxdata/telegraf/pull/9235) Migrate from docker/libnetwork/ipvs to moby/ipvs
+  - [#9224](https://github.com/influxdata/telegraf/pull/9224) Update shirou/gopsutil to 3.21.3
+  - [#9209](https://github.com/influxdata/telegraf/pull/9209) Update microsoft/ApplicationInsights-Go to 0.4.4
+  - [#9190](https://github.com/influxdata/telegraf/pull/9190) Update gogo/protobuf to 1.3.2
+  - [#8746](https://github.com/influxdata/telegraf/pull/8746) Update Azure/go-autorest/autorest/azure/auth to 0.5.6 and Azure/go-autorest/autorest to 0.11.17
+  - [#8745](https://github.com/influxdata/telegraf/pull/8745) Update collectd.org to 0.5.0
+  - [#8716](https://github.com/influxdata/telegraf/pull/8716) Update nats-io/nats.go 1.10.0
+  - [#9039](https://github.com/influxdata/telegraf/pull/9039) Update golang/protobuf to v1.5.1
+  - [#8937](https://github.com/influxdata/telegraf/pull/8937) Migrate from ericchiang/k8s to kubernetes/client-go
+
+#### Features
+
+  - [#8913](https://github.com/influxdata/telegraf/pull/8913) `outputs.elasticsearch` Add ability to enable gzip compression
+
 ## v1.18.2 [2021-04-28]
 
 #### Bugfixes
diff --git a/etc/telegraf.conf b/etc/telegraf.conf
index 5160db820..1c20bc28e 100644
--- a/etc/telegraf.conf
+++ b/etc/telegraf.conf
@@ -530,6 +530,8 @@
 #   ## Set to true to ask Elasticsearch a list of all cluster nodes,
 #   ## thus it is not necessary to list all nodes in the urls config option.
 #   enable_sniffer = false
+#   ## Set to true to enable gzip compression
+#   enable_gzip = false
 #   ## Set the interval to check if the Elasticsearch nodes are available
 #   ## Setting to "0s" will disable the health check (not recommended in production)
 #   health_check_interval = "10s"