diff --git a/etc/telegraf.conf b/etc/telegraf.conf
index c386d171f..cf2a0d933 100644
--- a/etc/telegraf.conf
+++ b/etc/telegraf.conf
@@ -61,13 +61,25 @@
   ## Valid time units are "ns", "us" (or "µs"), "ms", "s".
   precision = ""
 
-  ## Logging configuration:
-  ## Run telegraf with debug log messages.
-  debug = false
-  ## Run telegraf in quiet mode (error log messages only).
-  quiet = false
-  ## Specify the log file name. The empty string means to log to stderr.
-  logfile = ""
+  ## Log at debug level.
+  # debug = false
+  ## Log only error level messages.
+  # quiet = false
+
+  ## Log file name, the empty string means to log to stderr.
+  # logfile = ""
+
+  ## The logfile will be rotated after the time interval specified.  When set
+  ## to 0 no time based rotation is performed.
+  # logfile_rotation_interval = "0d"
+
+  ## The logfile will be rotated when it becomes larger than the specified
+  ## size.  When set to 0 no size based rotation is performed.
+  # logfile_rotation_max_size = "0MB"
+
+  ## Maximum number of rotated archives to keep, any older logs are deleted.
+  ## If set to -1, no archives are removed.
+  # logfile_rotation_max_archives = 5
 
   ## Override default hostname, if empty use os.Hostname()
   hostname = ""
@@ -79,6 +91,7 @@
 #                            OUTPUT PLUGINS                                   #
 ###############################################################################
 
+
 # Configuration for sending metrics to InfluxDB
 [[outputs.influxdb]]
   ## The full HTTP or UDP URL for your InfluxDB instance.
@@ -183,7 +196,7 @@
 #   # exchange_type = "topic"
 #
 #   ## If true, exchange will be passively declared.
-#   # exchange_declare_passive = false
+#   # exchange_passive = false
 #
 #   ## Exchange durability can be either "transient" or "durable".
 #   # exchange_durability = "durable"
@@ -242,6 +255,14 @@
 #   ## Recommended to set to true.
 #   # use_batch_format = false
 #
+#   ## Content encoding for message payloads, can be set to "gzip" to or
+#   ## "identity" to apply no encoding.
+#   ##
+#   ## Please note that when use_batch_format = false each amqp message contains only
+#   ## a single metric, it is recommended to use compression with batch format
+#   ## for best results.
+#   # content_encoding = "identity"
+#
 #   ## Data format to output.
 #   ## Each data format has its own unique set of configuration options, read
 #   ## more about them here:
@@ -476,6 +497,18 @@
 #   ## Files to write to, "stdout" is a specially handled file.
 #   files = ["stdout", "/tmp/metrics.out"]
 #
+#   ## The file will be rotated after the time interval specified.  When set
+#   ## to 0 no time based rotation is performed.
+#   # rotation_interval = "0d"
+#
+#   ## The logfile will be rotated when it becomes larger than the specified
+#   ## size.  When set to 0 no size based rotation is performed.
+#   # rotation_max_size = "0MB"
+#
+#   ## Maximum number of rotated archives to keep, any older logs are deleted.
+#   ## If set to -1, no archives are removed.
+#   # rotation_max_archives = 5
+#
 #   ## Data format to output.
 #   ## Each data format has its own unique set of configuration options, read
 #   ## more about them here:
@@ -515,6 +548,46 @@
 #   servers = ["127.0.0.1:12201", "192.168.1.1:12201"]
 
 
