diff --git a/etc/telegraf.conf b/etc/telegraf.conf
index 03427e913..febfe6454 100644
--- a/etc/telegraf.conf
+++ b/etc/telegraf.conf
@@ -454,7 +454,7 @@
 #   ## 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"
-#   ## HTTP basic authentication details (eg. when using Shield)
+#   ## HTTP basic authentication details
 #   # username = "telegraf"
 #   # password = "mypassword"
 #
@@ -591,7 +591,7 @@
 # # A plugin that can transmit metrics over HTTP
 # [[outputs.http]]
 #   ## URL is the address to send metrics to
-#   url = "http://127.0.0.1:8080/metric"
+#   url = "http://127.0.0.1:8080/telegraf"
 #
 #   ## Timeout for HTTP message
 #   # timeout = "5s"
@@ -622,14 +622,14 @@
 #   ## https://github.com/influxdata/telegraf/blob/master/docs/DATA_FORMATS_OUTPUT.md
 #   # data_format = "influx"
 #
+#   ## HTTP Content-Encoding for write request body, can be set to "gzip" to
+#   ## compress body or "identity" to apply no encoding.
+#   # content_encoding = "identity"
+#
 #   ## Additional HTTP headers
 #   # [outputs.http.headers]
 #   #   # Should be set manually to "application/json" for json data_format
 #   #   Content-Type = "text/plain; charset=utf-8"
-#
-#   ## HTTP Content-Encoding for write request body, can be set to "gzip" to
-#   ## compress body or "identity" to apply no encoding.
-#   # content_encoding = "identity"
 
 
 # # Configuration for sending metrics to InfluxDB
@@ -1295,6 +1295,16 @@
 #     float = []
 
 
+# # Dates measurements, tags, and fields that pass through this filter.
+# [[processors.date]]
+#   ## New tag to create
+#   tag_key = "month"
+#
+#   ## Date format string, must be a representation of the Go "reference time"
+#   ## which is "Mon Jan 2 15:04:05 -0700 MST 2006".
+#   date_format = "Jan"
+
+
 # # Map enum values according to given table.
 # [[processors.enum]]
 #   [[processors.enum.mapping]]
@@ -1351,6 +1361,14 @@
 #   data_format = "influx"
 
 
+# # Rotate a single valued metric into a multi field metric
+# [[processors.pivot]]
+#   ## Tag to use for naming the new field.
+#   tag_key = "name"
+#   ## Field to use as the value of the new field.
+#   value_key = "value"
+
+
 # # Print all metrics that pass through this filter.
 # [[processors.printer]]
 
@@ -1363,10 +1381,12 @@
 #   #   key = "resp_code"
 #   #   ## Regular expression to match on a tag value
 #   #   pattern = "^(\\d)\\d\\d$"
-#   #   ## Pattern for constructing a new value (${1} represents first subgroup)
+#   #   ## Matches of the pattern will be replaced with this string.  Use ${1}
+#   #   ## notation to use the text of the first submatch.
 #   #   replacement = "${1}xx"
 #
 #   # [[processors.regex.fields]]
+#   #   ## Field to change
 #   #   key = "request"
 #   #   ## All the power of the Go regular expressions available here
 #   #   ## For example, named subgroups
@@ -1481,6 +1501,14 @@
 #   # add_aggregate_fields = []
 
 
+# # Rotate multi field metric into several single field metrics
+# [[processors.unpivot]]
+#   ## Tag to use for the name.
+#   tag_key = "name"
+#   ## Field to use for the name of the value.
+#   value_key = "value"
+
+
 ###############################################################################
 #                            AGGREGATOR PLUGINS                               #
 ###############################################################################
@@ -1646,10 +1674,12 @@
 
 # # Gather ActiveMQ metrics
 # [[inputs.activemq]]
-#   ## Required ActiveMQ Endpoint
-#   # server = "192.168.50.10"
+#   ## ActiveMQ WebConsole URL
+#   url = "http://127.0.0.1:8161"
 #
-#   ## Required ActiveMQ port
+#   ## Required ActiveMQ Endpoint
+#   ##   deprecated in 1.11; use the url option
+#   # server = "127.0.0.1"
 #   # port = 8161
 #
 #   ## Credentials for basic HTTP authentication
@@ -1667,6 +1697,7 @@
 #   # tls_cert = "/etc/telegraf/cert.pem"
 #   # tls_key = "/etc/telegraf/key.pem"
 #   ## Use TLS but skip chain & host verification
+#   # insecure_skip_verify = false
 
 
 # # Read stats from aerospike server(s)
