diff --git a/etc/telegraf.conf b/etc/telegraf.conf
index 690d94605..16b16c5a1 100644
--- a/etc/telegraf.conf
+++ b/etc/telegraf.conf
@@ -117,83 +117,57 @@
 ###############################################################################
 
 
-# Configuration for sending metrics to InfluxDB
-[[outputs.influxdb]]
-  ## The full HTTP or UDP URL for your InfluxDB instance.
-  ##
-  ## Multiple URLs can be specified for a single cluster, only ONE of the
-  ## urls will be written to each interval.
-  # urls = ["unix:///var/run/influxdb.sock"]
-  # urls = ["udp://127.0.0.1:8089"]
-  # urls = ["http://127.0.0.1:8086"]
-
-  ## The target database for metrics; will be created as needed.
-  ## For UDP url endpoint database needs to be configured on server side.
-  # database = "telegraf"
-
-  ## The value of this tag will be used to determine the database.  If this
-  ## tag is not set the 'database' option is used as the default.
-  # database_tag = ""
-
-  ## If true, the 'database_tag' will not be included in the written metric.
-  # exclude_database_tag = false
-
-  ## If true, no CREATE DATABASE queries will be sent.  Set to true when using
-  ## Telegraf with a user without permissions to create databases or when the
-  ## database already exists.
-  # skip_database_creation = false
-
-  ## Name of existing retention policy to write to.  Empty string writes to
-  ## the default retention policy.  Only takes effect when using HTTP.
-  # retention_policy = ""
-
-  ## The value of this tag will be used to determine the retention policy.  If this
-  ## tag is not set the 'retention_policy' option is used as the default.
-  # retention_policy_tag = ""
-
-  ## If true, the 'retention_policy_tag' will not be included in the written metric.
-  # exclude_retention_policy_tag = false
-
-  ## Write consistency (clusters only), can be: "any", "one", "quorum", "all".
-  ## Only takes effect when using HTTP.
-  # write_consistency = "any"
-
-  ## Timeout for HTTP messages.
-  # timeout = "5s"
-
-  ## HTTP Basic Auth
-  # username = "telegraf"
-  # password = "metricsmetricsmetricsmetrics"
-
-  ## HTTP User-Agent
-  # user_agent = "telegraf"
-
-  ## UDP payload size is the maximum packet size to send.
-  # udp_payload = "512B"
-
-  ## Optional TLS Config for use on HTTP connections.
-  # tls_ca = "/etc/telegraf/ca.pem"
-  # tls_cert = "/etc/telegraf/cert.pem"
-  # tls_key = "/etc/telegraf/key.pem"
-  ## Use TLS but skip chain & host verification
-  # insecure_skip_verify = false
-
-  ## HTTP Proxy override, if unset values the standard proxy environment
-  ## variables are consulted to determine which proxy, if any, should be used.
-  # http_proxy = "http://corporate.proxy:3128"
-
-  ## Additional HTTP headers
-  # http_headers = {"X-Special-Header" = "Special-Value"}
-
-  ## HTTP Content-Encoding for write request body, can be set to "gzip" to
-  ## compress body or "identity" to apply no encoding.
-  # content_encoding = "gzip"
-
-  ## When true, Telegraf will output unsigned integers as unsigned values,
-  ## i.e.: "42u".  You will need a version of InfluxDB supporting unsigned
-  ## integer values.  Enabling this option will result in field type errors if
-  ## existing data has been written.
-  # influx_uint_support = false
+# # Configuration for sending metrics to InfluxDB 2.0
+# [[outputs.influxdb_v2]]
+#   ## The URLs of the InfluxDB cluster nodes.
+#   ##
+#   ## Multiple URLs can be specified for a single cluster, only ONE of the
+#   ## urls will be written to each interval.
+#   ##   ex: urls = ["https://us-west-2-1.aws.cloud2.influxdata.com"]
+#   urls = ["http://127.0.0.1:8086"]
+#
+#   ## Token for authentication.
+#   token = ""
+#
+#   ## Organization is the name of the organization you wish to write to.
+#   organization = ""
+#
+#   ## Destination bucket to write into.
+#   bucket = ""
+#
+#   ## The value of this tag will be used to determine the bucket.  If this
+#   ## tag is not set the 'bucket' option is used as the default.
+#   # bucket_tag = ""
+#
+#   ## If true, the bucket tag will not be added to the metric.
+#   # exclude_bucket_tag = false
+#
+#   ## Timeout for HTTP messages.
+#   # timeout = "5s"
+#
+#   ## Additional HTTP headers
+#   # http_headers = {"X-Special-Header" = "Special-Value"}
+#
+#   ## HTTP Proxy override, if unset values the standard proxy environment
+#   ## variables are consulted to determine which proxy, if any, should be used.
+#   # http_proxy = "http://corporate.proxy:3128"
+#
+#   ## HTTP User-Agent
+#   # user_agent = "telegraf"
+#
+#   ## Content-Encoding for write request body, can be set to "gzip" to
+#   ## compress body or "identity" to apply no encoding.
+#   # content_encoding = "gzip"
+#
+#   ## Enable or disable uint support for writing uints influxdb 2.0.
+#   # influx_uint_support = false
+#
+#   ## Optional TLS Config for use on HTTP connections.
+#   # tls_ca = "/etc/telegraf/ca.pem"
+#   # tls_cert = "/etc/telegraf/cert.pem"
+#   # tls_key = "/etc/telegraf/key.pem"
+#   ## Use TLS but skip chain & host verification
+#   # insecure_skip_verify = false
 
 
 # # Configuration for Amon Server to send metrics to.