+# # Configurable HTTP health check resource based on metrics
+# [[outputs.health]]
+#   ## Address and port to listen on.
+#   ##   ex: service_address = "tcp://localhost:8080"
+#   ##       service_address = "unix:///var/run/telegraf-health.sock"
+#   # service_address = "tcp://:8080"
+#
+#   ## The maximum duration for reading the entire request.
+#   # read_timeout = "5s"
+#   ## The maximum duration for writing the entire response.
+#   # write_timeout = "5s"
+#
+#   ## Username and password to accept for HTTP basic authentication.
+#   # basic_username = "user1"
+#   # basic_password = "secret"
+#
+#   ## Allowed CA certificates for client certificates.
+#   # tls_allowed_cacerts = ["/etc/telegraf/clientca.pem"]
+#
+#   ## TLS server certificate and private key.
+#   # tls_cert = "/etc/telegraf/cert.pem"
+#   # tls_key = "/etc/telegraf/key.pem"
+#
+#   ## One or more check sub-tables should be defined, it is also recommended to
+#   ## use metric filtering to limit the metrics that flow into this output.
+#   ##
+#   ## When using the default buffer sizes, this example will fail when the
+#   ## metric buffer is half full.
+#   ##
+#   ## namepass = ["internal_write"]
+#   ## tagpass = { output = ["influxdb"] }
+#   ##
+#   ## [[outputs.health.compares]]
+#   ##   field = "buffer_size"
+#   ##   lt = 5000.0
+#   ##
+#   ## [[outputs.health.contains]]
+#   ##   field = "buffer_size"
+
+
 # # A plugin that can transmit metrics over HTTP
 # [[outputs.http]]
 #   ## URL is the address to send metrics to
@@ -1061,6 +1134,84 @@
 #   #   location = "eu-north0"
 
 
+# # Configuration for Syslog server to send metrics to
+# [[outputs.syslog]]
+#   ## URL to connect to
+#   ## ex: address = "tcp://127.0.0.1:8094"
+#   ## ex: address = "tcp4://127.0.0.1:8094"
+#   ## ex: address = "tcp6://127.0.0.1:8094"
+#   ## ex: address = "tcp6://[2001:db8::1]:8094"
+#   ## ex: address = "udp://127.0.0.1:8094"
+#   ## ex: address = "udp4://127.0.0.1:8094"
+#   ## ex: address = "udp6://127.0.0.1:8094"
+#   address = "tcp://127.0.0.1:8094"
+#
+#   ## 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
+#
+#   ## Period between keep alive probes.
+#   ## Only applies to TCP sockets.
+#   ## 0 disables keep alive probes.
+#   ## Defaults to the OS configuration.
+#   # keep_alive_period = "5m"
+#
+#   ## The framing technique with which it is expected that messages are
+#   ## transported (default = "octet-counting").  Whether the messages come
+#   ## using the octect-counting (RFC5425#section-4.3.1, RFC6587#section-3.4.1),
+#   ## or the non-transparent framing technique (RFC6587#section-3.4.2).  Must
+#   ## be one of "octet-counting", "non-transparent".
+#   # framing = "octet-counting"
+#
+#   ## The trailer to be expected in case of non-trasparent framing (default = "LF").
+#   ## Must be one of "LF", or "NUL".
+#   # trailer = "LF"
+#
+#   ## SD-PARAMs settings
+#   ## Syslog messages can contain key/value pairs within zero or more
+#   ## structured data sections.  For each unrecognised metric tag/field a
+#   ## SD-PARAMS is created.
+#   ##
+#   ## Example:
+#   ##   [[outputs.syslog]]
+#   ##     sdparam_separator = "_"
+#   ##     default_sdid = "default@32473"
+#   ##     sdids = ["foo@123", "bar@456"]
+#   ##
+#   ##   input => xyzzy,x=y foo@123_value=42,bar@456_value2=84,something_else=1
+#   ##   output (structured data only) => [foo@123 value=42][bar@456 value2=84][default@32473 something_else=1 x=y]
+#
+#   ## SD-PARAMs separator between the sdid and tag/field key (default = "_")
+#   # sdparam_separator = "_"
+#
+#   ## Default sdid used for tags/fields that don't contain a prefix defined in
+#   ## the explict sdids setting below If no default is specified, no SD-PARAMs
+#   ## will be used for unrecognised field.
+#   # default_sdid = "default@32473"
+#
+#   ## List of explicit prefixes to extract from tag/field keys and use as the
+#   ## SDID, if they match (see above example for more details):
+#   # sdids = ["foo@123", "bar@456"]
+#
+#   ## Default severity value. Severity and Facility are used to calculate the
+#   ## message PRI value (RFC5424#section-6.2.1).  Used when no metric field
+#   ## with key "severity_code" is defined.  If unset, 5 (notice) is the default
+#   # default_severity_code = 5
+#
+#   ## Default facility value. Facility and Severity are used to calculate the
+#   ## message PRI value (RFC5424#section-6.2.1).  Used when no metric field with
+#   ## key "facility_code" is defined.  If unset, 1 (user-level) is the default
+#   # default_facility_code = 1
+#
+#   ## Default APP-NAME value (RFC5424#section-6.2.5)
+#   ## Used when no metric tag with key "appname" is defined.
+#   ## If unset, "Telegraf" is the default
+#   # default_appname = "Telegraf"
+
+
 # # Configuration for Wavefront server to send metrics to
 # [[outputs.wavefront]]
 #   ## Url for Wavefront Direct Ingestion or using HTTP with Wavefront Proxy
