From 9747fa7f0703356b6d72410bcc5f6199e9526b58 Mon Sep 17 00:00:00 2001
From: Daniel Nelson <daniel.nelson@influxdb.com>
Date: Tue, 21 Jan 2020 17:11:50 -0800
Subject: [PATCH] Update changelog

---
 CHANGELOG.md                          | 1 +
 plugins/inputs/x509_cert/README.md    | 6 ++++--
 plugins/inputs/x509_cert/x509_cert.go | 6 ++++--
 3 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 10f889fab..b312f4030 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -33,6 +33,7 @@
 - [#6886](https://github.com/influxdata/telegraf/pull/6886): Add date offset and timezone options to date processor.
 - [#6859](https://github.com/influxdata/telegraf/pull/6859): Exclude resources by inventory path in vsphere input.
 - [#6700](https://github.com/influxdata/telegraf/pull/6700): Allow a user defined field to be used as the graylog short_message.
+- [#6917](https://github.com/influxdata/telegraf/pull/6917): Add server_name override for x509_cert plugin.
 
 #### Bugfixes
 
diff --git a/plugins/inputs/x509_cert/README.md b/plugins/inputs/x509_cert/README.md
index b8dfb8814..074bbc58c 100644
--- a/plugins/inputs/x509_cert/README.md
+++ b/plugins/inputs/x509_cert/README.md
@@ -15,12 +15,14 @@ file or network connection.
   ## Timeout for SSL connection
   # timeout = "5s"
 
+  ## Pass a different name into the TLS request (Server Name Indication)
+  ##   example: server_name = "myhost.example.org"
+  # server_name = "myhost.example.org"
+
   ## Optional TLS Config
   # tls_ca = "/etc/telegraf/ca.pem"
   # tls_cert = "/etc/telegraf/cert.pem"
   # tls_key = "/etc/telegraf/key.pem"
-  ## Pass a different name into the TLS request (Server Name Indication)
-  # server_name = "myhost.example.org"
 ```
 
 
diff --git a/plugins/inputs/x509_cert/x509_cert.go b/plugins/inputs/x509_cert/x509_cert.go
index 4a6702b9c..49f5fc88e 100644
--- a/plugins/inputs/x509_cert/x509_cert.go
+++ b/plugins/inputs/x509_cert/x509_cert.go
@@ -26,12 +26,14 @@ const sampleConfig = `
   ## Timeout for SSL connection
   # timeout = "5s"
 
+  ## Pass a different name into the TLS request (Server Name Indication)
+  ##   example: server_name = "myhost.example.org"
+  # server_name = ""
+
   ## Optional TLS Config
   # tls_ca = "/etc/telegraf/ca.pem"
   # tls_cert = "/etc/telegraf/cert.pem"
   # tls_key = "/etc/telegraf/key.pem"
-	## Pass a different name into the TLS request (Server Name Indication)
-	# server_name = "myhost.example.org"
 `
 const description = "Reads metrics from a SSL certificate"