@@ -1075,50 +1049,59 @@
 #   # non_retryable_statuscodes = [409, 413]
 
 
-# # Configuration for sending metrics to InfluxDB 2.0
-# [[outputs.influxdb_v2]]
-#   ## The URLs of the InfluxDB cluster nodes.
+# # Configuration for sending metrics to InfluxDB
+# [[outputs.influxdb]]
+#   ## The full HTTP or UDP URL for your InfluxDB instance.
 #   ##
 #   ## Multiple URLs can be specified for a single cluster, only ONE of the
 #   ## urls will be written to each interval.
-#   ##   ex: urls = ["https://us-west-2-1.aws.cloud2.influxdata.com"]
-#   urls = ["http://127.0.0.1:8086"]
+#   # urls = ["unix:///var/run/influxdb.sock"]
+#   # urls = ["udp://127.0.0.1:8089"]
+#   # urls = ["http://127.0.0.1:8086"]
 #
-#   ## Token for authentication.
-#   token = ""
+#   ## The target database for metrics; will be created as needed.
+#   ## For UDP url endpoint database needs to be configured on server side.
+#   # database = "telegraf"
 #
-#   ## Organization is the name of the organization you wish to write to.
-#   organization = ""
+#   ## The value of this tag will be used to determine the database.  If this
+#   ## tag is not set the 'database' option is used as the default.
+#   # database_tag = ""
 #
-#   ## Destination bucket to write into.
-#   bucket = ""
+#   ## If true, the 'database_tag' will not be included in the written metric.
+#   # exclude_database_tag = false
 #
-#   ## The value of this tag will be used to determine the bucket.  If this
-#   ## tag is not set the 'bucket' option is used as the default.
-#   # bucket_tag = ""
+#   ## If true, no CREATE DATABASE queries will be sent.  Set to true when using
+#   ## Telegraf with a user without permissions to create databases or when the
+#   ## database already exists.
+#   # skip_database_creation = false
 #
-#   ## If true, the bucket tag will not be added to the metric.
-#   # exclude_bucket_tag = false
+#   ## Name of existing retention policy to write to.  Empty string writes to
+#   ## the default retention policy.  Only takes effect when using HTTP.
+#   # retention_policy = ""
+#
+#   ## The value of this tag will be used to determine the retention policy.  If this
+#   ## tag is not set the 'retention_policy' option is used as the default.
+#   # retention_policy_tag = ""
+#
+#   ## If true, the 'retention_policy_tag' will not be included in the written metric.
+#   # exclude_retention_policy_tag = false
+#
+#   ## Write consistency (clusters only), can be: "any", "one", "quorum", "all".
+#   ## Only takes effect when using HTTP.
+#   # write_consistency = "any"
 #
 #   ## Timeout for HTTP messages.
 #   # timeout = "5s"
 #
-#   ## Additional HTTP headers
-#   # http_headers = {"X-Special-Header" = "Special-Value"}
-#
-#   ## HTTP Proxy override, if unset values the standard proxy environment
-#   ## variables are consulted to determine which proxy, if any, should be used.
-#   # http_proxy = "http://corporate.proxy:3128"
+#   ## HTTP Basic Auth
+#   # username = "telegraf"
+#   # password = "metricsmetricsmetricsmetrics"
 #
 #   ## HTTP User-Agent
 #   # user_agent = "telegraf"
 #