@@ -1111,11 +1262,11 @@
 #   #  red = 0.0
 
 
-
 ###############################################################################
 #                            PROCESSOR PLUGINS                                #
 ###############################################################################
 
+
 # # Convert values to another metric value type
 # [[processors.converter]]
 #   ## Tags to convert
@@ -1150,9 +1301,12 @@
 #     ## Name of the field to map
 #     field = "status"
 #
-#     ## Destination field to be used for the mapped value.  By default the source
-#     ## field is used, overwriting the original value.
-#     # dest = "status_code"
+#     ## Name of the tag to map
+#     # tag = "status"
+#
+#     ## Destination tag or field to be used for the mapped value.  By default the
+#     ## source tag or field is used, overwriting the original value.
+#     dest = "status_code"
 #
 #     ## Default value to be used for all values not contained in the mapping
 #     ## table.  When unset, the unmodified value for the field will be used if no
@@ -1162,7 +1316,7 @@
 #     ## Table of mappings
 #     [processors.enum.mapping.value_mappings]
 #       green = 1
-#       yellow = 2
+#       amber = 2
 #       red = 3
 
 
@@ -1327,11 +1481,11 @@
 #   # add_aggregate_fields = []
 
 
-
 ###############################################################################
 #                            AGGREGATOR PLUGINS                               #
 ###############################################################################
 
+
 # # Keep the aggregate basicstats of each metric passing through.
 # [[aggregators.basicstats]]
 #   ## The period on which to flush & clear the aggregator.
@@ -1344,6 +1498,18 @@
 #   # stats = ["count", "min", "max", "mean", "stdev", "s2", "sum"]
 
 
+# # Report the final metric of a series
+# [[aggregators.final]]
+#   ## The period on which to flush & clear the aggregator.
+#   period = "30s"
+#   ## If true, the original metric will be dropped by the
+#   ## aggregator and will not get sent to the output plugins.
+#   drop_original = false
+#
+#   ## The time that a series is not updated until considering it final.
+#   series_timeout = "5m"
+
+
 # # Create aggregate histograms.
 # [[aggregators.histogram]]
 #   ## The period in which to flush the aggregator.
@@ -1396,11 +1562,11 @@
 #   fields = []
 
 
-
 ###############################################################################
 #                            INPUT PLUGINS                                    #
 ###############################################################################
 
+
 # Read metrics about cpu usage
 [[inputs.cpu]]
   ## Whether to report per-cpu stats or not
@@ -1420,7 +1586,7 @@
   # mount_points = ["/"]
 
   ## Ignore mount points by filesystem type.
-  ignore_fs = ["tmpfs", "devtmpfs", "devfs", "overlay", "aufs", "squashfs"]
+  ignore_fs = ["tmpfs", "devtmpfs", "devfs", "iso9660", "overlay", "aufs", "squashfs"]
 
 
 # Read metrics about disk IO by device
@@ -1725,12 +1891,12 @@
 #   ## 4) environment variables
 #   ## 5) shared credentials file
 #   ## 6) EC2 Instance Profile
