Merge branch 'influxdata:master' into master

.gitignore

@@ -6,3 +6,4 @@
 /vendor
 .DS_Store
 process.yml
+/.vscode

.golangci.yml

@@ -50,7 +50,7 @@ linters-settings:
       - name: error-return
       - name: error-strings
       - name: errorf
-      - name: flag-parameter
+#      - name: flag-parameter #disable for now
       - name: function-result-limit
         arguments: [ 3 ]
       - name: identical-branches

CHANGELOG.md

@@ -1,4 +1,4 @@
-## v1.19.0-rc1 [2021-06-10]
+## v1.19.0 [2021-06-17]
 
 #### Release Notes
 
@@ -13,6 +13,14 @@
 - [#9051](https://github.com/influxdata/telegraf/pull/9051) `outputs.kafka` Don't prevent telegraf from starting when there's a connection error
 - [#8795](https://github.com/influxdata/telegraf/pull/8795) `parsers.prometheusremotewrite` Update prometheus dependency to v2.21.0
 - [#9295](https://github.com/influxdata/telegraf/pull/9295) `outputs.dynatrace` Use dynatrace-metric-utils
+- [#9368](https://github.com/influxdata/telegraf/pull/9368) `parsers.json_v2` Update json_v2 parser to handle null types
+- [#9359](https://github.com/influxdata/telegraf/pull/9359) `inputs.sql` Fix import of sqlite and ignore it on all platforms that require CGO.
+- [#9329](https://github.com/influxdata/telegraf/pull/9329) `inputs.kube_inventory` Fix connecting to the wrong url
+- [#9358](https://github.com/influxdata/telegraf/pull/9358) upgrade denisenkom go-mssql to v0.10.0
+- [#9283](https://github.com/influxdata/telegraf/pull/9283) `processors.parser` Fix segfault
+- [#9243](https://github.com/influxdata/telegraf/pull/9243) `inputs.docker` Close all idle connections
+- [#9338](https://github.com/influxdata/telegraf/pull/9338) `inputs.suricata` Support new JSON format
+- [#9296](https://github.com/influxdata/telegraf/pull/9296) `outputs.influxdb` Fix endless retries
 
 #### Features
 
@@ -54,6 +62,7 @@
 - [OpenTelemetry](https://github.com/influxdata/telegraf/tree/master/plugins/inputs/opentelemetry) - contributed by @jacobmarble
 - [Intel Data Plane Development Kit (DPDK)](https://github.com/influxdata/telegraf/tree/master/plugins/inputs/dpdk) - contributed by @p-zak
 - [KNX](https://github.com/influxdata/telegraf/tree/master/plugins/inputs/knx_listener) - contributed by @DocLambda
+- [SQL](https://github.com/influxdata/telegraf/tree/master/plugins/inputs/sql) - contributed by @srebhan
 
 #### New Output Plugins
 

build_version.txt

@@ -1 +1 @@
-1.19.0
+1.20.0

docs/LICENSE_OF_DEPENDENCIES.md

@@ -54,7 +54,7 @@ following works:
 - github.com/containerd/containerd [Apache License 2.0](https://github.com/containerd/containerd/blob/master/LICENSE)
 - github.com/couchbase/go-couchbase [MIT License](https://github.com/couchbase/go-couchbase/blob/master/LICENSE)
 - github.com/couchbase/gomemcached [MIT License](https://github.com/couchbase/gomemcached/blob/master/LICENSE)
-- github.com/couchbase/goutils [COUCHBASE INC. COMMUNITY EDITION LICENSE](https://github.com/couchbase/goutils/blob/master/LICENSE.md)
+- github.com/couchbase/goutils [Apache License 2.0](https://github.com/couchbase/goutils/blob/master/LICENSE.md)
 - github.com/davecgh/go-spew [ISC License](https://github.com/davecgh/go-spew/blob/master/LICENSE)
 - github.com/denisenkom/go-mssqldb [BSD 3-Clause "New" or "Revised" License](https://github.com/denisenkom/go-mssqldb/blob/master/LICENSE.txt)
 - github.com/devigned/tab [MIT License](https://github.com/devigned/tab/blob/master/LICENSE)

etc/telegraf.conf

@@ -8046,6 +8046,84 @@
 #   # content_encoding = "identity"
 
 
+# # Read metrics from SQL queries
+# [[inputs.sql]]
+#   ## Database Driver
+#   ## See https://github.com/influxdata/telegraf/blob/master/docs/SQL_DRIVERS_INPUT.md for
+#   ## a list of supported drivers.
+#   driver = "mysql"
+#
+#   ## Data source name for connecting
+#   ## The syntax and supported options depends on selected driver.
+#   dsn = "username:password@mysqlserver:3307/dbname?param=value"
+#
+#   ## Timeout for any operation
+#   # timeout = "5s"
+#
+#   ## Connection time limits
+#   ## By default the maximum idle time and maximum lifetime of a connection is unlimited, i.e. the connections
+#   ## will not be closed automatically. If you specify a positive time, the connections will be closed after
+#   ## idleing or existing for at least that amount of time, respectively.
+#   # connection_max_idle_time = "0s"
+#   # connection_max_life_time = "0s"
+#
+#   ## Connection count limits
+#   ## By default the number of open connections is not limited and the number of maximum idle connections
+#   ## will be inferred from the number of queries specified. If you specify a positive number for any of the
+#   ## two options, connections will be closed when reaching the specified limit. The number of idle connections
+#   ## will be clipped to the maximum number of connections limit if any.
+#   # connection_max_open = 0
+#   # connection_max_idle = auto
+#
+#   [[inputs.sql.query]]
+#     ## Query to perform on the server
+#     query="SELECT user,state,latency,score FROM Scoreboard WHERE application > 0"
+#     ## Alternatively to specifying the query directly you can select a file here containing the SQL query.
+#     ## Only one of 'query' and 'query_script' can be specified!
+#     # query_script = "/path/to/sql/script.sql"
+#
+#     ## Name of the measurement
+#     ## In case both measurement and 'measurement_col' are given, the latter takes precedence.
+#     # measurement = "sql"
+#
+#     ## Column name containing the name of the measurement
+#     ## If given, this will take precedence over the 'measurement' setting. In case a query result
+#     ## does not contain the specified column, we fall-back to the 'measurement' setting.
+#     # measurement_column = ""
+#
+#     ## Column name containing the time of the measurement
+#     ## If ommited, the time of the query will be used.
+#     # time_column = ""
+#
+#     ## Format of the time contained in 'time_col'
+#     ## The time must be 'unix', 'unix_ms', 'unix_us', 'unix_ns', or a golang time format.
+#     ## See https://golang.org/pkg/time/#Time.Format for details.
+#     # time_format = "unix"
+#
+#     ## Column names containing tags
+#     ## An empty include list will reject all columns and an empty exclude list will not exclude any column.
+#     ## I.e. by default no columns will be returned as tag and the tags are empty.
+#     # tag_columns_include = []
+#     # tag_columns_exclude = []
+#
+# 		## Column names containing fields (explicit types)
+#     ## Convert the given columns to the corresponding type. Explicit type conversions take precedence over
+# 		## the automatic (driver-based) conversion below.
+# 		## NOTE: Columns should not be specified for multiple types or the resulting type is undefined.
+#     # field_columns_float = []
+#     # field_columns_int = []
+# 		# field_columns_uint = []
+# 		# field_columns_bool = []
+# 		# field_columns_string = []
+#
+#     ## Column names containing fields (automatic types)
+#     ## An empty include list is equivalent to '[*]' and all returned columns will be accepted. An empty
+#     ## exclude list will not exclude any column. I.e. by default all columns will be returned as fields.
+#     ## NOTE: We rely on the database driver to perform automatic datatype conversion.
+#     # field_columns_include = []
+#     # field_columns_exclude = []
+
+
 # # Read metrics from Microsoft SQL Server
 # [[inputs.sqlserver]]
 # ## Specify instances to monitor with a list of connection strings.

go.mod

@@ -38,15 +38,16 @@ require (
 	github.com/bmizerany/assert v0.0.0-20160611221934-b7ed37b82869
 	github.com/caio/go-tdigest v3.1.0+incompatible
 	github.com/cisco-ie/nx-telemetry-proto v0.0.0-20190531143454-82441e232cf6
-	github.com/couchbase/go-couchbase v0.0.0-20180501122049-16db1f1fe037
-	github.com/couchbase/gomemcached v0.0.0-20180502221210-0da75df14530 // indirect
-	github.com/couchbase/goutils v0.0.0-20180530154633-e865a1461c8a // indirect
+	github.com/couchbase/go-couchbase v0.1.0
+	github.com/couchbase/gomemcached v0.1.3 // indirect
+	github.com/couchbase/goutils v0.1.0 // indirect
 	github.com/denisenkom/go-mssqldb v0.10.0
 	github.com/dgrijalva/jwt-go/v4 v4.0.0-preview1
 	github.com/dimchansky/utfbom v1.1.1
 	github.com/docker/docker v20.10.6+incompatible
 	github.com/dynatrace-oss/dynatrace-metric-utils-go v0.1.0
 	github.com/eclipse/paho.mqtt.golang v1.3.0
+	github.com/form3tech-oss/jwt-go v3.2.3+incompatible // indirect
 	github.com/ghodss/yaml v1.0.1-0.20190212211648-25d852aebe32
 	github.com/go-logfmt/logfmt v0.5.0
 	github.com/go-ping/ping v0.0.0-20210201095549-52eed920f98c
@@ -93,6 +94,7 @@ require (
 	github.com/moby/ipvs v1.0.1
 	github.com/multiplay/go-ts3 v1.0.0
 	github.com/naoina/go-stringutil v0.1.0 // indirect
+	github.com/nats-io/jwt v1.2.2 // indirect
 	github.com/nats-io/nats-server/v2 v2.1.4
 	github.com/nats-io/nats.go v1.10.0
 	github.com/newrelic/newrelic-telemetry-sdk-go v0.5.1
@@ -110,15 +112,15 @@ require (
 	github.com/sensu/sensu-go/api/core/v2 v2.6.0
 	github.com/shirou/gopsutil v3.21.3+incompatible
 	github.com/shopspring/decimal v0.0.0-20200105231215-408a2507e114 // indirect
-	github.com/signalfx/golib/v3 v3.3.0
+	github.com/signalfx/golib/v3 v3.3.34
 	github.com/sirupsen/logrus v1.7.0
 	github.com/sleepinggenius2/gosmi v0.4.3
 	github.com/snowflakedb/gosnowflake v1.5.0
 	github.com/streadway/amqp v0.0.0-20190827072141-edfb9018d271
 	github.com/stretchr/testify v1.7.0
 	github.com/tbrandon/mbserver v0.0.0-20170611213546-993e1772cc62
 	github.com/testcontainers/testcontainers-go v0.11.0
-	github.com/tidwall/gjson v1.6.0
+	github.com/tidwall/gjson v1.8.0
 	github.com/tinylib/msgp v1.1.5
 	github.com/tklauser/go-sysconf v0.3.5 // indirect
 	github.com/vapourismo/knx-go v0.0.0-20201122213738-75fe09ace330
@@ -134,7 +136,7 @@ require (
 	golang.org/x/net v0.0.0-20210226172049-e18ecbb05110
 	golang.org/x/oauth2 v0.0.0-20200107190931-bf48bf16ab8d
 	golang.org/x/sync v0.0.0-20201207232520-09787c993a3a
-	golang.org/x/sys v0.0.0-20210324051608-47abb6519492
+	golang.org/x/sys v0.0.0-20210426230700-d19ff857e887
 	golang.org/x/text v0.3.4
 	golang.org/x/tools v0.1.0
 	golang.zx2c4.com/wireguard/wgctrl v0.0.0-20200205215550-e35592f146e4
@@ -150,7 +152,7 @@ require (
 	gopkg.in/yaml.v2 v2.4.0
 	gotest.tools v2.2.0+incompatible
 	k8s.io/api v0.20.4
-	k8s.io/apimachinery v0.20.4
+	k8s.io/apimachinery v0.21.1
 	k8s.io/client-go v0.20.4
 	modernc.org/sqlite v1.10.8
 )