-#   ## Content-Encoding for write request body, can be set to "gzip" to
-#   ## compress body or "identity" to apply no encoding.
-#   # content_encoding = "gzip"
-#
-#   ## Enable or disable uint support for writing uints influxdb 2.0.
-#   # influx_uint_support = false
+#   ## UDP payload size is the maximum packet size to send.
+#   # udp_payload = "512B"
 #
 #   ## Optional TLS Config for use on HTTP connections.
 #   # tls_ca = "/etc/telegraf/ca.pem"
@@ -1126,6 +1109,23 @@
 #   # tls_key = "/etc/telegraf/key.pem"
 #   ## Use TLS but skip chain & host verification
 #   # insecure_skip_verify = false
+#
+#   ## HTTP Proxy override, if unset values the standard proxy environment
+#   ## variables are consulted to determine which proxy, if any, should be used.
+#   # http_proxy = "http://corporate.proxy:3128"
+#
+#   ## Additional HTTP headers
+#   # http_headers = {"X-Special-Header" = "Special-Value"}
+#
+#   ## HTTP Content-Encoding for write request body, can be set to "gzip" to
+#   ## compress body or "identity" to apply no encoding.
+#   # content_encoding = "gzip"
+#
+#   ## When true, Telegraf will output unsigned integers as unsigned values,
+#   ## i.e.: "42u".  You will need a version of InfluxDB supporting unsigned
+#   ## integer values.  Enabling this option will result in field type errors if
+#   ## existing data has been written.
+#   # influx_uint_support = false
 
 
 # # Configuration for sending metrics to an Instrumental project
@@ -9523,6 +9523,12 @@
 #   ##     "source" -- uses the timestamp provided by the source
 #   # timestamp = "gather"
 #   #
+#   ## The default timetsamp format is RFC3339Nano
+#   # Other timestamp layouts can be configured using the Go language time
+#   # layout specification from https://golang.org/pkg/time/#Time.Format
+#   # e.g.: json_timestamp_format = "2006-01-02T15:04:05Z07:00"
+#   #timestamp_format = ""
+#   #
 #   ## Node ID configuration
 #   ## name              - field name to use in the output
 #   ## namespace         - OPC UA namespace of the node (integer value 0 thru 3)
diff --git a/etc/telegraf_windows.conf b/etc/telegraf_windows.conf
index 49eb32107..dbfd83218 100644
--- a/etc/telegraf_windows.conf
+++ b/etc/telegraf_windows.conf
@@ -117,83 +117,57 @@
 ###############################################################################
 
 