-#   #access_key = ""
-#   #secret_key = ""
-#   #token = ""
-#   #role_arn = ""
-#   #profile = ""
-#   #shared_credential_file = ""
+#   # access_key = ""
+#   # secret_key = ""
+#   # token = ""
+#   # role_arn = ""
+#   # profile = ""
+#   # shared_credential_file = ""
 #
 #   ## Endpoint to make request against, the correct endpoint is automatically
 #   ## determined and this option should only be set if you wish to override the
@@ -1756,27 +1922,35 @@
 #   interval = "5m"
 #
 #   ## Configure the TTL for the internal cache of metrics.
-#   ## Defaults to 1 hr if not specified
-#   #cache_ttl = "10m"
+#   # cache_ttl = "1h"
 #
 #   ## Metric Statistic Namespace (required)
 #   namespace = "AWS/ELB"
 #
 #   ## Maximum requests per second. Note that the global default AWS rate limit is
-#   ## 400 reqs/sec, so if you define multiple namespaces, these should add up to a
-#   ## maximum of 400. Optional - default value is 200.
+#   ## 50 reqs/sec, so if you define multiple namespaces, these should add up to a
+#   ## maximum of 50.
 #   ## See http://docs.aws.amazon.com/AmazonCloudWatch/latest/monitoring/cloudwatch_limits.html
-#   ratelimit = 200
+#   # ratelimit = 25
 #
-#   ## Metrics to Pull (optional)
+#   ## Namespace-wide statistic filters. These allow fewer queries to be made to
+#   ## cloudwatch.
+#   # statistic_include = [ "average", "sum", "minimum", "maximum", sample_count" ]
+#   # statistic_exclude = []
+#
+#   ## Metrics to Pull
 #   ## Defaults to all Metrics in Namespace if nothing is provided
 #   ## Refreshes Namespace available metrics every 1h
 #   #[[inputs.cloudwatch.metrics]]
 #   #  names = ["Latency", "RequestCount"]
 #   #
-#   #  ## Dimension filters for Metric.  These are optional however all dimensions
-#   #  ## defined for the metric names must be specified in order to retrieve
-#   #  ## the metric statistics.
+#   #  ## Statistic filters for Metric.  These allow for retrieving specific
+#   #  ## statistics for an individual metric.
+#   #  # statistic_include = [ "average", "sum", "minimum", "maximum", sample_count" ]
+#   #  # statistic_exclude = []
+#   #
+#   #  ## Dimension filters for Metric.  All dimensions defined for the metric names
+#   #  ## must be specified in order to retrieve the metric statistics.
 #   #  [[inputs.cloudwatch.metrics.dimensions]]
 #   #    name = "LoadBalancerName"
 #   #    value = "p-example"
@@ -1997,6 +2171,32 @@
 #   filters = [""]
 
 
+# # Read metrics about docker containers from Fargate/ECS v2 meta endpoints.
+# [[inputs.ecs]]
+#   ## ECS metadata url
+#   # endpoint_url = "http://169.254.170.2"
+#
+#   ## 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.
+#   ## Possible values are "NONE", "PULLED", "CREATED", "RUNNING",
+#   ## "RESOURCES_PROVISIONED", "STOPPED".
+#   # container_status_include = []
+#   # container_status_exclude = []
+#
+#   ## ecs labels to include and exclude as tags.  Globs accepted.
+#   ## Note that an empty array for both will include all labels as tags
+#   ecs_label_include = [ "com.amazonaws.ecs.*" ]
+#   ecs_label_exclude = []
+#
+#   ## Timeout for queries.
+#   # timeout = "5s"
+
+
 # # Read stats from one or more Elasticsearch servers or clusters
 # [[inputs.elasticsearch]]
 #   ## specify a list of one or more Elasticsearch servers
@@ -2884,14 +3084,19 @@
 #   # insecure_skip_verify = false
 
 
-# # Collects scores from a minecraft server's scoreboard using the RCON protocol
+# # Collects scores from a Minecraft server's scoreboard using the RCON protocol
 # [[inputs.minecraft]]