@@ -2129,6 +2160,8 @@
 #
 #   ## Container states to include and exclude. Globs accepted.
 #   ## When empty only containers in the "running" state will be captured.
+#   ## example: container_state_include = ["created", "restarting", "running", "removing", "paused", "exited", "dead"]
+#   ## example: container_state_exclude = ["created", "restarting", "running", "removing", "paused", "exited", "dead"]
 #   # container_state_include = []
 #   # container_state_exclude = []
 #
@@ -2232,6 +2265,10 @@
 #   ## "breaker". Per default, all stats are gathered.
 #   # node_stats = ["jvm", "http"]
 #
+#   ## HTTP Basic Authentication username and password.
+#   # username = ""
+#   # password = ""
+#
 #   ## Optional TLS Config
 #   # tls_ca = "/etc/telegraf/ca.pem"
 #   # tls_cert = "/etc/telegraf/cert.pem"
@@ -2350,6 +2387,18 @@
 #   md5 = false
 
 
+# # Read real time temps from fireboard.io servers
+# [[inputs.fireboard]]
+#   ## Specify auth token for your account
+#   auth_token = "invalidAuthToken"
+#   ## You can override the fireboard server URL if necessary
+#   # url = https://fireboard.io/api/v1/devices.json
+#   ## You can set a different http_timeout if you need to
+#   ## You should set a string using an number and time indicator
+#   ## for example "12s" for 12 seconds.
+#   # http_timeout = "4s"
+
+
 # # Read metrics exposed by fluentd in_monitor plugin
 # [[inputs.fluentd]]
 #   ## This plugin reads information exposed by fluentd (using /api/plugins.json endpoint).
@@ -2503,9 +2552,13 @@
 
 # # HTTP/HTTPS request given an address a method and a timeout
 # [[inputs.http_response]]
+#   ## Deprecated in 1.12, use 'urls'
 #   ## Server address (default http://localhost)
 #   # address = "http://localhost"
 #
+#   ## List of urls to query.
+#   # urls = ["http://localhost"]
+#
 #   ## Set http_proxy (telegraf uses the system wide proxy settings if it's is not set)
 #   # http_proxy = "http://localhost:8888"
 #
@@ -2538,6 +2591,9 @@
 #   ## HTTP Request Headers (all values must be strings)
 #   # [inputs.http_response.headers]
 #   #   Host = "github.com"
+#
+#   ## Interface to use when dialing an address
+#   # interface = "eth0"
 
 
 # # Read flattened metrics from one or more JSON HTTP endpoints
@@ -3542,7 +3598,6 @@
 #   # count = 1
 #
 #   ## Interval, in s, at which to ping. 0 == default (ping -i <PING_INTERVAL>)
-#   ## Not available in Windows.
 #   # ping_interval = 1.0
 #
 #   ## Per-ping timeout, in s. 0 == no timeout (ping -W <TIMEOUT>)
@@ -3551,16 +3606,21 @@
 #   ## Total-ping deadline, in s. 0 == no deadline (ping -w <DEADLINE>)
 #   # deadline = 10
 #
-#   ## Interface or source address to send ping from (ping -I <INTERFACE/SRC_ADDR>)
-#   ## on Darwin and Freebsd only source address possible: (ping -S <SRC_ADDR>)
+#   ## Interface or source address to send ping from (ping -I[-S] <INTERFACE/SRC_ADDR>)
 #   # interface = ""
 #
-#   ## Specify the ping executable binary, default is "ping"
-#   # binary = "ping"
+#   ## How to ping. "native" doesn't have external dependencies, while "exec" depends on 'ping'.
+#   # method = "exec"
 #
-#   ## Arguments for ping command
-#   ## when arguments is not empty, other options (ping_interval, timeout, etc) will be ignored
+#   ## Specify the ping executable binary, default is "ping"
+# 	# binary = "ping"
+#
+#   ## Arguments for ping command. When arguments is not empty, system binary will be used and
+#   ## other options (ping_interval, timeout, etc) will be ignored.
 #   # arguments = ["-c", "3"]
+#
+#   ## Use only ipv6 addresses when resolving hostnames.
+#   # ipv6 = false
 
 
 # # Measure postfix queue statistics
@@ -4004,7 +4064,11 @@
 #   ## - MemoryClerk
 #   ## - VolumeSpace
 #   ## - PerformanceMetrics
-#   # exclude_query = [ 'DatabaseIO' ]
+#   ## - Schedulers
+#   ## - AzureDBResourceStats
+#   ## - AzureDBResourceGovernance
+#   ## - SqlRequests
+#   exclude_query = [ 'Schedulers' ]
 
 
 # # Gather timeseries from Google Cloud Platform v3 monitoring API