-# Configuration for sending metrics to InfluxDB
-[[outputs.influxdb]]
-  ## The full HTTP or UDP URL for your InfluxDB instance.
-  ##
-  ## Multiple URLs can be specified for a single cluster, only ONE of the
-  ## urls will be written to each interval.
-  # urls = ["unix:///var/run/influxdb.sock"]
-  # urls = ["udp://127.0.0.1:8089"]
-  # urls = ["http://127.0.0.1:8086"]
-
-  ## The target database for metrics; will be created as needed.
-  ## For UDP url endpoint database needs to be configured on server side.
-  # database = "telegraf"
-
-  ## The value of this tag will be used to determine the database.  If this
-  ## tag is not set the 'database' option is used as the default.
-  # database_tag = ""
-
-  ## If true, the 'database_tag' will not be included in the written metric.
-  # exclude_database_tag = false
-
-  ## If true, no CREATE DATABASE queries will be sent.  Set to true when using
-  ## Telegraf with a user without permissions to create databases or when the
-  ## database already exists.
-  # skip_database_creation = false
-
-  ## Name of existing retention policy to write to.  Empty string writes to
-  ## the default retention policy.  Only takes effect when using HTTP.
-  # retention_policy = ""
-
-  ## The value of this tag will be used to determine the retention policy.  If this
-  ## tag is not set the 'retention_policy' option is used as the default.
-  # retention_policy_tag = ""
-
-  ## If true, the 'retention_policy_tag' will not be included in the written metric.
-  # exclude_retention_policy_tag = false
-
-  ## Write consistency (clusters only), can be: "any", "one", "quorum", "all".
-  ## Only takes effect when using HTTP.
-  # write_consistency = "any"
-
-  ## Timeout for HTTP messages.
-  # timeout = "5s"
-
-  ## HTTP Basic Auth
-  # username = "telegraf"
-  # password = "metricsmetricsmetricsmetrics"
-
-  ## HTTP User-Agent
-  # user_agent = "telegraf"
-
-  ## UDP payload size is the maximum packet size to send.
-  # udp_payload = "512B"
-
-  ## Optional TLS Config for use on HTTP connections.
-  # tls_ca = "/etc/telegraf/ca.pem"
-  # tls_cert = "/etc/telegraf/cert.pem"
-  # tls_key = "/etc/telegraf/key.pem"
-  ## Use TLS but skip chain & host verification
-  # insecure_skip_verify = false
-
-  ## HTTP Proxy override, if unset values the standard proxy environment
-  ## variables are consulted to determine which proxy, if any, should be used.
-  # http_proxy = "http://corporate.proxy:3128"
-
-  ## Additional HTTP headers
-  # http_headers = {"X-Special-Header" = "Special-Value"}
-
-  ## HTTP Content-Encoding for write request body, can be set to "gzip" to
-  ## compress body or "identity" to apply no encoding.
-  # content_encoding = "gzip"
-
-  ## When true, Telegraf will output unsigned integers as unsigned values,
-  ## i.e.: "42u".  You will need a version of InfluxDB supporting unsigned
-  ## integer values.  Enabling this option will result in field type errors if
-  ## existing data has been written.
-  # influx_uint_support = false
+# # Configuration for sending metrics to InfluxDB 2.0
+# [[outputs.influxdb_v2]]
+#   ## The URLs of the InfluxDB cluster nodes.
+#   ##
+#   ## Multiple URLs can be specified for a single cluster, only ONE of the
+#   ## urls will be written to each interval.
+#   ##   ex: urls = ["https://us-west-2-1.aws.cloud2.influxdata.com"]
+#   urls = ["http://127.0.0.1:8086"]
+#
+#   ## Token for authentication.
+#   token = ""
+#
+#   ## Organization is the name of the organization you wish to write to.
+#   organization = ""
+#
+#   ## Destination bucket to write into.
+#   bucket = ""
+#
+#   ## The value of this tag will be used to determine the bucket.  If this
+#   ## tag is not set the 'bucket' option is used as the default.
+#   # bucket_tag = ""
+#
+#   ## If true, the bucket tag will not be added to the metric.
+#   # exclude_bucket_tag = false
+#
+#   ## Timeout for HTTP messages.
+#   # timeout = "5s"
+#
+#   ## Additional HTTP headers
+#   # http_headers = {"X-Special-Header" = "Special-Value"}
+#
+#   ## HTTP Proxy override, if unset values the standard proxy environment
+#   ## variables are consulted to determine which proxy, if any, should be used.
+#   # http_proxy = "http://corporate.proxy:3128"
+#
+#   ## HTTP User-Agent
+#   # user_agent = "telegraf"
+#
+#   ## Content-Encoding for write request body, can be set to "gzip" to
+#   ## compress body or "identity" to apply no encoding.
+#   # content_encoding = "gzip"
+#
+#   ## Enable or disable uint support for writing uints influxdb 2.0.
+#   # influx_uint_support = false
+#
+#   ## Optional TLS Config for use on HTTP connections.
+#   # tls_ca = "/etc/telegraf/ca.pem"
+#   # tls_cert = "/etc/telegraf/cert.pem"
+#   # tls_key = "/etc/telegraf/key.pem"
+#   ## Use TLS but skip chain & host verification
+#   # insecure_skip_verify = false
 
 
 # # Configuration for Amon Server to send metrics to.
@@ -1075,50 +1049,59 @@
 #   # non_retryable_statuscodes = [409, 413]
 
 
-# # Configuration for sending metrics to InfluxDB 2.0
-# [[outputs.influxdb_v2]]
-#   ## The URLs of the InfluxDB cluster nodes.
+# # Configuration for sending metrics to InfluxDB
+# [[outputs.influxdb]]
+#   ## The full HTTP or UDP URL for your InfluxDB instance.
 #   ##
 #   ## Multiple URLs can be specified for a single cluster, only ONE of the
 #   ## urls will be written to each interval.
-#   ##   ex: urls = ["https://us-west-2-1.aws.cloud2.influxdata.com"]
-#   urls = ["http://127.0.0.1:8086"]
+#   # urls = ["unix:///var/run/influxdb.sock"]
+#   # urls = ["udp://127.0.0.1:8089"]
+#   # urls = ["http://127.0.0.1:8086"]
 #
-#   ## Token for authentication.
-#   token = ""
+#   ## The target database for metrics; will be created as needed.
+#   ## For UDP url endpoint database needs to be configured on server side.
+#   # database = "telegraf"
 #