-#   ## server address for minecraft
+#   ## Address of the Minecraft server.
 #   # server = "localhost"
-#   ## port for RCON
+#
+#   ## Server RCON Port.
 #   # port = "25575"
-#   ## password RCON for mincraft server
-#   # password = ""
+#
+#   ## Server RCON Password.
+#   password = ""
+#
+#   ## Uncomment to remove deprecated metric components.
+#   # tagdrop = ["server"]
 
 
 # # Read metrics from one or many MongoDB servers
@@ -3246,6 +3451,32 @@
 #   timeout = 1000
 
 
+# # Read current weather and forecasts data from openweathermap.org
+# [[inputs.openweathermap]]
+#   ## OpenWeatherMap API key.
+#   app_id = "xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx"
+#
+#   ## City ID's to collect weather data from.
+#   city_id = ["5391959"]
+#
+#   ## APIs to fetch; can contain "weather" or "forecast".
+#   fetch = ["weather", "forecast"]
+#
+#   ## OpenWeatherMap base URL
+#   # base_url = "https://api.openweathermap.org/"
+#
+#   ## Timeout for HTTP response.
+#   # response_timeout = "5s"
+#
+#   ## Preferred unit system for temperature and wind speed. Can be one of
+#   ## "metric", "imperial", or "standard".
+#   # units = "metric"
+#
+#   ## Query interval; OpenWeatherMap updates their weather data every 10
+#   ## minutes.
+#   interval = "10m"
+
+
 # # Read metrics of passenger using passenger-status
 # [[inputs.passenger]]
 #   ## Path of passenger-status.
@@ -3346,18 +3577,16 @@
 #   unix_sockets = ["/var/run/pdns.controlsocket"]
 
 
-# # Read metrics from one or many PowerDNS recursors
+# # Read metrics from one or many PowerDNS Recursor servers
 # [[inputs.powerdns_recursor]]
 #   ## An array of sockets to gather stats about.
 #   ## Specify a path to unix socket.
-#   ##
-#   ## If no servers are specified, then '/var/run/pdns_recursor.controlsocket' is used as the path.
 #   unix_sockets = ["/var/run/pdns_recursor.controlsocket"]
 #
 #   ## Socket for Receive
-#   # socket_dir = "/var/run/"
+#   #socket_dir = "/var/run/"
 #   ## Socket permissions
-#   # socket_mode = "0666"
+#   #socket_mode = "0666"
 
 
 # # Monitor process cpu and memory usage
@@ -3539,13 +3768,13 @@
 # [[inputs.smart]]
 #   ## Optionally specify the path to the smartctl executable
 #   # path = "/usr/bin/smartctl"
-#   #
+#
 #   ## On most platforms smartctl requires root access.
 #   ## Setting 'use_sudo' to true will make use of sudo to run smartctl.
 #   ## Sudo must be configured to to allow the telegraf user to run smartctl
-#   ## with out password.
+#   ## without a password.
 #   # use_sudo = false
-#   #
+#
 #   ## Skip checking disks in this power mode. Defaults to
 #   ## "standby" to not wake up disks that have stoped rotating.
 #   ## See --nocheck in the man pages for smartctl.
@@ -3553,15 +3782,13 @@
 #   ## power mode and might require changing this value to
 #   ## "never" depending on your disks.
 #   # nocheck = "standby"
-#   #
+#
 #   ## Gather detailed metrics for each SMART Attribute.
-#   ## Defaults to "false"
-#   ##
 #   # attributes = false
-#   #
+#
 #   ## Optionally specify devices to exclude from reporting.
 #   # excludes = [ "/dev/pass6" ]
-#   #
+#
 #   ## Optionally specify devices and device type, if unset
 #   ## a scan (smartctl --scan) for S.M.A.R.T. devices will
 #   ## done and all found will be included except for the
@@ -3739,6 +3966,10 @@
 #
 #   ## specify a list of one or more Solr cores (default - all)
 #   # cores = ["main"]
