PostgreSQL output plugin

.circleci/config.yml

@@ -6,10 +6,10 @@ defaults:
       GOFLAGS: -p=8
   go-1_12: &go-1_12
     docker:
-      - image: 'quay.io/influxdb/telegraf-ci:1.12.12'
+      - image: 'quay.io/influxdb/telegraf-ci:1.12.14'
   go-1_13: &go-1_13
     docker:
-      - image: 'quay.io/influxdb/telegraf-ci:1.13.3'
+      - image: 'quay.io/influxdb/telegraf-ci:1.13.5'
 
 version: 2
 jobs:

CHANGELOG.md

@@ -1,8 +1,8 @@
-## v1.13 [unreleased]
+## v1.13 [2019-12-12]
 
 #### Release Notes
 
-- Official packages built with Go 1.13.3.
+- Official packages built with Go 1.13.5.
 - The `prometheus` input and `prometheus_client` output have a new mapping to
   and from Telegraf metrics, which can be enabled by setting `metric_version = 2`.
   The original mapping is deprecated.  When both plugins have the same setting,
@@ -66,6 +66,7 @@
 - [#6735](https://github.com/influxdata/telegraf/pull/6735): Support resolution of symlinks in filecount input.
 - [#6746](https://github.com/influxdata/telegraf/pull/6746): Set message timestamp to the metric time in kafka output.
 - [#6740](https://github.com/influxdata/telegraf/pull/6740): Add base64decode operation to string processor.
+- [#6790](https://github.com/influxdata/telegraf/pull/6790): Add option to control collecting global variables to mysql input.
 
 #### Bugfixes
 
@@ -78,6 +79,9 @@
 - [#6705](https://github.com/influxdata/telegraf/issues/6705): Remove trailing underscore trimming from json flattener.
 - [#6421](https://github.com/influxdata/telegraf/issues/6421): Revert change causing cpu usage to be capped at 100 percent.
 - [#6523](https://github.com/influxdata/telegraf/issues/6523): Accept any media type in the prometheus input.
+- [#6769](https://github.com/influxdata/telegraf/issues/6769): Fix unix socket dial arguments in uwsgi input.
+- [#6757](https://github.com/influxdata/telegraf/issues/6757): Replace colon chars in prometheus output labels with metric_version=1.
+- [#6773](https://github.com/influxdata/telegraf/issues/6773): Set TrimLeadingSpace when TrimSpace is on in csv parser.
 
 ## v1.12.6 [2019-11-19]
 

Gopkg.toml

@@ -18,6 +18,10 @@
   name = "github.com/aws/aws-sdk-go"
   version = "1.19.41"
 
+[[constraint]]
+  name = "github.com/bsm/sarama-cluster"
+  version = "2.1.13"
+
 [[constraint]]
   name = "github.com/couchbase/go-couchbase"
   branch = "master"
@@ -36,7 +40,7 @@
 
 [[constraint]]
   name = "github.com/eclipse/paho.mqtt.golang"
-  version = "1"
+  version = "~1.1.1"
 
 [[constraint]]
   name = "github.com/go-sql-driver/mysql"
@@ -100,7 +104,7 @@
 
 [[constraint]]
   name = "github.com/Microsoft/ApplicationInsights-Go"
-  branch = "master"
+  version = "0.4.2"
 
 [[constraint]]
   name = "github.com/miekg/dns"
@@ -304,3 +308,12 @@
 [[constraint]]
   name = "github.com/safchain/ethtool"
   revision = "42ed695e3de80b9d695f280295fd7994639f209d"
+
+[[override]]
+  name = "github.com/satori/go.uuid"
+  revision = "b2ce2384e17bbe0c6d34077efa39dbab3e09123b"
+
+[[constraint]]  
+  branch = "master"
+  name = "github.com/golang/groupcache"
+

Makefile

@@ -131,10 +131,10 @@ plugin-%:
 
 .PHONY: ci-1.13
 ci-1.13:
-	docker build -t quay.io/influxdb/telegraf-ci:1.13.3 - < scripts/ci-1.13.docker
-	docker push quay.io/influxdb/telegraf-ci:1.13.3
+	docker build -t quay.io/influxdb/telegraf-ci:1.13.5 - < scripts/ci-1.13.docker
+	docker push quay.io/influxdb/telegraf-ci:1.13.5
 
 .PHONY: ci-1.12
 ci-1.12:
-	docker build -t quay.io/influxdb/telegraf-ci:1.12.12 - < scripts/ci-1.12.docker
-	docker push quay.io/influxdb/telegraf-ci:1.12.12
+	docker build -t quay.io/influxdb/telegraf-ci:1.12.14 - < scripts/ci-1.12.docker
+	docker push quay.io/influxdb/telegraf-ci:1.12.14

README.md

@@ -29,6 +29,16 @@ There are many ways to contribute:
 - Answer questions and discuss here on github and on the [Community Site](https://community.influxdata.com/)
 - [Contribute plugins](CONTRIBUTING.md)
 
+## Minimum Requirements
+
+Telegraf shares the same [minimum requirements][] as Go:
+- Linux kernel version 2.6.23 or later
+- Windows 7 or later
+- FreeBSD 11.2 or later
+- MacOS 10.11 El Capitan or later
+
+[minimum requirements]: https://github.com/golang/go/wiki/MinimumRequirements#minimum-requirements
+
 ## Installation:
 
 You can download the binaries directly from the [downloads](https://www.influxdata.com/downloads) page

appveyor.yml

@@ -13,11 +13,11 @@ platform: x64
 
 install:
   - IF NOT EXIST "C:\Cache" mkdir C:\Cache
-  - IF NOT EXIST "C:\Cache\go1.13.3.msi" curl -o "C:\Cache\go1.13.3.msi" https://storage.googleapis.com/golang/go1.13.3.windows-amd64.msi
+  - IF NOT EXIST "C:\Cache\go1.13.5.msi" curl -o "C:\Cache\go1.13.5.msi" https://storage.googleapis.com/golang/go1.13.5.windows-amd64.msi
   - IF NOT EXIST "C:\Cache\gnuwin32-bin.zip" curl -o "C:\Cache\gnuwin32-bin.zip" https://dl.influxdata.com/telegraf/ci/make-3.81-bin.zip
   - IF NOT EXIST "C:\Cache\gnuwin32-dep.zip" curl -o "C:\Cache\gnuwin32-dep.zip" https://dl.influxdata.com/telegraf/ci/make-3.81-dep.zip
   - IF EXIST "C:\Go" rmdir /S /Q C:\Go
-  - msiexec.exe /i "C:\Cache\go1.13.3.msi" /quiet
+  - msiexec.exe /i "C:\Cache\go1.13.5.msi" /quiet
   - 7z x "C:\Cache\gnuwin32-bin.zip" -oC:\GnuWin32 -y
   - 7z x "C:\Cache\gnuwin32-dep.zip" -oC:\GnuWin32 -y
   - go get -d github.com/golang/dep

docs/WINDOWS_SERVICE.md

@@ -48,18 +48,21 @@ Telegraf can manage its own service through the --service flag:
 
 ## Install multiple services
 
-You can install multiple telegraf instances with --service-name flag:
+Running multiple instances of Telegraf is seldom needed, as you can run
+multiple instances of each plugin and route metric flow using the metric
+filtering options.  However, if you do need to run multiple telegraf instances
+on a single system, you can install the service with the `--service-name` and
+`--service-display-name` flags to give the services unique names:
 
 ```
-   > C:\"Program Files"\Telegraf\telegraf.exe --service install --service-name telegraf-1
-   > C:\"Program Files"\Telegraf\telegraf.exe --service install --service-name telegraf-2
-   > C:\"Program Files"\Telegraf\telegraf.exe --service uninstall --service-name telegraf-1
+> C:\"Program Files"\Telegraf\telegraf.exe --service install --service-name telegraf-1 --service-display-name "Telegraf 1"
+> C:\"Program Files"\Telegraf\telegraf.exe --service install --service-name telegraf-2 --service-display-name "Telegraf 2"
 ```
 
 ## Troubleshooting
 
 When Telegraf runs as a Windows service, Telegraf logs messages to Windows events log before configuration file with logging settings is loaded.
-Check event log for an error reported by `telegraf` service in case of Telegraf service reports failure on its start: Event Viewer->Windows Logs->Application 
+Check event log for an error reported by `telegraf` service in case of Telegraf service reports failure on its start: Event Viewer->Windows Logs->Application
 
 **Troubleshooting  common error #1067**
 

etc/telegraf.conf

@@ -1516,6 +1516,10 @@
 #   # [[processors.strings.left]]
 #   #   field = "message"
 #   #   width = 10
+#
+#   ## Decode a base64 encoded utf-8 string
+#   # [[processors.strings.base64decode]]
+#   #   field = "message"
 
 
 # # Restricts the number of tags that can pass through this filter and chooses which tags to preserve when over the limit.
@@ -3469,6 +3473,9 @@
 #   ## gather metrics from SHOW BINARY LOGS command output
 #   # gather_binary_logs = false
 #
+#   ## gather metrics from PERFORMANCE_SCHEMA.GLOBAL_VARIABLES
+#   # gather_global_variables = true
+#
 #   ## gather metrics from PERFORMANCE_SCHEMA.TABLE_IO_WAITS_SUMMARY_BY_TABLE
 #   # gather_table_io_waits = false
 #
@@ -5741,7 +5748,11 @@
 #   ## Transport, local address, and port to listen on.  Transport must
 #   ## be "udp://".  Omit local address to listen on all interfaces.
 #   ##   example: "udp://127.0.0.1:1234"
-#   # service_address = udp://:162
+#   ##
+#   ## Special permissions may be required to listen on a port less than
+#   ## 1024.  See README.md for details
+#   ##
+#   # service_address = "udp://:162"
 #   ## Timeout running snmptranslate command
 #   # timeout = "5s"
 

plugins/inputs/mysql/README.md

@@ -69,6 +69,9 @@ This plugin gathers the statistic data from MySQL server
   ## gather metrics from SHOW BINARY LOGS command output
   # gather_binary_logs = false
 
+  ## gather metrics from SHOW GLOBAL VARIABLES command output
+  # gather_global_variables = true
+
   ## gather metrics from PERFORMANCE_SCHEMA.TABLE_IO_WAITS_SUMMARY_BY_TABLE
   # gather_table_io_waits = false
 

plugins/inputs/mysql/mysql.go

@@ -36,6 +36,7 @@ type Mysql struct {
 	GatherTableSchema                   bool     `toml:"gather_table_schema"`
 	GatherFileEventsStats               bool     `toml:"gather_file_events_stats"`
 	GatherPerfEventsStatements          bool     `toml:"gather_perf_events_statements"`
+	GatherGlobalVars                    bool     `toml:"gather_global_variables"`
 	IntervalSlow                        string   `toml:"interval_slow"`
 	MetricVersion                       int      `toml:"metric_version"`
 
@@ -94,6 +95,9 @@ const sampleConfig = `
   ## gather metrics from SHOW BINARY LOGS command output
   # gather_binary_logs = false
 
+  ## gather metrics from PERFORMANCE_SCHEMA.GLOBAL_VARIABLES
+  # gather_global_variables = true
+
   ## gather metrics from PERFORMANCE_SCHEMA.TABLE_IO_WAITS_SUMMARY_BY_TABLE
   # gather_table_io_waits = false
 
@@ -134,6 +138,7 @@ const (
 	defaultPerfEventsStatementsDigestTextLimit = 120
 	defaultPerfEventsStatementsLimit           = 250
 	defaultPerfEventsStatementsTimeLimit       = 86400
+	defaultGatherGlobalVars                    = true
 )
 
 func (m *Mysql) SampleConfig() string {
@@ -431,14 +436,16 @@ func (m *Mysql) gatherServer(serv string, acc telegraf.Accumulator) error {
 		return err
 	}
 
-	// Global Variables may be gathered less often
-	if len(m.IntervalSlow) > 0 {
-		if uint32(time.Since(m.lastT).Seconds()) >= m.scanIntervalSlow {
-			err = m.gatherGlobalVariables(db, serv, acc)
-			if err != nil {
-				return err
+	if m.GatherGlobalVars {
+		// Global Variables may be gathered less often
+		if len(m.IntervalSlow) > 0 {
+			if uint32(time.Since(m.lastT).Seconds()) >= m.scanIntervalSlow {
+				err = m.gatherGlobalVariables(db, serv, acc)
+				if err != nil {
+					return err
+				}
+				m.lastT = time.Now()
 			}
-			m.lastT = time.Now()
 		}
 	}
 
@@ -1767,6 +1774,7 @@ func init() {
 			PerfEventsStatementsDigestTextLimit: defaultPerfEventsStatementsDigestTextLimit,
 			PerfEventsStatementsLimit:           defaultPerfEventsStatementsLimit,
 			PerfEventsStatementsTimeLimit:       defaultPerfEventsStatementsTimeLimit,
+			GatherGlobalVars:                    defaultGatherGlobalVars,
 		}
 	})
 }

plugins/inputs/net_response/README.md

@@ -43,7 +43,6 @@ verify text in the response.
     - result
   - fields:
     - response_time (float, seconds)
-    - success (int) # success 0, failure 1
     - result_code (int, success = 0, timeout = 1, connection_failed = 2, read_failed = 3, string_mismatch = 4)
     - result_type (string) **DEPRECATED in 1.7; use result tag**
     - string_found (boolean) **DEPRECATED in 1.4; use result tag**

plugins/inputs/snmp_trap/README.md

@@ -17,7 +17,11 @@ the SNMP [README.md](../snmp/README.md) for details.
   ## Transport, local address, and port to listen on.  Transport must
   ## be "udp://".  Omit local address to listen on all interfaces.
   ##   example: "udp://127.0.0.1:1234"
-  # service_address = udp://:162
+  ##
+  ## Special permissions may be required to listen on a port less than
+  ## 1024.  See README.md for details
+  ##
+  # service_address = "udp://:162"
   ## Timeout running snmptranslate command
   # timeout = "5s"
 ```
@@ -41,3 +45,28 @@ the SNMP [README.md](../snmp/README.md) for details.
 snmp_trap,mib=SNMPv2-MIB,name=coldStart,oid=.1.3.6.1.6.3.1.1.5.1,source=192.168.122.102,version=2c snmpTrapEnterprise.0="linux",sysUpTimeInstance=1i 1574109187723429814
 snmp_trap,mib=NET-SNMP-AGENT-MIB,name=nsNotifyShutdown,oid=.1.3.6.1.4.1.8072.4.0.2,source=192.168.122.102,version=2c sysUpTimeInstance=5803i,snmpTrapEnterprise.0="netSnmpNotificationPrefix" 1574109186555115459
 ```
+
+### Using a Privileged Port
+
+On many operating systems, listening on a privileged port (a port
+number less than 1024) requires extra permission.  Since the default
+SNMP trap port 162 is in this category, using telegraf to receive SNMP
+traps may need extra permission.
+
+Instructions for listening on a privileged port vary by operating
+system. It is not recommended to run telegraf as superuser in order to
+use a privileged port. Instead follow the principle of least privilege
+and use a more specific operating system mechanism to allow telegraf to
+use the port.  You may also be able to have telegraf use an
+unprivileged port and then configure a firewall port forward rule from
+the privileged port.
+
+To use a privileged port on Linux, you can use setcap to enable the
+CAP_NET_BIND_SERVICE capability on the telegraf binary:
+
+```
+setcap cap_net_bind_service=+ep /usr/bin/telegraf
+```
+
+On Mac OS, listening on privileged ports is unrestricted on versions
+10.14 and later.