@@ -4280,9 +4344,6 @@
 #   # 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
 
 
 # # Read metrics of ZFS from arcstats, zfetchstats, vdev_cache_stats, and pools
@@ -4489,17 +4550,19 @@
 
 # # Cisco model-driven telemetry (MDT) input plugin for IOS XR, IOS XE and NX-OS platforms
 # [[inputs.cisco_telemetry_mdt]]
-#  ## Telemetry transport (one of: tcp, grpc)
+#  ## Telemetry transport can be "tcp" or "grpc".  TLS is only supported when
+#  ## using the grpc transport.
 #  transport = "grpc"
 #
 #  ## Address and port to host telemetry listener
 #  service_address = ":57000"
 #
-#  ## Enable TLS for GRPC transport
+#  ## Enable TLS; grpc transport only.
 #  # tls_cert = "/etc/telegraf/cert.pem"
 #  # tls_key = "/etc/telegraf/key.pem"
 #
-#  ## Enable TLS client authentication and define allowed CA certificates
+#  ## Enable TLS client authentication and define allowed CA certificates; grpc
+#  ##  transport only.
 #  # tls_allowed_cacerts = ["/etc/telegraf/clientca.pem"]
 #
 #  ## Define aliases to map telemetry encoding paths to simple measurement names
@@ -4633,6 +4696,43 @@
 #   data_format = "influx"
 
 
+# # Read logging output from the Docker engine
+# [[inputs.docker_log]]
+#   ## Docker Endpoint
+#   ##   To use TCP, set endpoint = "tcp://[ip]:[port]"
+#   ##   To use environment variables (ie, docker-machine), set endpoint = "ENV"
+#   # endpoint = "unix:///var/run/docker.sock"
+#
+#   ## When true, container logs are read from the beginning; otherwise
+#   ## reading begins at the end of the log.
+#   # from_beginning = false
+#
+#   ## Timeout for Docker API calls.
+#   # timeout = "5s"
+#
+#   ## Containers to include and exclude. Globs accepted.
+#   ## Note that an empty array for both will include all containers
+#   # container_name_include = []
+#   # container_name_exclude = []
+#
+#   ## Container states to include and exclude. Globs accepted.
+#   ## When empty only containers in the "running" state will be captured.
+#   # container_state_include = []
+#   # container_state_exclude = []
+#
+#   ## docker labels to include and exclude as tags.  Globs accepted.
+#   ## Note that an empty array for both will include all labels as tags
+#   # docker_label_include = []
+#   # docker_label_exclude = []
+#
+#   ## Optional TLS Config
+#   # 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
+
+
 # # Influx HTTP write listener
 # [[inputs.http_listener]]
 #   ## Address and port to host HTTP listener on
@@ -4685,6 +4785,10 @@
 #   ## 0 means to use the default of 524,288,00 bytes (500 mebibytes)
 #   # max_body_size = "500MB"
 #
+#   ## Part of the request to consume.  Available options are "body" and
+#   ## "query".
+#   # data_source = "body"
+#
 #   ## Set one or more allowed client CA certificate file names to
 #   ## enable mutually authenticated TLS connections
 #   # tls_allowed_cacerts = ["/etc/telegraf/clientca.pem"]
@@ -4773,11 +4877,12 @@
 #   ]
 #
 #   ## Optional TLS Config
-#   tls_ca = "/etc/telegraf/ca.pem"
-#   tls_cert = "/etc/telegraf/cert.pem"
-#   tls_key = "/etc/telegraf/key.pem"
+#   # enable_tls = true
+#   # 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
+#   # insecure_skip_verify = false
 #
 #   ## Delay between retry attempts of failed RPC calls or streams. Defaults to 1000ms.
 #   ## Failed streams/calls will not be retried if 0 is provided
@@ -5236,7 +5341,12 @@
 #   ## OR
 #   # bearer_token_string = "abc_123"
 #
-#   ## Specify timeout duration for slower prometheus clients (default is 3s)
+#   ## HTTP Basic Authentication username and password. ('bearer_token' and
+#   ## 'bearer_token_string' take priority)
+#   # username = ""
+#   # password = ""
+#
+# 	## Specify timeout duration for slower prometheus clients (default is 3s)
 #   # response_timeout = "3s"
 #
 #   ## Optional TLS Config
@@ -5336,7 +5446,7 @@
 #   delete_timings = true
 #
 #   ## Percentiles to calculate for timing & histogram stats
-#   percentiles = [90]
+#   percentiles = [50.0, 90.0, 99.0, 99.9, 99.95, 100.0]
 #
 #   ## separator to use between elements of a statsd metric
 #   metric_separator = "_"