+#
+#   ## Optional HTTP Basic Auth Credentials
+#   # username = "username"
+#   # password = "pa$$word"
 
 
 # # Read metrics from Microsoft SQL Server
@@ -4091,11 +4322,11 @@
 #   # insecure_skip_verify = true
 
 
-
 ###############################################################################
 #                            SERVICE INPUT PLUGINS                            #
 ###############################################################################
 
+
 # # AMQP consumer plugin
 # [[inputs.amqp_consumer]]
 #   ## Broker to consume from.
@@ -4111,7 +4342,7 @@
 #   # username = ""
 #   # password = ""
 #
-#   ## Exchange to declare and consume from.
+#   ## Name of the exchange to declare.  If unset, no exchange will be declared.
 #   exchange = "telegraf"
 #
 #   ## Exchange type; common types are "direct", "fanout", "topic", "header", "x-consistent-hash".
@@ -4133,7 +4364,11 @@
 #   ## AMQP queue durability can be "transient" or "durable".
 #   queue_durability = "durable"
 #
-#   ## Binding Key.
+#   ## If true, queue will be passively declared.
+#   # queue_passive = false
+#
+#   ## A binding between the exchange and queue using this binding key is
+#   ## created.  If unset, no binding is created.
 #   binding_key = "#"
 #
 #   ## Maximum number of messages server should give to the worker.
@@ -4161,6 +4396,10 @@
 #   ## Use TLS but skip chain & host verification
 #   # insecure_skip_verify = false
 #
+#   ## Content encoding for message payloads, can be set to "gzip" to or
+#   ## "identity" to apply no encoding.
+#   # content_encoding = "identity"
+#
 #   ## Data format to consume.
 #   ## Each data format has its own unique set of configuration options, read
 #   ## more about them here:
@@ -4190,6 +4429,84 @@
 #   ]
 
 
+# # Cisco GNMI telemetry input plugin based on GNMI telemetry data produced in IOS XR
+# [[inputs.cisco_telemetry_gnmi]]
+#  ## Address and port of the GNMI GRPC server
+#  addresses = ["10.49.234.114:57777"]
+#
+#  ## define credentials
+#  username = "cisco"
+#  password = "cisco"
+#
+#  ## GNMI encoding requested (one of: "proto", "json", "json_ietf")
+#  # encoding = "proto"
+#
+#  ## redial in case of failures after
+#  redial = "10s"
+#
+#  ## enable client-side TLS and define CA to authenticate the device
+#  # enable_tls = true
+#  # tls_ca = "/etc/telegraf/ca.pem"
+#  # insecure_skip_verify = true
+#
+#  ## define client-side TLS certificate & key to authenticate to the device
+#  # tls_cert = "/etc/telegraf/cert.pem"
+#  # tls_key = "/etc/telegraf/key.pem"
+#
+#  ## GNMI subscription prefix (optional, can usually be left empty)
+#  ## See: https://github.com/openconfig/reference/blob/master/rpc/gnmi/gnmi-specification.md#222-paths
+#  # origin = ""
+#  # prefix = ""
+#  # target = ""
+#
+#  ## Define additional aliases to map telemetry encoding paths to simple measurement names
+#  #[inputs.cisco_telemetry_gnmi.aliases]
+#  #  ifcounters = "openconfig:/interfaces/interface/state/counters"
+#
+#  [[inputs.cisco_telemetry_gnmi.subscription]]
+#   ## Name of the measurement that will be emitted
+#   name = "ifcounters"
+#
+#   ## Origin and path of the subscription
+#   ## See: https://github.com/openconfig/reference/blob/master/rpc/gnmi/gnmi-specification.md#222-paths
+#   ##
+#   ## origin usually refers to a (YANG) data model implemented by the device
+#   ## and path to a specific substructe inside it that should be subscribed to (similar to an XPath)
+#   ## YANG models can be found e.g. here: https://github.com/YangModels/yang/tree/master/vendor/cisco/xr
+#   origin = "openconfig-interfaces"
+#   path = "/interfaces/interface/state/counters"
+#
+#   # Subscription mode (one of: "target_defined", "sample", "on_change") and interval
+#   subscription_mode = "sample"
+#   sample_interval = "10s"
+#
+#   ## Suppress redundant transmissions when measured values are unchanged
+#   # suppress_redundant = false
+#
+#   ## If suppression is enabled, send updates at least every X seconds anyway
+#   # heartbeat_interval = "60s"
+
+
+# # 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)
+#  transport = "grpc"
+#
+#  ## Address and port to host telemetry listener
+#  service_address = ":57000"
+#
+#  ## Enable TLS for GRPC transport
+#  # tls_cert = "/etc/telegraf/cert.pem"
+#  # tls_key = "/etc/telegraf/key.pem"
+#
+#  ## Enable TLS client authentication and define allowed CA certificates
+#  # tls_allowed_cacerts = ["/etc/telegraf/clientca.pem"]
+#
+#  ## Define aliases to map telemetry encoding paths to simple measurement names
+#  [inputs.cisco_telemetry_mdt.aliases]
+#    ifstats = "ietf-interfaces:interfaces-state/interface/statistics"
+
+
 # # Read metrics from Google PubSub
 # [[inputs.cloud_pubsub]]
 #   ## Required. Name of Google Cloud Platform (GCP) Project that owns
