fix: update etc/telegraf.conf and etc/telegraf_windows.conf (#9814)

Co-authored-by: Tiger Bot <>

etc/telegraf.conf

@@ -765,6 +765,9 @@
 #   ## Endpoints for your graylog instances.
 #   servers = ["udp://127.0.0.1:12201"]
 #
+#   ## Connection timeout.
+#   # timeout = "5s"
+#
 #   ## The field to use as the GELF short_message, if unset the static string
 #   ## "telegraf" will be used.
 #   ##   example: short_message_field = "message"
@@ -1254,6 +1257,12 @@
 #   ## actually reads it
 #   # retain = false
 #
+#   ## Defines the maximum length of time that the broker and client may not communicate.
+#   ## Defaults to 0 which turns the feature off. For version v2.0.12 of eclipse/mosquitto there is a
+#   ## [bug](https://github.com/eclipse/mosquitto/issues/2117) which requires keep_alive to be set.
+#   ## As a reference eclipse/paho.mqtt.golang v1.3.0 defaults to 30.
+#   # keep_alive = 0
+#
 #   ## Data format to output.
 #   ## Each data format has its own unique set of configuration options, read
 #   ## more about them here:
@@ -3415,6 +3424,14 @@
 #
 #   ## Filter bucket fields to include only here.
 #   # bucket_stats_included = ["quota_percent_used", "ops_per_sec", "disk_fetches", "item_count", "disk_used", "data_used", "mem_used"]
+#
+#   ## 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 (defaults to false)
+#   ## If set to false, tls_cert and tls_key are required
+#   # insecure_skip_verify = false
 
 
 # # Read CouchDB Stats from one or more servers
@@ -3769,6 +3786,13 @@
 #     ## The date/time field in the Elasticsearch index (mandatory).
 #     date_field = "@timestamp"
 #
+#     ## If the field used for the date/time field in Elasticsearch is also using
+#     ## a custom date/time format it may be required to provide the format to
+#     ## correctly parse the field.
+#     ##
+#     ## If using one of the built in elasticsearch formats this is not required.
+#     # date_field_custom_format = ""
+#
 #     ## Time window to query (eg. "1m" to query documents from last minute).
 #     ## Normally should be set to same as collection interval
 #     query_period = "1m"
@@ -4777,6 +4801,12 @@
 #   # ]
 
 
+# # Read metrics about LVM physical volumes, volume groups, logical volumes.
+# [[inputs.lvm]]
+# ## Use sudo to run LVM commands
+# use_sudo = false
+
+
 # # Gathers metrics from the /3.0/reports MailChimp API
 # [[inputs.mailchimp]]
 #   ## MailChimp API key
@@ -5471,6 +5501,12 @@
 #   ## Password. Required for auth_method = "UserName"
 #   # password = ""
 #   #
+#   ## Option to select the metric timestamp to use. Valid options are:
+#   ##     "gather" -- uses the time of receiving the data in telegraf
+#   ##     "server" -- uses the timestamp provided by the server
+#   ##     "source" -- uses the timestamp provided by the source
+#   # timestamp = "gather"
+#   #
 #   ## Node ID configuration
 #   ## name              - field name to use in the output
 #   ## namespace         - OPC UA namespace of the node (integer value 0 thru 3)
@@ -5546,7 +5582,7 @@
 #   # timeout = "5ms"
 
 
-# # A plugin to collect stats from Opensmtpd - a validating, recursive, and caching DNS resolver
+# # A plugin to collect stats from Opensmtpd - a validating, recursive, and caching DNS resolver 
 # [[inputs.opensmtpd]]
 #   ## If running as a restricted user you can prepend sudo for additional access:
 #   #use_sudo = false
@@ -6486,219 +6522,6 @@
 #   ## General connection timeout
 #   # timeout = "5s"
 
-# # Input plugin to collect Windows Event Log messages
-# [[inputs.win_eventlog]]
-#   ## Telegraf should have Administrator permissions to subscribe for some Windows Events channels
-#   ## (System log, for example)
-#
-#   ## LCID (Locale ID) for event rendering
-#   ## 1033 to force English language
-#   ## 0 to use default Windows locale
-#   # locale = 0
-#
-#   ## Name of eventlog, used only if xpath_query is empty
-#   ## Example: "Application"
-#   # eventlog_name = ""
-#
-#   ## xpath_query can be in defined short form like "Event/System[EventID=999]"
-#   ## or you can form a XML Query. Refer to the Consuming Events article:
-#   ## https://docs.microsoft.com/en-us/windows/win32/wes/consuming-events
-#   ## XML query is the recommended form, because it is most flexible
-#   ## You can create or debug XML Query by creating Custom View in Windows Event Viewer
-#   ## and then copying resulting XML here
-#   xpath_query = '''
-#   <QueryList>
-#     <Query Id="0" Path="Security">
-#       <Select Path="Security">*</Select>
-#       <Suppress Path="Security">*[System[( (EventID &gt;= 5152 and EventID &lt;= 5158) or EventID=5379 or EventID=4672)]]</Suppress>
-#     </Query>
-#     <Query Id="1" Path="Application">
-#       <Select Path="Application">*[System[(Level &lt; 4)]]</Select>
-#     </Query>
-#     <Query Id="2" Path="Windows PowerShell">
-#       <Select Path="Windows PowerShell">*[System[(Level &lt; 4)]]</Select>
-#     </Query>
-#     <Query Id="3" Path="System">
-#       <Select Path="System">*</Select>
-#     </Query>
-#     <Query Id="4" Path="Setup">
-#       <Select Path="Setup">*</Select>
-#     </Query>
-#   </QueryList>
-#   '''
-#
-#   ## System field names:
-#   ##   "Source", "EventID", "Version", "Level", "Task", "Opcode", "Keywords", "TimeCreated",
-#   ##   "EventRecordID", "ActivityID", "RelatedActivityID", "ProcessID", "ThreadID", "ProcessName",
-#   ##   "Channel", "Computer", "UserID", "UserName", "Message", "LevelText", "TaskText", "OpcodeText"
-#
-#   ## In addition to System, Data fields can be unrolled from additional XML nodes in event.
-#   ## Human-readable representation of those nodes is formatted into event Message field,
-#   ## but XML is more machine-parsable
-#
-#   # Process UserData XML to fields, if this node exists in Event XML
-#   process_userdata = true
-#
-#   # Process EventData XML to fields, if this node exists in Event XML
-#   process_eventdata = true
-#
-#   ## Separator character to use for unrolled XML Data field names
-#   separator = "_"
-#
-#   ## Get only first line of Message field. For most events first line is usually more than enough
-#   only_first_line_of_message = true
-#
-#   ## Parse timestamp from TimeCreated.SystemTime event field.
-#   ## Will default to current time of telegraf processing on parsing error or if set to false
-#   timestamp_from_event = true
-#
-#   ## Fields to include as tags. Globbing supported ("Level*" for both "Level" and "LevelText")
-#   event_tags = ["Source", "EventID", "Level", "LevelText", "Task", "TaskText", "Opcode", "OpcodeText", "Keywords", "Channel", "Computer"]
-#
-#   ## Default list of fields to send. All fields are sent by default. Globbing supported
-#   event_fields = ["*"]
-#
-#   ## Fields to exclude. Also applied to data fields. Globbing supported
-#   exclude_fields = ["TimeCreated", "Binary", "Data_Address*"]
-#
-#   ## Skip those tags or fields if their value is empty or equals to zero. Globbing supported
-#   exclude_empty = ["*ActivityID", "UserID"]
-
-
-# # Input plugin to counterPath Performance Counters on Windows operating systems
-# [[inputs.win_perf_counters]]
-#   ## By default this plugin returns basic CPU and Disk statistics.
-#   ## See the README file for more examples.
-#   ## Uncomment examples below or write your own as you see fit. If the system
-#   ## being polled for data does not have the Object at startup of the Telegraf
-#   ## agent, it will not be gathered.
-#   ## Settings:
-#   # PrintValid = false # Print All matching performance counters
-#   # Whether request a timestamp along with the PerfCounter data or just use current time
-#   # UsePerfCounterTime=true
-#   # If UseWildcardsExpansion params is set to true, wildcards (partial wildcards in instance names and wildcards in counters names) in configured counter paths will be expanded
-#   # and in case of localized Windows, counter paths will be also localized. It also returns instance indexes in instance names.
-#   # If false, wildcards (not partial) in instance names will still be expanded, but instance indexes will not be returned in instance names.
-#   #UseWildcardsExpansion = false
-#   # Period after which counters will be reread from configuration and wildcards in counter paths expanded
-#   CountersRefreshInterval="1m"
-#
-#   [[inputs.win_perf_counters.object]]
-#     # Processor usage, alternative to native, reports on a per core.
-#     ObjectName = "Processor"
-#     Instances = ["*"]
-#     Counters = [
-#       "% Idle Time",
-#       "% Interrupt Time",
-#       "% Privileged Time",
-#       "% User Time",
-#       "% Processor Time",
-#       "% DPC Time",
-#     ]
-#     Measurement = "win_cpu"
-#     # Set to true to include _Total instance when querying for all (*).
-#     # IncludeTotal=false
-#     # Print out when the performance counter is missing from object, counter or instance.
-#     # WarnOnMissing = false
-#
-#   [[inputs.win_perf_counters.object]]
-#     # Disk times and queues
-#     ObjectName = "LogicalDisk"
-#     Instances = ["*"]
-#     Counters = [
-#       "% Idle Time",
-#       "% Disk Time",
-#       "% Disk Read Time",
-#       "% Disk Write Time",
-#       "% User Time",
-#       "% Free Space",
-#       "Current Disk Queue Length",
-#       "Free Megabytes",
-#     ]
-#     Measurement = "win_disk"
-#
-#   [[inputs.win_perf_counters.object]]
-#     ObjectName = "PhysicalDisk"
-#     Instances = ["*"]
-#     Counters = [
-#       "Disk Read Bytes/sec",
-#       "Disk Write Bytes/sec",
-#       "Current Disk Queue Length",
-#       "Disk Reads/sec",
-#       "Disk Writes/sec",
-#       "% Disk Time",
-#       "% Disk Read Time",
-#       "% Disk Write Time",
-#     ]
-#     Measurement = "win_diskio"
-#
-#   [[inputs.win_perf_counters.object]]
-#     ObjectName = "Network Interface"
-#     Instances = ["*"]
-#     Counters = [
-#       "Bytes Received/sec",
-#       "Bytes Sent/sec",
-#       "Packets Received/sec",
-#       "Packets Sent/sec",
-#       "Packets Received Discarded",
-#       "Packets Outbound Discarded",
-#       "Packets Received Errors",
-#       "Packets Outbound Errors",
-#     ]
-#     Measurement = "win_net"
-#
-#
-#   [[inputs.win_perf_counters.object]]
-#     ObjectName = "System"
-#     Counters = [
-#       "Context Switches/sec",
-#       "System Calls/sec",
-#       "Processor Queue Length",
-#       "System Up Time",
-#     ]
-#     Instances = ["------"]
-#     Measurement = "win_system"
-#
-#   [[inputs.win_perf_counters.object]]
-#     # Example counterPath where the Instance portion must be removed to get data back,
-#     # such as from the Memory object.
-#     ObjectName = "Memory"
-#     Counters = [
-#       "Available Bytes",
-#       "Cache Faults/sec",
-#       "Demand Zero Faults/sec",
-#       "Page Faults/sec",
-#       "Pages/sec",
-#       "Transition Faults/sec",
-#       "Pool Nonpaged Bytes",
-#       "Pool Paged Bytes",
-#       "Standby Cache Reserve Bytes",
-#       "Standby Cache Normal Priority Bytes",
-#       "Standby Cache Core Bytes",
-#     ]
-#     Instances = ["------"] # Use 6 x - to remove the Instance bit from the counterPath.
-#     Measurement = "win_mem"
-#
-#   [[inputs.win_perf_counters.object]]
-#     # Example query where the Instance portion must be removed to get data back,
-#     # such as from the Paging File object.
-#     ObjectName = "Paging File"
-#     Counters = [
-#       "% Usage",
-#     ]
-#     Instances = ["_Total"]
-#     Measurement = "win_swap"
-
-
-# # Input plugin to report Windows services info.
-# [[inputs.win_services]]
-#   ## Names of the services to monitor. Leave empty to monitor all the available services on the host. Globs accepted.
-#   service_names = [
-#     "LanmanServer",
-# 	"TermService",
-# 	"Win*",
-#   ]
-
 
 # # A plugin to collect stats from Varnish HTTP Cache
 # [[inputs.varnish]]
@@ -6802,7 +6625,7 @@
 
 
 # # Listener capable of handling KNX bus messages provided through a KNX-IP Interface.
-# [[inputs.knx_listener]]
+# [[inputs.KNXListener]]
 #   ## Type of KNX-IP interface.
 #   ## Can be either "tunnel" or "router".
 #   # service_type = "tunnel"
@@ -7667,7 +7490,7 @@
 # 	## This value is propagated to pqos tool. Interval format is defined by pqos itself.
 # 	## If not provided or provided 0, will be set to 10 = 10x100ms = 1s.
 # 	# sampling_interval = "10"
-#
+# 	
 # 	## Optionally specify the path to pqos executable.
 # 	## If not provided, auto discovery will be performed.
 # 	# pqos_path = "/usr/local/bin/pqos"
@@ -7675,12 +7498,12 @@
 # 	## Optionally specify if IPC and LLC_Misses metrics shouldn't be propagated.
 # 	## If not provided, default value is false.
 # 	# shortened_metrics = false
-#
+# 	
 # 	## Specify the list of groups of CPU core(s) to be provided as pqos input.
 # 	## Mandatory if processes aren't set and forbidden if processes are specified.
 # 	## e.g. ["0-3", "4,5,6"] or ["1-3,4"]
 # 	# cores = ["0-3"]
-#
+# 	
 # 	## Specify the list of processes for which Metrics will be collected.
 # 	## Mandatory if cores aren't set and forbidden if cores are specified.
 # 	## e.g. ["qemu", "pmd"]
@@ -7924,6 +7747,30 @@
 # 	table_name = "default"
 
 
+# # Listener capable of handling KNX bus messages provided through a KNX-IP Interface.
+# [[inputs.knx_listener]]
+#   ## Type of KNX-IP interface.
+#   ## Can be either "tunnel" or "router".
+#   # service_type = "tunnel"
+#
+#   ## Address of the KNX-IP interface.
+#   service_address = "localhost:3671"
+#
+#   ## Measurement definition(s)
+#   # [[inputs.knx_listener.measurement]]
+#   #   ## Name of the measurement
+#   #   name = "temperature"
+#   #   ## Datapoint-Type (DPT) of the KNX messages
+#   #   dpt = "9.001"
+#   #   ## List of Group-Addresses (GAs) assigned to the measurement
+#   #   addresses = ["5/5/1"]
+#
+#   # [[inputs.knx_listener.measurement]]
+#   #   name = "illumination"
+#   #   dpt = "9.004"
+#   #   addresses = ["5/5/3"]
+
+
 # # Read metrics off Arista LANZ, via socket
 # [[inputs.lanz]]
 #   ## URL to Arista LANZ endpoint
@@ -9103,3 +8950,4 @@
 # [[inputs.zipkin]]
 #   # path = "/api/v1/spans" # URL path for span data
 #   # port = 9411            # Port on which Telegraf listens
+