-#   ## Organization is the name of the organization you wish to write to.
-#   organization = ""
+#   ## The value of this tag will be used to determine the database.  If this
+#   ## tag is not set the 'database' option is used as the default.
+#   # database_tag = ""
 #
-#   ## Destination bucket to write into.
-#   bucket = ""
+#   ## If true, the 'database_tag' will not be included in the written metric.
+#   # exclude_database_tag = false
 #
-#   ## The value of this tag will be used to determine the bucket.  If this
-#   ## tag is not set the 'bucket' option is used as the default.
-#   # bucket_tag = ""
+#   ## If true, no CREATE DATABASE queries will be sent.  Set to true when using
+#   ## Telegraf with a user without permissions to create databases or when the
+#   ## database already exists.
+#   # skip_database_creation = false
 #
-#   ## If true, the bucket tag will not be added to the metric.
-#   # exclude_bucket_tag = false
+#   ## Name of existing retention policy to write to.  Empty string writes to
+#   ## the default retention policy.  Only takes effect when using HTTP.
+#   # retention_policy = ""
+#
+#   ## The value of this tag will be used to determine the retention policy.  If this
+#   ## tag is not set the 'retention_policy' option is used as the default.
+#   # retention_policy_tag = ""
+#
+#   ## If true, the 'retention_policy_tag' will not be included in the written metric.
+#   # exclude_retention_policy_tag = false
+#
+#   ## Write consistency (clusters only), can be: "any", "one", "quorum", "all".
+#   ## Only takes effect when using HTTP.
+#   # write_consistency = "any"
 #
 #   ## Timeout for HTTP messages.
 #   # timeout = "5s"
 #
-#   ## Additional HTTP headers
-#   # http_headers = {"X-Special-Header" = "Special-Value"}
-#
-#   ## HTTP Proxy override, if unset values the standard proxy environment
-#   ## variables are consulted to determine which proxy, if any, should be used.
-#   # http_proxy = "http://corporate.proxy:3128"
+#   ## HTTP Basic Auth
+#   # username = "telegraf"
+#   # password = "metricsmetricsmetricsmetrics"
 #
 #   ## HTTP User-Agent
 #   # user_agent = "telegraf"
 #
-#   ## Content-Encoding for write request body, can be set to "gzip" to
-#   ## compress body or "identity" to apply no encoding.
-#   # content_encoding = "gzip"
-#
-#   ## Enable or disable uint support for writing uints influxdb 2.0.
-#   # influx_uint_support = false
+#   ## UDP payload size is the maximum packet size to send.
+#   # udp_payload = "512B"
 #
 #   ## Optional TLS Config for use on HTTP connections.
 #   # tls_ca = "/etc/telegraf/ca.pem"
@@ -1126,6 +1109,23 @@
 #   # tls_key = "/etc/telegraf/key.pem"
 #   ## Use TLS but skip chain & host verification
 #   # insecure_skip_verify = false
+#
+#   ## HTTP Proxy override, if unset values the standard proxy environment
+#   ## variables are consulted to determine which proxy, if any, should be used.
+#   # http_proxy = "http://corporate.proxy:3128"
+#
+#   ## Additional HTTP headers
+#   # http_headers = {"X-Special-Header" = "Special-Value"}
+#
+#   ## HTTP Content-Encoding for write request body, can be set to "gzip" to
+#   ## compress body or "identity" to apply no encoding.
+#   # content_encoding = "gzip"
+#
+#   ## When true, Telegraf will output unsigned integers as unsigned values,
+#   ## i.e.: "42u".  You will need a version of InfluxDB supporting unsigned
+#   ## integer values.  Enabling this option will result in field type errors if
+#   ## existing data has been written.
+#   # influx_uint_support = false
 
 
 # # Configuration for sending metrics to an Instrumental project
@@ -9340,6 +9340,12 @@
 #   ##     "source" -- uses the timestamp provided by the source
 #   # timestamp = "gather"
 #   #
+#   ## The default timetsamp format is RFC3339Nano
+#   # Other timestamp layouts can be configured using the Go language time
+#   # layout specification from https://golang.org/pkg/time/#Time.Format
+#   # e.g.: json_timestamp_format = "2006-01-02T15:04:05Z07:00"
+#   #timestamp_format = ""
+#   #
 #   ## Node ID configuration
 #   ## name              - field name to use in the output
 #   ## namespace         - OPC UA namespace of the node (integer value 0 thru 3)