@@ -4941,6 +5258,13 @@
 #   # service_address = "unix:///tmp/telegraf.sock"
 #   # service_address = "unixgram:///tmp/telegraf.sock"
 #
+#   ## Change the file mode bits on unix sockets.  These permissions may not be
+#   ## respected by some platforms, to safely restrict write permissions it is best
+#   ## to place the socket into a directory that has previously been created
+#   ## with the desired permissions.
+#   ##   ex: socket_mode = "777"
+#   # socket_mode = ""
+#
 #   ## Maximum number of concurrent connections.
 #   ## Only applies to stream sockets (e.g. TCP).
 #   ## 0 (default) is unlimited.
@@ -5018,6 +5342,9 @@
 #   ## http://docs.datadoghq.com/guides/dogstatsd/
 #   parse_data_dog_tags = false
 #
+#   ## Parses datadog extensions to the statsd format
+#   datadog_extensions = false
+#
 #   ## Statsd data translation templates, more info can be read here:
 #   ## https://github.com/influxdata/telegraf/blob/master/docs/TEMPLATE_PATTERN.md
 #   # templates = [
@@ -5065,7 +5392,7 @@
 #   ## The framing technique with which it is expected that messages are transported (default = "octet-counting").
 #   ## Whether the messages come using the octect-counting (RFC5425#section-4.3.1, RFC6587#section-3.4.1),
 #   ## or the non-transparent framing technique (RFC6587#section-3.4.2).
-#   ## Must be one of "octect-counting", "non-transparent".
+#   ## Must be one of "octet-counting", "non-transparent".
 #   # framing = "octet-counting"
 #
 #   ## The trailer to be expected in case of non-trasparent framing (default = "LF").
diff --git a/etc/telegraf_windows.conf b/etc/telegraf_windows.conf
index 3263eea11..b02a6e1e8 100644
--- a/etc/telegraf_windows.conf
+++ b/etc/telegraf_windows.conf
@@ -69,6 +69,18 @@
   ## Specify the log file name. The empty string means to log to stderr.
   logfile = "/Program Files/Telegraf/telegraf.log"
 
+  ## The logfile will be rotated after the time interval specified.  When set
+  ## to 0 no time based rotation is performed.
+  # logfile_rotation_interval = "0d"
+
+  ## The logfile will be rotated when it becomes larger than the specified
+  ## size.  When set to 0 no size based rotation is performed.
+  # logfile_rotation_max_size = "0MB"
+
+  ## Maximum number of rotated archives to keep, any older logs are deleted.
+  ## If set to -1, no archives are removed.
+  # logfile_rotation_max_archives = 5
+
   ## Override default hostname, if empty use os.Hostname()
   hostname = ""
   ## If set to true, do no set the "host" tag in the telegraf agent.