Merge ~sergiodj/ubuntu/+source/telegraf:update-impish-1.18.1 into ~ubuntu-server/ubuntu/+source/telegraf:master

[Sergio Durigan Junior]

This is the update of telegraf to 1.18.1 (the latest upstream version) on Impish.

As a reminder: we maintain telegraf as an Ubuntu package, so this is not a regular git-ubuntu branch/review; rather, it's a git-buildpackage branch (because telegraf is maintained like a regular Debian package). This MP is for the "master" branch.

This update has been relatively straightforward; no problems with the repacking of the orig tarball, build and test. Everything went smooth.

The only noteworthy change here is the extra patch that has been added to fix CVE-2021-3121. The fix is relatively simple: we just need to update the gogo/protobuf module from version 1.3.1 to 1.3.2. However, when we do this (by adjust go.mod and running "go mod vendor"), a bunch of other dependencies also end up being updated, which makes the patch larger. This fix has been applied upstream and will be available in the next release, which means that we will not be carrying this patch for long.

There's a PPA with the proposed package built here:

https://launchpad.net/~sergiodj/+archive/ubuntu/telegraf-merge/+packages

Autopkgtest is still happy:

autopkgtest [19:24:24]: @@@@@@@@@@@@@@@@@@@@ summary
basic-outputs PASS

[Bryce Harrington (bryce)]

I drilled around a bit to try and understand what the fixed vulnerability actually was to suggest a changelog improvement, but found the CVE reports were too opaque, so no suggestion possible. The patch is a bit noisy but otherwise looks ok.

The packaging work all looks good, in particular the changes to repack-telegraf-with-vendor.sh.

I don't have an impish lxc container yet, so am not able to do my usual review checks. However, the ppa build looks good, and I trust your autopkgtest run.

So LGTM, +1.

review: Approve

diff --git a/.circleci/config.yml b/.circleci/config.yml
index 5e44cfe..b4d865e 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -1,21 +1,23 @@
 version: 2.1
+orbs:
+  win: circleci/windows@2.4.0
 
 executors:
-  go-1_14:
+  go-1_15:
     working_directory: '/go/src/github.com/influxdata/telegraf'
     docker:
-      - image: 'quay.io/influxdb/telegraf-ci:1.14.9'
+      - image: 'quay.io/influxdb/telegraf-ci:1.15.8'
     environment:
       GOFLAGS: -p=8
-  go-1_15:
+  go-1_16:
     working_directory: '/go/src/github.com/influxdata/telegraf'
     docker:
-      - image: 'quay.io/influxdb/telegraf-ci:1.15.5'
+      - image: 'quay.io/influxdb/telegraf-ci:1.16.2'
     environment:
       GOFLAGS: -p=8
   mac:
     macos:
-      xcode: 12.1.0
+      xcode: 12.4.0
     working_directory: '~/go/src/github.com/influxdata/telegraf'
     environment:
       HOMEBREW_NO_AUTO_UPDATE: 1
@@ -35,14 +37,6 @@ commands:
       - run: 'GOARCH=<< parameters.goarch >> make check'
       - run: 'GOARCH=<< parameters.goarch >> make check-deps'
       - run: 'GOARCH=<< parameters.goarch >> make test'
-  test-go-mac:
-    steps:
-      - checkout
-      - attach_workspace:
-          at: '/'
-      - run: 'make'
-      - run: 'make check'
-      - run: 'make test'
   package:
     parameters:
       nightly:
@@ -54,7 +48,7 @@ commands:
           at: '/go'
       - when:
           condition: << parameters.nightly >>
-          steps: 
+          steps:
             - run: 'NIGHTLY=1 make package'
             - run: 'make upload-nightly'
       - unless:
@@ -64,9 +58,21 @@ commands:
       - store_artifacts:
           path: './build/dist'
           destination: 'build/dist'
+      - persist_to_workspace:
+          root: './build'
+          paths:
+            - 'dist'
 jobs:
+  linter:
+    executor: go-1_16
+    steps:
+      - checkout
+      - restore_cache:
+          key: go-mod-v1-{{ checksum "go.sum" }}
+      - run: wget -O- -nv https://raw.githubusercontent.com/golangci/golangci-lint/master/install.sh | sh -s -- -b $(go env GOPATH)/bin v1.37.0
+      - run: make lint
   deps:
-    executor: go-1_15
+    executor: go-1_16
     steps:
       - checkout
       - restore_cache:
@@ -82,155 +88,204 @@ jobs:
           root: '/go'
           paths:
             - '*'
-  macdeps:
-    executor: mac
-    steps:
-      - checkout
-      - restore_cache:
-          key: mac-go-mod-v2-{{ checksum "go.sum" }}
-      - run: 'brew install go' # latest
-      - run: 'make deps'
-      - run: 'make tidy'
-      - save_cache:
-          name: 'go module cache'
-          key: mac-go-mod-v2-{{ checksum "go.sum" }}
-          paths:
-            - '~/go/pkg/mod'
-            - '/usr/local/Cellar/go'
-            - '/usr/local/bin/go'
-            - '/usr/local/bin/gofmt'
-      - persist_to_workspace:
-          root: '/'
-          paths:
-            - 'usr/local/bin/go'
-            - 'usr/local/Cellar/go'
-            - 'usr/local/bin/gofmt'
-            - 'Users/distiller/go'
-
-  test-go-1_14:
-    executor: go-1_14
+  test-go-1_15:
+    executor: go-1_15
     steps:
       - test-go
-  test-go-1_14-386:
-    executor: go-1_14
+  test-go-1_15-386:
+    executor: go-1_15
     steps:
       - test-go:
           goarch: "386"
-  test-go-1_15:
-    executor: go-1_15
+  test-go-1_16:
+    executor: go-1_16
     steps:
       - test-go
-  test-go-1_15-386:
-    executor: go-1_15
+  test-go-1_16-386:
+    executor: go-1_16
     steps:
       - test-go:
           goarch: "386"
-  test-go-darwin:
+  test-go-mac:
     executor: mac
     steps:
-      - test-go-mac
+      - checkout
+      - restore_cache:
+          key: mac-go-mod-v0-{{ checksum "go.sum" }}
+      - run: 'sh ./scripts/mac_installgo.sh'
+      - save_cache:
+          name: 'Saving cache'
+          key: mac-go-mod-v0-{{ checksum "go.sum" }}
+          paths:
+            - '/usr/local/Cellar/go'
+            - '/usr/local/bin/go'
+            - '/usr/local/bin/gofmt'
+      - run: 'make deps'
+      - run: 'make tidy'
+      - run: 'make'
+      - run: 'make check'
+      - run: 'make test'
+  test-go-windows:
+    executor:
+        name: win/default
+        shell: powershell.exe
+    steps:
+      - checkout
+      - run: choco upgrade golang --version=1.16.2
+      - run: choco install make
+      - run: git config --system core.longpaths true
+      - run: make test-windows
 
   package:
-    executor: go-1_15
+    executor: go-1_16
     steps:
       - package
   release:
-    executor: go-1_15
+    executor: go-1_16
     steps:
       - package
   nightly:
-    executor: go-1_15
+    executor: go-1_16
     steps:
       - package:
           nightly: true
-
+  package-sign-windows:
+    executor:
+        name: win/default
+        shell: powershell.exe
+    steps:
+      - checkout
+      - attach_workspace:
+          at: '/build'
+      - run:
+          name: "Sign Windows Executables"
+          shell: powershell.exe
+          command: |
+            ./scripts/windows-signing.ps1
+      - persist_to_workspace:
+          root: './build'
+          paths:
+            - 'dist'
+      - store_artifacts:
+          path: './build/dist'
+          destination: 'build/dist'
+  package-sign-mac:
+    macos:
+      xcode: "11.3"
+    working_directory: /Users/distiller/project
+    environment:
+      FL_OUTPUT_DIR: output
+      FASTLANE_LANE: test
+    shell: /bin/bash --login -o pipefail
+    steps:
+      - checkout
+      - attach_workspace:
+          at: '.'
+      - run:
+          command: |
+            sh ./scripts/mac-signing.sh
+      - store_artifacts:
+          path: './dist'
+          destination: 'build/dist'
 workflows:
   version: 2
   check:
     jobs:
-      - 'macdeps':
-          filters:
-            tags:
-              only: /.*/
       - 'deps':
           filters:
             tags:
               only: /.*/
-      - 'test-go-1_14':
+      - 'test-go-1_15':
           requires:
             - 'deps'
           filters:
             tags:
               only: /.*/
-      - 'test-go-1_14-386':
+      - 'test-go-1_15-386':
           requires:
             - 'deps'
           filters:
             tags:
               only: /.*/
-      - 'test-go-1_15':
+      - 'test-go-1_16':
           requires:
             - 'deps'
           filters:
             tags:
               only: /.*/
-      - 'test-go-1_15-386':
+      - 'test-go-1_16-386':
           requires:
             - 'deps'
           filters:
             tags:
               only: /.*/
-      - 'test-go-darwin':
-          requires:
-            - 'macdeps'
+      - 'test-go-mac':
           filters:
             tags: # only runs on tags if you specify this filter
               only: /.*/
+      - 'test-go-windows':
+          filters:
+            tags:
+              only: /.*/
       - 'package':
           requires:
-            - 'test-go-darwin'
-            - 'test-go-1_14'
-            - 'test-go-1_14-386'
+            - 'test-go-windows'
+            - 'test-go-mac'
             - 'test-go-1_15'
             - 'test-go-1_15-386'
+            - 'test-go-1_16'
+            - 'test-go-1_16-386'
       - 'release':
           requires:
-            - 'test-go-darwin'
-            - 'test-go-1_14'
-            - 'test-go-1_14-386'
+            - 'test-go-windows'
+            - 'test-go-mac'
             - 'test-go-1_15'
             - 'test-go-1_15-386'
+            - 'test-go-1_16'
+            - 'test-go-1_16-386'
           filters:
             tags:
               only: /.*/
             branches:
               ignore: /.*/
+      - 'package-sign-windows':
+          requires:
+            - 'release'
+          filters:
+              tags:
+                only: /.*/
+      - 'package-sign-mac':
+           requires:
+             - 'package-sign-windows'
+           filters:
+              tags:
+                only: /.*/
   nightly:
     jobs:
+      - 'linter'
       - 'deps'
-      - 'macdeps'
-      - 'test-go-1_14':
+      - 'test-go-1_15':
           requires:
             - 'deps'
-      - 'test-go-1_14-386':
+      - 'test-go-1_15-386':
           requires:
             - 'deps'
-      - 'test-go-1_15':
+      - 'test-go-1_16':
           requires:
             - 'deps'
-      - 'test-go-1_15-386':
+      - 'test-go-1_16-386':
           requires:
             - 'deps'
-      - 'test-go-darwin':
-          requires:
-            - 'macdeps'
+      - 'test-go-mac'
+      - 'test-go-windows'
       - 'nightly':
           requires:
-            - 'test-go-darwin'
-            - 'test-go-1_14'
-            - 'test-go-1_14-386'
+            - 'test-go-windows'
+            - 'test-go-mac'
             - 'test-go-1_15'
             - 'test-go-1_15-386'
+            - 'test-go-1_16'
+            - 'test-go-1_16-386'
     triggers:
       - schedule:
           cron: "0 7 * * *"
diff --git a/.github/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE.md
index 527555b..4b2eaad 100644
--- a/.github/PULL_REQUEST_TEMPLATE.md
+++ b/.github/PULL_REQUEST_TEMPLATE.md
@@ -1,5 +1,4 @@
 ### Required for all PRs:
 
-- [ ] Signed [CLA](https://influxdata.com/community/cla/).
 - [ ] Associated README.md updated.
 - [ ] Has appropriate unit tests.
diff --git a/.github/dependabot.yml b/.github/dependabot.yml
 new file mode 100644
index 0000000..f1b219b
--- /dev/null
+++ b/.github/dependabot.yml
@@ -0,0 +1,6 @@
+version: 2
+updates:
+  - package-ecosystem: "gomod"
+    directory: "/"
+    schedule:
+      interval: "weekly"
diff --git a/.golangci.yml b/.golangci.yml
 new file mode 100644
index 0000000..0961510
--- /dev/null
+++ b/.golangci.yml
@@ -0,0 +1,68 @@
+linters:
+  enable:
+    - revive
+
+linters-settings:
+  revive:
+    rules:
+      - name: blank-imports
+      - name: context-as-argument
+      - name: context-keys-type
+      - name: dot-imports
+      - name: error-return
+      - name: error-strings
+      - name: error-naming
+      - name: exported
+      - name: if-return
+      - name: increment-decrement
+      - name: var-naming
+      - name: var-declaration
+      - name: package-comments
+      - name: range
+      - name: receiver-naming
+      - name: time-naming
+      - name: unexported-return
+      - name: indent-error-flow
+      - name: errorf
+      - name: empty-block
+      - name: superfluous-else
+      - name: unused-parameter
+      - name: unreachable-code
+      - name: redefines-builtin-id
+
+run:
+  # which dirs to skip: issues from them won't be reported;
+  # can use regexp here: generated.*, regexp is applied on full path;
+  # default value is empty list, but default dirs are skipped independently
+  # from this option's value (see skip-dirs-use-default).
+  # "/" will be replaced by current OS file path separator to properly work
+  # on Windows.
+  skip-dirs:
+    - scripts
+    - docs
+    - etc
+
+  # which files to skip: they will be analyzed, but issues from them
+  # won't be reported. Default value is empty list, but there is
+  # no need to include all autogenerated files, we confidently recognize
+  # autogenerated files. If it's not please let us know.
+  # "/" will be replaced by current OS file path separator to properly work
+  # on Windows.
+  skip-files:
+    - plugins/parsers/influx/machine.go*
+
+issues:
+  # List of regexps of issue texts to exclude, empty list by default.
+  # But independently from this option we use default exclude patterns,
+  # it can be disabled by `exclude-use-default: false`. To list all
+  # excluded by default patterns execute `golangci-lint run --help`
+  exclude:
+    - don't use an underscore in package name
+    - exported.*should have comment.*or be unexported
+    - comment on exported.*should be of the form
+
+  # Maximum issues count per one linter. Set to 0 to disable. Default is 50.
+  max-issues-per-linter: 0
+
+  # Maximum count of issues with the same text. Set to 0 to disable. Default is 3.
+  max-same-issues: 0
diff --git a/.lgtm.yml b/.lgtm.yml
 new file mode 100644
index 0000000..5b0b2e3
--- /dev/null
+++ b/.lgtm.yml
@@ -0,0 +1,2 @@
+queries:
+  - exclude: go/disabled-certificate-check
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 33fb315..43e4e3f 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,119 @@
+## v1.18.1 [2021-04-07]
+
+#### Bugfixes
+
+  - [#9082](https://github.com/influxdata/telegraf/pull/9082) `inputs.mysql` Fix 'binary logs' query for MySQL 8
+  - [#9069](https://github.com/influxdata/telegraf/pull/9069) `inputs.tail` Add configurable option for the 'path' tag override
+  - [#9067](https://github.com/influxdata/telegraf/pull/9067) `inputs.nfsclient` Fix integer overflow in fields from mountstat
+  - [#9050](https://github.com/influxdata/telegraf/pull/9050) `inputs.snmp` Fix init when no mibs are installed
+  - [#9072](https://github.com/influxdata/telegraf/pull/9072) `inputs.ping` Always call SetPrivileged(true) in native mode
+  - [#9043](https://github.com/influxdata/telegraf/pull/9043) `processors.ifname` Get interface name more effeciently
+  - [#9056](https://github.com/influxdata/telegraf/pull/9056) `outputs.yandex_cloud_monitoring` Use correct compute metadata URL to get folder-id
+  - [#9048](https://github.com/influxdata/telegraf/pull/9048) `outputs.azure_monitor` Handle error when initializing the auth object
+  - [#8549](https://github.com/influxdata/telegraf/pull/8549) `inputs.sqlserver` Fix sqlserver_process_cpu calculation
+  - [#9035](https://github.com/influxdata/telegraf/pull/9035) `inputs.ipmi_sensor` Fix panic
+  - [#9009](https://github.com/influxdata/telegraf/pull/9009) `inputs.docker` Fix panic when parsing container stats
+  - [#8333](https://github.com/influxdata/telegraf/pull/8333) `inputs.exec` Don't truncate messages in debug mode
+  - [#8769](https://github.com/influxdata/telegraf/pull/8769) `agent` Close running outputs when reloadinlg
+
+## v1.18.0 [2021-03-17]
+
+#### Release Notes
+
+  - Support Go version 1.16.2
+  - Added support for code signing in Windows
+
+#### Bugfixes
+
+  - [#7312](https://github.com/influxdata/telegraf/pull/7312) `inputs.docker` CPU stats respect perdevice
+  - [#8397](https://github.com/influxdata/telegraf/pull/8397) `outputs.dynatrace` Dynatrace Plugin: Make conversion to counters possible / Changed large bulk handling
+  - [#8655](https://github.com/influxdata/telegraf/pull/8655) `inputs.sqlserver` SqlServer - fix for default server list
+  - [#8703](https://github.com/influxdata/telegraf/pull/8703) `inputs.docker` Use consistent container name in docker input plugin
+  - [#8902](https://github.com/influxdata/telegraf/pull/8902) `inputs.snmp` Fix max_repetitions signedness issues
+  - [#8817](https://github.com/influxdata/telegraf/pull/8817) `outputs.kinesis` outputs.kinesis - log record error count
+  - [#8833](https://github.com/influxdata/telegraf/pull/8833) `inputs.sqlserver` Bug Fix - SQL Server HADR queries for SQL Versions
+  - [#8628](https://github.com/influxdata/telegraf/pull/8628) `inputs.modbus` fix: reading multiple holding registers in modbus input plugin
+  - [#8885](https://github.com/influxdata/telegraf/pull/8885) `inputs.statsd` Fix statsd concurrency bug
+  - [#8393](https://github.com/influxdata/telegraf/pull/8393) `inputs.sqlserver` SQL Perfmon counters - synced queries from v2 to all db types
+  - [#8873](https://github.com/influxdata/telegraf/pull/8873) `processors.ifname` Fix mutex locking around ifname cache
+  - [#8720](https://github.com/influxdata/telegraf/pull/8720) `parsers.influx` fix: remove ambiguity on '\v' from line-protocol parser
+  - [#8678](https://github.com/influxdata/telegraf/pull/8678) `inputs.redis` Fix Redis output field type inconsistencies
+  - [#8953](https://github.com/influxdata/telegraf/pull/8953) `agent` Reset the flush interval timer when flush is requested or batch is ready.
+  - [#8954](https://github.com/influxdata/telegraf/pull/8954) `common.kafka` Fix max open requests to one if idempotent writes is set to true
+  - [#8721](https://github.com/influxdata/telegraf/pull/8721) `inputs.kube_inventory` Set $HOSTIP in default URL
+  - [#8995](https://github.com/influxdata/telegraf/pull/8995) `inputs.sflow` fix segfaults in sflow plugin by checking if protocol headers are set
+  - [#8986](https://github.com/influxdata/telegraf/pull/8986) `outputs.nats` nats_output: use the configured credentials file
+
+#### Features
+
+  - [#8887](https://github.com/influxdata/telegraf/pull/8887) `inputs.procstat` Add PPID field to procstat input plugin
+  - [#8852](https://github.com/influxdata/telegraf/pull/8852) `processors.starlark` Add Starlark script for estimating Line Protocol cardinality
+  - [#8915](https://github.com/influxdata/telegraf/pull/8915) `inputs.cloudwatch` add proxy
+  - [#8910](https://github.com/influxdata/telegraf/pull/8910) `agent` Display error message on badly formatted config string array (eg. namepass)
+  - [#8785](https://github.com/influxdata/telegraf/pull/8785) `inputs.diskio` Non systemd support with unittest
+  - [#8850](https://github.com/influxdata/telegraf/pull/8850) `inputs.snmp` Support more snmpv3 authentication protocols
+  - [#8813](https://github.com/influxdata/telegraf/pull/8813) `inputs.redfish` added member_id as tag(as it is a unique value) for redfish plugin and added address of the server when the status is other than 200 for better debugging
+  - [#8613](https://github.com/influxdata/telegraf/pull/8613) `inputs.phpfpm` Support exclamation mark to create non-matching list in tail plugin
+  - [#8179](https://github.com/influxdata/telegraf/pull/8179) `inputs.statsd` Add support for datadog distributions metric
+  - [#8803](https://github.com/influxdata/telegraf/pull/8803) `agent` Add default retry for load config via url
+  - [#8816](https://github.com/influxdata/telegraf/pull/8816) Code Signing for Windows
+  - [#8772](https://github.com/influxdata/telegraf/pull/8772) `processors.starlark` Allow to provide constants to a starlark script
+  - [#8749](https://github.com/influxdata/telegraf/pull/8749) `outputs.newrelic` Add HTTP proxy setting to New Relic output plugin
+  - [#8543](https://github.com/influxdata/telegraf/pull/8543) `inputs.elasticsearch` Add configurable number of 'most recent' date-stamped indices to gather in Elasticsearch input
+  - [#8675](https://github.com/influxdata/telegraf/pull/8675) `processors.starlark` Add Starlark parsing example of nested JSON
+  - [#8762](https://github.com/influxdata/telegraf/pull/8762) `inputs.prometheus` Optimize for bigger kubernetes clusters (500+ pods)
+  - [#8950](https://github.com/influxdata/telegraf/pull/8950) `inputs.teamspeak` Teamspeak input plugin query clients
+  - [#8849](https://github.com/influxdata/telegraf/pull/8849) `inputs.sqlserver` Filter data out from system databases for Azure SQL DB only
+
+#### New Inputs
+  - [Beat Input Plugin](https://github.com/influxdata/telegraf/tree/master/plugins/inputs/beat) - Contributed by @nferch
+  - [CS:GO Input Plugin](https://github.com/influxdata/telegraf/tree/master/plugins/inputs/csgo) - Contributed by @oofdog
+  - [Directory Monitoring Input Plugin](https://github.com/influxdata/telegraf/tree/master/plugins/inputs/directory_monitor) - Contributed by @InfluxData
+  - [RavenDB Input Plugin](https://github.com/influxdata/telegraf/tree/master/plugins/inputs/ravendb) - Contributed by @ml054 and @bartoncasey
+  - [NFS Input Plugin](https://github.com/influxdata/telegraf/tree/master/plugins/inputs/nfsclient) - Contributed by @pmoranga
+
+#### New Outputs
+  - [Grafana Loki Output Plugin](https://github.com/influxdata/telegraf/tree/master/plugins/outputs/loki) - Contributed by @Eraac
+  - [Google BigQuery Output Plugin](https://github.com/influxdata/telegraf/tree/master/plugins/outputs/loki) - Contributed by @gkatzioura
+  - [Sensu Output Plugin](https://github.com/influxdata/telegraf/blob/master/plugins/outputs/sensu) - Contributed by @calebhailey
+  - [SignalFX Output Plugin](https://github.com/influxdata/telegraf/tree/master/plugins/outputs/signalfx) - Contributed by @keitwb
+
+#### New Aggregators
+  - [Derivative Aggregator Plugin ](https://github.com/influxdata/telegraf/tree/master/plugins/aggregators/derivative)- Contributed by @KarstenSchnitter
+  - [Quantile Aggregator Plugin ](https://github.com/influxdata/telegraf/tree/master/plugins/aggregators/quantile) - Contributed by @srebhan
+
+#### New Processors
+  - [AWS EC2 Metadata Processor Plugin ](https://github.com/influxdata/telegraf/tree/master/plugins/processors/aws/ec2) - Contributed by @pmalek-sumo
+
+#### New Parsers
+ - [XML Parser Plugin ](https://github.com/influxdata/telegraf/tree/master/plugins/parsers/xml) - Contributed by @srebhan
+ 
+#### New Serializers
+  - [MessagePack Serializer Plugin](https://github.com/influxdata/telegraf/tree/master/plugins/serializers/msgpack) - Contributed by @dialogbox
+
+#### New External Plugins
+  - [GeoIP Processor Plugin ](https://github.com/a-bali/telegraf-geoip) - Contributed by @a-bali
+  - [Plex Webhook Input Plugin](https://github.com/russorat/telegraf-webhooks-plex) - Contributed by @russorat
+  - [SMCIPMITool Input Plugin](https://github.com/jhpope/smc_ipmi) - Contributed by @jhpope
+ 
+## v1.17.3 [2021-02-17]
+
+#### Bugfixes
+
+  - [#7316](https://github.com/influxdata/telegraf/pull/7316) `inputs.filestat` plugins/filestat: Skip missing files
+  - [#8868](https://github.com/influxdata/telegraf/pull/8868) Update to Go 1.15.8
+  - [#8744](https://github.com/influxdata/telegraf/pull/8744) Bump github.com/gopcua/opcua from 0.1.12 to 0.1.13
+  - [#8657](https://github.com/influxdata/telegraf/pull/8657) `outputs.warp10` outputs/warp10: url encode comma in tags value
+  - [#8824](https://github.com/influxdata/telegraf/pull/8824) `inputs.x509_cert` inputs.x509_cert: Fix timeout issue
+  - [#8821](https://github.com/influxdata/telegraf/pull/8821) `inputs.mqtt_consumer` Fix reconnection issues mqtt
+  - [#8775](https://github.com/influxdata/telegraf/pull/8775) `outputs.influxdb` Validate the response from InfluxDB after writing/creating a database to avoid json parsing panics/errors
+  - [#8804](https://github.com/influxdata/telegraf/pull/8804) `inputs.snmp` Expose v4/v6-only connection-schemes through GosnmpWrapper
+  - [#8838](https://github.com/influxdata/telegraf/pull/8838) `agent` fix issue with reading flush_jitter output from config
+  - [#8839](https://github.com/influxdata/telegraf/pull/8839) `inputs.ping` fixes Sort and timeout around deadline
+  - [#8787](https://github.com/influxdata/telegraf/pull/8787) `inputs.ping` Update README for inputs.ping with correct cmd for native ping on Linux
+  - [#8771](https://github.com/influxdata/telegraf/pull/8771) Update go-ping to latest version
+
+
 ## v1.17.2 [2021-01-28]
 
 #### Bugfixes
@@ -16,7 +132,6 @@
   - [#8616](https://github.com/influxdata/telegraf/pull/8616) Add Event Log support for Windows
   - [#8602](https://github.com/influxdata/telegraf/pull/8602) `inputs.postgresql_extensible` Add timestamp column support to postgresql_extensible
   - [#8627](https://github.com/influxdata/telegraf/pull/8627) `parsers.csv` Added ability to define skip values in csv parser
-  - [#8646](https://github.com/influxdata/telegraf/pull/8646) link to Open Hardware Monitor
   - [#8055](https://github.com/influxdata/telegraf/pull/8055) `outputs.http` outputs/http: add option to control idle connection timeout
   - [#7897](https://github.com/influxdata/telegraf/pull/7897) `common.tls` common/tls: Allow specifying SNI hostnames
   - [#8541](https://github.com/influxdata/telegraf/pull/8541) `inputs.snmp` Extended the internal snmp wrapper to support AES192, AES192C, AES256, and AES256C
@@ -44,6 +159,10 @@
   - [#8588](https://github.com/influxdata/telegraf/pull/8588) `inputs.snmp` Input SNMP plugin - upgrade gosnmp library to version 1.29.0
   - [#8502](https://github.com/influxdata/telegraf/pull/8502) `inputs.http_listener_v2` Fix Stop() bug when plugin fails to start
 
+#### New External Plugins
+
+  - [#8646](https://github.com/influxdata/telegraf/pull/8646) [Open Hardware Monitoring](https://github.com/marianob85/open_hardware_monitor-telegraf-plugin) Input Plugin
+
 
 ## v1.17.0 [2020-12-18]
 
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index 0b2ad0e..a5ff6b2 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -61,7 +61,13 @@ running.  You can start the containers with:
 docker-compose up
 ```
 
-And run the full test suite with:
+To run only the integration tests use:
+
+```
+make test-integration
+```
+
+To run the full test suite use:
 ```
 make test-all
 ```
diff --git a/EXTERNAL_PLUGINS.md b/EXTERNAL_PLUGINS.md
index 0a165a4..ffefd06 100644
--- a/EXTERNAL_PLUGINS.md
+++ b/EXTERNAL_PLUGINS.md
@@ -9,7 +9,9 @@ Pull requests welcome.
 - [awsalarms](https://github.com/vipinvkmenon/awsalarms) - Simple plugin to gather/monitor alarms generated  in AWS.
 - [octoprint](https://github.com/BattleBas/octoprint-telegraf-plugin) - Gather 3d print information from the octoprint API.
 - [open-hardware-monitor](https://github.com/marianob85/open_hardware_monitor-telegraf-plugin) - Gather sensors data provided by [Open Hardware Monitor](http://openhardwaremonitor.org)
+- [plex](https://github.com/russorat/telegraf-webhooks-plex) - Listens for events from Plex Media Server [Webhooks](https://support.plex.tv/articles/115002267687-webhooks/).
 - [rand](https://github.com/ssoroka/rand) - Generate random numbers
+- [SMCIPMITool](https://github.com/jhpope/smc_ipmi) - Python script to parse the output of [SMCIPMITool](https://www.supermicro.com/en/solutions/management-software/ipmi-utilities) into [InfluxDB line protocol](https://docs.influxdata.com/influxdb/latest/reference/syntax/line-protocol/). 
 - [systemd-timings](https://github.com/pdmorrow/telegraf-execd-systemd-timings) - Gather systemd boot and unit timestamp metrics.
 - [twitter](https://github.com/inabagumi/twitter-telegraf-plugin) - Gather account information from Twitter accounts
 - [youtube](https://github.com/inabagumi/youtube-telegraf-plugin) - Gather account information from YouTube channels
diff --git a/Makefile b/Makefile
index 6ac4f07..3adf4d9 100644
--- a/Makefile
+++ b/Makefile
@@ -75,6 +75,7 @@ help:
 	@echo '  test       - run short unit tests'
 	@echo '  fmt        - format source files'
 	@echo '  tidy       - tidy go modules'
+	@echo '  lint       - run linter'
 	@echo '  check-deps - check docs/LICENSE_OF_DEPENDENCIES.md'
 	@echo '  clean      - delete build artifacts'
 	@echo ''
@@ -83,11 +84,11 @@ help:
 
 .PHONY: deps
 deps:
-	go mod download
+	go mod download -x
 
 .PHONY: telegraf
 telegraf:
-	go build -mod=mod -ldflags "$(LDFLAGS)" ./cmd/telegraf
+	go build -ldflags "$(LDFLAGS)" ./cmd/telegraf
 
 # Used by dockerfile builds
 .PHONY: go-install
@@ -98,6 +99,10 @@ go-install:
 test:
 	go test -short $(race_detector) ./...
 
+.PHONY: test-integration
+test-integration:
+	go test -run Integration $(race_detector) ./...
+
 .PHONY: fmt
 fmt:
 	@gofmt -s -w $(filter-out plugins/parsers/influx/machine.go, $(GOFILES))
@@ -126,6 +131,15 @@ vet:
 		exit 1; \
 	fi
 
+.PHONY: lint
+lint:
+ifeq (, $(shell which golangci-lint))
+	$(info golangci-lint can't be found, please install it: https://golangci-lint.run/usage/install/)
+	exit 1
+endif
+
+	golangci-lint run --timeout 5m0s --issues-exit-code 0
+
 .PHONY: tidy
 tidy:
 	go mod verify
@@ -137,7 +151,6 @@ tidy:
 
 .PHONY: check
 check: fmtcheck vet
-	@$(MAKE) --no-print-directory tidy
 
 .PHONY: test-all
 test-all: fmtcheck vet
@@ -167,13 +180,13 @@ plugin-%:
 
 .PHONY: ci-1.15
 ci-1.15:
-	docker build -t quay.io/influxdb/telegraf-ci:1.15.5 - < scripts/ci-1.15.docker
-	docker push quay.io/influxdb/telegraf-ci:1.15.5
+	docker build -t quay.io/influxdb/telegraf-ci:1.15.8 - < scripts/ci-1.15.docker
+	docker push quay.io/influxdb/telegraf-ci:1.15.8
 
-.PHONY: ci-1.14
-ci-1.14:
-	docker build -t quay.io/influxdb/telegraf-ci:1.14.9 - < scripts/ci-1.14.docker
-	docker push quay.io/influxdb/telegraf-ci:1.14.9
+.PHONY: ci-1.16
+ci-1.16:
+	docker build -t quay.io/influxdb/telegraf-ci:1.16.2 - < scripts/ci-1.16.docker
+	docker push quay.io/influxdb/telegraf-ci:1.16.2
 
 .PHONY: install
 install: $(buildbin)
diff --git a/README.md b/README.md
index 1999f63..5535b95 100644
--- a/README.md
+++ b/README.md
@@ -1,4 +1,4 @@
-# Telegraf [![Circle CI](https://circleci.com/gh/influxdata/telegraf.svg?style=svg)](https://circleci.com/gh/influxdata/telegraf) [![Docker pulls](https://img.shields.io/docker/pulls/library/telegraf.svg)](https://hub.docker.com/_/telegraf/)
+# Telegraf [![Circle CI](https://circleci.com/gh/influxdata/telegraf.svg?style=svg)](https://circleci.com/gh/influxdata/telegraf) [![Docker pulls](https://img.shields.io/docker/pulls/library/telegraf.svg)](https://hub.docker.com/_/telegraf/) [![Total alerts](https://img.shields.io/lgtm/alerts/g/influxdata/telegraf.svg?logo=lgtm&logoWidth=18)](https://lgtm.com/projects/g/influxdata/telegraf/alerts/)
 [![Slack Status](https://img.shields.io/badge/slack-join_chat-white.svg?logo=slack&style=social)](https://www.influxdata.com/slack)
 
 Telegraf is an agent for collecting, processing, aggregating, and writing metrics.
@@ -52,9 +52,9 @@ Ansible role: https://github.com/rossmcdonald/telegraf
 
 ### From Source:
 
-Telegraf requires Go version 1.13 or newer, the Makefile requires GNU make.
+Telegraf requires Go version 1.14 or newer, the Makefile requires GNU make.
 
-1. [Install Go](https://golang.org/doc/install) >=1.13 (1.15 recommended)
+1. [Install Go](https://golang.org/doc/install) >=1.14 (1.15 recommended)
 2. Clone the Telegraf repository:
    ```
    cd ~/src
@@ -259,6 +259,7 @@ For documentation on the latest development code see the [documentation index][d
 * [net](./plugins/inputs/net)
 * [net_response](./plugins/inputs/net_response)
 * [netstat](./plugins/inputs/net)
+* [nfsclient](./plugins/inputs/nfsclient)
 * [nginx](./plugins/inputs/nginx)
 * [nginx_plus_api](./plugins/inputs/nginx_plus_api)
 * [nginx_plus](./plugins/inputs/nginx_plus)
@@ -294,6 +295,7 @@ For documentation on the latest development code see the [documentation index][d
 * [rabbitmq](./plugins/inputs/rabbitmq)
 * [raindrops](./plugins/inputs/raindrops)
 * [ras](./plugins/inputs/ras)
+* [ravendb](./plugins/inputs/ravendb)
 * [redfish](./plugins/inputs/redfish)
 * [redis](./plugins/inputs/redis)
 * [rethinkdb](./plugins/inputs/rethinkdb)
@@ -364,11 +366,12 @@ For documentation on the latest development code see the [documentation index][d
 ## Serializers
 
 - [InfluxDB Line Protocol](/plugins/serializers/influx)
-- [JSON](/plugins/serializers/json)
+- [Carbon2](/plugins/serializers/carbon2)
 - [Graphite](/plugins/serializers/graphite)
+- [JSON](/plugins/serializers/json)
+- [MessagePack](/plugins/serializers/msgpack)
 - [ServiceNow](/plugins/serializers/nowmetric)
 - [SplunkMetric](/plugins/serializers/splunkmetric)
-- [Carbon2](/plugins/serializers/carbon2)
 - [Wavefront](/plugins/serializers/wavefront)
 
 ## Processor Plugins
@@ -417,6 +420,7 @@ For documentation on the latest development code see the [documentation index][d
 * [aws kinesis](./plugins/outputs/kinesis)
 * [aws cloudwatch](./plugins/outputs/cloudwatch)
 * [azure_monitor](./plugins/outputs/azure_monitor)
+* [bigquery](./plugins/outputs/bigquery)
 * [cloud_pubsub](./plugins/outputs/cloud_pubsub) Google Cloud Pub/Sub
 * [cratedb](./plugins/outputs/cratedb)
 * [datadog](./plugins/outputs/datadog)
@@ -442,6 +446,8 @@ For documentation on the latest development code see the [documentation index][d
 * [prometheus](./plugins/outputs/prometheus_client)
 * [riemann](./plugins/outputs/riemann)
 * [riemann_legacy](./plugins/outputs/riemann_legacy)
+* [sensu](./plugins/outputs/sensu)
+* [signalfx](./plugins/outputs/signalfx)
 * [socket_writer](./plugins/outputs/socket_writer)
 * [stackdriver](./plugins/outputs/stackdriver) (Google Cloud Monitoring)
 * [syslog](./plugins/outputs/syslog)
diff --git a/agent/agent.go b/agent/agent.go
index e7ffee3..8bb1c8a 100644
--- a/agent/agent.go
+++ b/agent/agent.go
@@ -447,6 +447,13 @@ func stopServiceInputs(inputs []*models.RunningInput) {
 	}
 }
 
+// stopRunningOutputs stops all running outputs.
+func stopRunningOutputs(outputs []*models.RunningOutput) {
+	for _, output := range outputs {
+		output.Close()
+	}
+}
+
 // gather runs an input's gather function periodically until the context is
 // done.
 func (a *Agent) gatherLoop(
@@ -785,6 +792,9 @@ func (a *Agent) runOutputs(
 	cancel()
 	wg.Wait()
 
+	log.Println("I! [agent] Stopping running outputs")
+	stopRunningOutputs(unit.outputs)
+
 	return nil
 }
 
@@ -793,7 +803,7 @@ func (a *Agent) runOutputs(
 func (a *Agent) flushLoop(
 	ctx context.Context,
 	output *models.RunningOutput,
-	ticker Ticker,
+	ticker *RollingTicker,
 ) {
 	logError := func(err error) {
 		if err != nil {
@@ -822,15 +832,11 @@ func (a *Agent) flushLoop(
 		case <-ticker.Elapsed():
 			logError(a.flushOnce(output, ticker, output.Write))
 		case <-flushRequested:
+			ticker.Reset()
 			logError(a.flushOnce(output, ticker, output.Write))
 		case <-output.BatchReady:
-			// Favor the ticker over batch ready
-			select {
-			case <-ticker.Elapsed():
-				logError(a.flushOnce(output, ticker, output.Write))
-			default:
-				logError(a.flushOnce(output, ticker, output.WriteBatch))
-			}
+			ticker.Reset()
+			logError(a.flushOnce(output, ticker, output.WriteBatch))
 		}
 	}
 }
diff --git a/agent/tick.go b/agent/tick.go
index 91b9971..6afef2f 100644
--- a/agent/tick.go
+++ b/agent/tick.go
@@ -216,6 +216,7 @@ type RollingTicker struct {
 	ch       chan time.Time
 	cancel   context.CancelFunc
 	wg       sync.WaitGroup
+	timer    *clock.Timer
 }
 
 func NewRollingTicker(interval, jitter time.Duration) *RollingTicker {
@@ -232,12 +233,12 @@ func newRollingTicker(interval, jitter time.Duration, clock clock.Clock) *Rollin
 	}
 
 	d := t.next()
-	timer := clock.Timer(d)
+	t.timer = clock.Timer(d)
 
 	t.wg.Add(1)
 	go func() {
 		defer t.wg.Done()
-		t.run(ctx, timer)
+		t.run(ctx)
 	}()
 
 	return t
@@ -247,24 +248,28 @@ func (t *RollingTicker) next() time.Duration {
 	return t.interval + internal.RandomDuration(t.jitter)
 }
 
-func (t *RollingTicker) run(ctx context.Context, timer *clock.Timer) {
+func (t *RollingTicker) run(ctx context.Context) {
 	for {
 		select {
 		case <-ctx.Done():
-			timer.Stop()
+			t.timer.Stop()
 			return
-		case now := <-timer.C:
+		case now := <-t.timer.C:
 			select {
 			case t.ch <- now:
 			default:
 			}
 
-			d := t.next()
-			timer.Reset(d)
+			t.Reset()
 		}
 	}
 }
 
+// Reset the ticker to the next interval + jitter.
+func (t *RollingTicker) Reset() {
+	t.timer.Reset(t.next())
+}
+
 func (t *RollingTicker) Elapsed() <-chan time.Time {
 	return t.ch
 }
diff --git a/agent/tick_test.go b/agent/tick_test.go
index 5b8db7e..69bf0c2 100644
--- a/agent/tick_test.go
+++ b/agent/tick_test.go
@@ -10,8 +10,6 @@ import (
 	"github.com/stretchr/testify/require"
 )
 
-var format = "2006-01-02T15:04:05.999Z07:00"
-
 func TestAlignedTicker(t *testing.T) {
 	interval := 10 * time.Second
 	jitter := 0 * time.Second
@@ -249,7 +247,7 @@ func simulatedDist(ticker Ticker, clock *clock.Mock) Distribution {
 	for !clock.Now().After(until) {
 		select {
 		case tm := <-ticker.Elapsed():
-			dist.Buckets[tm.Second()] += 1
+			dist.Buckets[tm.Second()]++
 			dist.Count++
 			dist.Waittime += tm.Sub(last).Seconds()
 			last = tm
diff --git a/appveyor.yml b/appveyor.yml
 deleted file mode 100644
index 6f5f6e9..0000000
--- a/appveyor.yml
+++ /dev/null
@@ -1,35 +0,0 @@
-version: "{build}"
-
-image: Visual Studio 2019
-
-cache:
- - C:\gopath\pkg\mod -> go.sum
- - C:\ProgramData\chocolatey\bin -> appveyor.yml
- - C:\ProgramData\chocolatey\lib -> appveyor.yml
-
-clone_folder: C:\gopath\src\github.com\influxdata\telegraf
-
-environment:
-  GOPATH: C:\gopath
-
-stack: go 1.15
-
-platform: x64
-
-install:
-  - choco install make
-  - cd "%GOPATH%\src\github.com\influxdata\telegraf"
-  - git config --system core.longpaths true
-  - go version
-  - go env
-
-build_script:
-  - make deps
-  - make telegraf
-
-test_script:
-  - make check
-  - make test-windows
-
-artifacts:
-  - path: telegraf.exe
diff --git a/assets/icon.icns b/assets/icon.icns
 new file mode 100644
index 0000000..339a8da
 Binary files /dev/null and b/assets/icon.icns differ
diff --git a/build_version.txt b/build_version.txt
index 06fb41b..ec6d649 100644
--- a/build_version.txt
+++ b/build_version.txt
@@ -1 +1 @@
-1.17.2
+1.18.1
diff --git a/cmd/telegraf/telegraf.go b/cmd/telegraf/telegraf.go
index 7e0b4ec..c6b2cc0 100644
--- a/cmd/telegraf/telegraf.go
+++ b/cmd/telegraf/telegraf.go
@@ -15,6 +15,7 @@ import (
 	"syscall"
 	"time"
 
+	"github.com/influxdata/telegraf"
 	"github.com/influxdata/telegraf/agent"
 	"github.com/influxdata/telegraf/config"
 	"github.com/influxdata/telegraf/internal"
@@ -158,8 +159,9 @@ func runAgent(ctx context.Context,
 	}
 
 	// Setup logging as configured.
+	telegraf.Debug = ag.Config.Agent.Debug || *fDebug
 	logConfig := logger.LogConfig{
-		Debug:               ag.Config.Agent.Debug || *fDebug,
+		Debug:               telegraf.Debug,
 		Quiet:               ag.Config.Agent.Quiet || *fQuiet,
 		LogTarget:           ag.Config.Agent.LogTarget,
 		Logfile:             ag.Config.Agent.Logfile,
diff --git a/config/aws/credentials.go b/config/aws/credentials.go
index f9c98ed..d697d96 100644
--- a/config/aws/credentials.go
+++ b/config/aws/credentials.go
@@ -22,9 +22,9 @@ type CredentialConfig struct {
 func (c *CredentialConfig) Credentials() client.ConfigProvider {
 	if c.RoleARN != "" {
 		return c.assumeCredentials()
-	} else {
-		return c.rootCredentials()
 	}
+
+	return c.rootCredentials()
 }
 
 func (c *CredentialConfig) rootCredentials() client.ConfigProvider {
diff --git a/config/config.go b/config/config.go
index b395f7d..5848342 100644
--- a/config/config.go
+++ b/config/config.go
@@ -49,6 +49,7 @@ var (
 		`"`, `\"`,
 		`\`, `\\`,
 	)
+	httpLoadConfigRetryInterval = 10 * time.Second
 )
 
 // Config specifies the URL/user/password for the database that telegraf
@@ -921,17 +922,27 @@ func fetchConfig(u *url.URL) ([]byte, error) {
 	}
 	req.Header.Add("Accept", "application/toml")
 	req.Header.Set("User-Agent", internal.ProductToken())
-	resp, err := http.DefaultClient.Do(req)
-	if err != nil {
-		return nil, err
-	}
 
-	if resp.StatusCode != http.StatusOK {
-		return nil, fmt.Errorf("failed to retrieve remote config: %s", resp.Status)
+	retries := 3
+	for i := 0; i <= retries; i++ {
+		resp, err := http.DefaultClient.Do(req)
+		if err != nil {
+			return nil, fmt.Errorf("Retry %d of %d failed connecting to HTTP config server %s", i, retries, err)
+		}
+
+		if resp.StatusCode != http.StatusOK {
+			if i < retries {
+				log.Printf("Error getting HTTP config.  Retry %d of %d in %s.  Status=%d", i, retries, httpLoadConfigRetryInterval, resp.StatusCode)
+				time.Sleep(httpLoadConfigRetryInterval)
+				continue
+			}
+			return nil, fmt.Errorf("Retry %d of %d failed to retrieve remote config: %s", i, retries, resp.Status)
+		}
+		defer resp.Body.Close()
+		return ioutil.ReadAll(resp.Body)
 	}
 
-	defer resp.Body.Close()
-	return ioutil.ReadAll(resp.Body)
+	return nil, nil
 }
 
 // parseConfig loads a TOML configuration from a provided path and
@@ -1257,7 +1268,14 @@ func (c *Config) buildParser(name string, tbl *ast.Table) (parsers.Parser, error
 	if err != nil {
 		return nil, err
 	}
-	return parsers.NewParser(config)
+	parser, err := parsers.NewParser(config)
+	if err != nil {
+		return nil, err
+	}
+	logger := models.NewLogger("parsers", config.DataFormat, name)
+	models.SetLoggerOnPlugin(parser, logger)
+
+	return parser, nil
 }
 
 func (c *Config) getParserConfig(name string, tbl *ast.Table) (*parsers.Config, error) {
@@ -1324,6 +1342,28 @@ func (c *Config) getParserConfig(name string, tbl *ast.Table) (*parsers.Config, 
 
 	c.getFieldStringSlice(tbl, "form_urlencoded_tag_keys", &pc.FormUrlencodedTagKeys)
 
+	//for XML parser
+	if node, ok := tbl.Fields["xml"]; ok {
+		if subtbls, ok := node.([]*ast.Table); ok {
+			pc.XMLConfig = make([]parsers.XMLConfig, len(subtbls))
+			for i, subtbl := range subtbls {
+				subcfg := pc.XMLConfig[i]
+				c.getFieldString(subtbl, "metric_name", &subcfg.MetricQuery)
+				c.getFieldString(subtbl, "metric_selection", &subcfg.Selection)
+				c.getFieldString(subtbl, "timestamp", &subcfg.Timestamp)
+				c.getFieldString(subtbl, "timestamp_format", &subcfg.TimestampFmt)
+				c.getFieldStringMap(subtbl, "tags", &subcfg.Tags)
+				c.getFieldStringMap(subtbl, "fields", &subcfg.Fields)
+				c.getFieldStringMap(subtbl, "fields_int", &subcfg.FieldsInt)
+				c.getFieldString(subtbl, "field_selection", &subcfg.FieldSelection)
+				c.getFieldBool(subtbl, "field_name_expansion", &subcfg.FieldNameExpand)
+				c.getFieldString(subtbl, "field_name", &subcfg.FieldNameQuery)
+				c.getFieldString(subtbl, "field_value", &subcfg.FieldValueQuery)
+				pc.XMLConfig[i] = subcfg
+			}
+		}
+	}
+
 	pc.MetricName = name
 
 	if c.hasErrs() {
@@ -1392,7 +1432,7 @@ func (c *Config) buildOutput(name string, tbl *ast.Table) (*models.OutputConfig,
 	// TODO: support FieldPass/FieldDrop on outputs
 
 	c.getFieldDuration(tbl, "flush_interval", &oc.FlushInterval)
-	c.getFieldDuration(tbl, "flush_jitter", oc.FlushJitter)
+	c.getFieldDuration(tbl, "flush_jitter", &oc.FlushJitter)
 
 	c.getFieldInt(tbl, "metric_buffer_limit", &oc.MetricBufferLimit)
 	c.getFieldInt(tbl, "metric_batch_size", &oc.MetricBatchSize)
@@ -1428,7 +1468,7 @@ func (c *Config) missingTomlField(typ reflect.Type, key string) error {
 		"prefix", "prometheus_export_timestamp", "prometheus_sort_metrics", "prometheus_string_as_label",
 		"separator", "splunkmetric_hec_routing", "splunkmetric_multimetric", "tag_keys",
 		"tagdrop", "tagexclude", "taginclude", "tagpass", "tags", "template", "templates",
-		"wavefront_source_override", "wavefront_use_strict":
+		"wavefront_source_override", "wavefront_use_strict", "xml":
 
 		// ignore fields that are common to all plugins.
 	default:
@@ -1527,10 +1567,14 @@ func (c *Config) getFieldStringSlice(tbl *ast.Table, fieldName string, target *[
 						*target = append(*target, str.Value)
 					}
 				}
+			} else {
+				c.addError(tbl, fmt.Errorf("found unexpected format while parsing %q, expecting string array/slice format", fieldName))
+				return
 			}
 		}
 	}
 }
+
 func (c *Config) getFieldTagFilter(tbl *ast.Table, fieldName string, target *[]models.TagFilter) {
 	if node, ok := tbl.Fields[fieldName]; ok {
 		if subtbl, ok := node.(*ast.Table); ok {
@@ -1543,6 +1587,9 @@ func (c *Config) getFieldTagFilter(tbl *ast.Table, fieldName string, target *[]m
 								tagfilter.Filter = append(tagfilter.Filter, str.Value)
 							}
 						}
+					} else {
+						c.addError(tbl, fmt.Errorf("found unexpected format while parsing %q, expecting string array/slice format on each entry", fieldName))
+						return
 					}
 					*target = append(*target, tagfilter)
 				}
diff --git a/config/config_test.go b/config/config_test.go
index 79d74e8..e238dba 100644
--- a/config/config_test.go
+++ b/config/config_test.go
@@ -1,6 +1,8 @@
 package config
 
 import (
+	"net/http"
+	"net/http/httptest"
 	"os"
 	"strings"
 	"testing"
@@ -278,3 +280,37 @@ func TestConfig_AzureMonitorNamespacePrefix(t *testing.T) {
 	assert.Equal(t, "", azureMonitor.NamespacePrefix)
 	assert.Equal(t, true, ok)
 }
+
+func TestConfig_URLRetries3Fails(t *testing.T) {
+	httpLoadConfigRetryInterval = 0 * time.Second
+	responseCounter := 0
+	ts := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
+		w.WriteHeader(http.StatusNotFound)
+		responseCounter++
+	}))
+	defer ts.Close()
+
+	c := NewConfig()
+	err := c.LoadConfig(ts.URL)
+	require.Error(t, err)
+	require.Equal(t, 4, responseCounter)
+}
+
+func TestConfig_URLRetries3FailsThenPasses(t *testing.T) {
+	httpLoadConfigRetryInterval = 0 * time.Second
+	responseCounter := 0
+	ts := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
+		if responseCounter <= 2 {
+			w.WriteHeader(http.StatusNotFound)
+		} else {
+			w.WriteHeader(http.StatusOK)
+		}
+		responseCounter++
+	}))
+	defer ts.Close()
+
+	c := NewConfig()
+	err := c.LoadConfig(ts.URL)
+	require.NoError(t, err)
+	require.Equal(t, 4, responseCounter)
+}
diff --git a/debian/changelog b/debian/changelog
index d63498e..3c5a39c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,12 @@
+telegraf (1.18.1+ds1-0ubuntu1) impish; urgency=medium
+
+  * d/p/repack-telegraf-with-vendor.sh: Improve cleanup procedure.
+  * New upstream version 1.18.1+ds1.
+  * d/p/CVE-2021-3121.patch:
+    Fix for CVE-2021-3121.  Update gogo/protobuf to 1.3.2. (LP: #1925968)
+
+ -- Sergio Durigan Junior <[e-mail]>  Tue, 27 Apr 2021 14:27:18 -0400
+
 telegraf (1.17.2+ds1-0ubuntu3) hirsute; urgency=medium
 
   * d/rules: Disable test for inputs/riemann_listener.
diff --git a/debian/patches/CVE-2021-3121.patch b/debian/patches/CVE-2021-3121.patch
 new file mode 100644
index 0000000..c98b779
--- /dev/null
+++ b/debian/patches/CVE-2021-3121.patch
@@ -0,0 +1,2726 @@
+From: Sergio Durigan Junior <[e-mail]>
+Date: Tue, 27 Apr 2021 14:25:34 -0400
+Subject: CVE-2021-3121
+
+Update gogo/protobuf to version 1.3.2 in order to fix CVE-2021-3121.
+
+Bug: https://github.com/influxdata/telegraf/issues/9181
+Bug-Ubuntu: https://bugs.launchpad.net/telegraf/+bug/1925968
+Last-Updated: 2021-04-27
+---
+ go.mod                                             |    2 +-
+ go.sum                                             |    8 +
+ .../github.com/gogo/protobuf/proto/text_parser.go  |    2 +-
+ vendor/github.com/gogo/protobuf/types/any.pb.go    |    5 +-
+ vendor/github.com/gogo/protobuf/types/api.pb.go    |   15 +-
+ .../github.com/gogo/protobuf/types/duration.pb.go  |    5 +-
+ vendor/github.com/gogo/protobuf/types/empty.pb.go  |    5 +-
+ .../gogo/protobuf/types/field_mask.pb.go           |    5 +-
+ .../gogo/protobuf/types/source_context.pb.go       |    5 +-
+ vendor/github.com/gogo/protobuf/types/struct.pb.go |   17 +-
+ .../github.com/gogo/protobuf/types/timestamp.pb.go |    5 +-
+ vendor/github.com/gogo/protobuf/types/type.pb.go   |   25 +-
+ .../github.com/gogo/protobuf/types/wrappers.pb.go  |   45 +-
+ vendor/golang.org/x/tools/cmd/goimports/doc.go     |    4 +
+ vendor/golang.org/x/tools/go/analysis/analysis.go  |    4 +
+ .../golang.org/x/tools/go/analysis/diagnostic.go   |    4 +
+ vendor/golang.org/x/tools/go/analysis/doc.go       |    4 +
+ vendor/golang.org/x/tools/go/analysis/validate.go  |    4 +
+ vendor/golang.org/x/tools/go/ast/astutil/util.go   |    4 +
+ .../golang.org/x/tools/go/ast/inspector/typeof.go  |    4 +
+ .../golang.org/x/tools/go/buildutil/fakecontext.go |    4 +
+ vendor/golang.org/x/tools/go/buildutil/tags.go     |    4 +
+ .../x/tools/go/internal/packagesdriver/sizes.go    |   64 -
+ vendor/golang.org/x/tools/go/packages/external.go  |    2 +-
+ vendor/golang.org/x/tools/go/packages/golist.go    |  197 ++-
+ vendor/golang.org/x/tools/go/packages/visit.go     |    4 +
+ .../x/tools/internal/event/core/event.go           |    2 +-
+ .../x/tools/internal/gocommand/invoke.go           |   29 +-
+ .../x/tools/internal/gocommand/version.go          |   13 +-
+ vendor/golang.org/x/tools/internal/imports/mod.go  |   19 +-
+ .../x/tools/internal/imports/mod_cache.go          |    4 +
+ .../x/tools/internal/packagesinternal/packages.go  |    4 +
+ .../x/tools/internal/typesinternal/errorcode.go    | 1358 ++++++++++++++++++++
+ .../internal/typesinternal/errorcode_string.go     |  152 +++
+ .../x/tools/internal/typesinternal/types.go        |   17 +
+ vendor/modules.txt                                 |    4 +-
+ 36 files changed, 1814 insertions(+), 235 deletions(-)
+ create mode 100644 vendor/golang.org/x/tools/internal/typesinternal/errorcode.go
+ create mode 100644 vendor/golang.org/x/tools/internal/typesinternal/errorcode_string.go
+
+diff --git a/go.mod b/go.mod
+index f90bf65..3c8284d 100644
+--- a/go.mod
++++ b/go.mod
+@@ -64,7 +64,7 @@ require (
+ 	github.com/goburrow/serial v0.1.0 // indirect
+ 	github.com/gobwas/glob v0.2.3
+ 	github.com/gofrs/uuid v2.1.0+incompatible
+-	github.com/gogo/protobuf v1.3.1
++	github.com/gogo/protobuf v1.3.2
+ 	github.com/golang/geo v0.0.0-20190916061304-5b978397cfec
+ 	github.com/golang/protobuf v1.3.5
+ 	github.com/golang/snappy v0.0.1
+diff --git a/go.sum b/go.sum
+index 7e29f97..9389924 100644
+--- a/go.sum
++++ b/go.sum
+@@ -283,6 +283,8 @@ github.com/gogo/protobuf v1.2.2-0.20190723190241-65acae22fc9d/go.mod h1:SlYgWuQ5
+ github.com/gogo/protobuf v1.3.0/go.mod h1:SlYgWuQ5SjCEi6WLHjHCa1yvBfUnHcTbrrZtXPKa29o=
+ github.com/gogo/protobuf v1.3.1 h1:DqDEcV5aeaTmdFBePNpYsp3FlcVH/2ISVVM9Qf8PSls=
+ github.com/gogo/protobuf v1.3.1/go.mod h1:SlYgWuQ5SjCEi6WLHjHCa1yvBfUnHcTbrrZtXPKa29o=
++github.com/gogo/protobuf v1.3.2 h1:Ov1cvc58UF3b5XjBnZv7+opcTcQFZebYjWzi34vdm4Q=
++github.com/gogo/protobuf v1.3.2/go.mod h1:P1XiOD3dCwIKUDQYPy72D8LYyHL2YPYrpS2s69NZV8Q=
+ github.com/golang/freetype v0.0.0-20170609003504-e2365dfdc4a0/go.mod h1:E/TSTwGwJL78qG/PmXZO1EjYhfJinVAhrmmHX6Z8B9k=
+ github.com/golang/geo v0.0.0-20190916061304-5b978397cfec h1:lJwO/92dFXWeXOZdoGXgptLmNLwynMSHUmU6besqtiw=
+ github.com/golang/geo v0.0.0-20190916061304-5b978397cfec/go.mod h1:QZ0nwyI2jOfgRAoBvP+ab5aRr7c9x7lhGEJrKvBwjWI=
+@@ -446,6 +448,7 @@ github.com/karrick/godirwalk v1.16.1/go.mod h1:j4mkqPuvaLI8mp1DroR3P6ad7cyYd4c1q
+ github.com/kballard/go-shellquote v0.0.0-20180428030007-95032a82bc51 h1:Z9n2FFNUXsshfwJMBgNA0RU6/i7WVaAegv3PtuIHPMs=
+ github.com/kballard/go-shellquote v0.0.0-20180428030007-95032a82bc51/go.mod h1:CzGEWj7cYgsdH8dAjBGEr58BoE7ScuLd+fwFZ44+/x8=
+ github.com/kisielk/errcheck v1.2.0/go.mod h1:/BMXB+zMLi60iA8Vv6Ksmxu/1UDYcXs4uQLJ+jE2L00=
++github.com/kisielk/errcheck v1.5.0/go.mod h1:pFxgyoBC7bSaBwPgfKdkLd5X25qrDl4LWUI2bnpBCr8=
+ github.com/kisielk/gotool v1.0.0/go.mod h1:XhKaO+MFFWcvkIS/tQcRk01m1F5IRFswLeQ+oQHNcck=
+ github.com/klauspost/compress v1.11.0 h1:wJbzvpYMVGG9iTI9VxpnNZfd4DzMPoCWze3GgSqz8yg=
+ github.com/klauspost/compress v1.11.0/go.mod h1:aoV0uJVorq1K+umq18yTdKaF57EivdYsUV+/s2qKfXs=
+@@ -686,6 +689,7 @@ github.com/xdg/scram v0.0.0-20180814205039-7eeb5667e42c h1:u40Z8hqBAAQyv+vATcGgV
+ github.com/xdg/scram v0.0.0-20180814205039-7eeb5667e42c/go.mod h1:lB8K/P019DLNhemzwFU4jHLhdvlE6uDZjXFejJXr49I=
+ github.com/xdg/stringprep v1.0.0 h1:d9X0esnoa3dFsV0FG35rAT0RIhYFlPq7MiP+DW89La0=
+ github.com/xdg/stringprep v1.0.0/go.mod h1:Jhud4/sHMO4oL310DaZAKk9ZaJ08SJfe+sJh0HrGL1Y=
++github.com/yuin/goldmark v1.1.27/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74=
+ github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74=
+ github.com/yuin/gopher-lua v0.0.0-20180630135845-46796da1b0b4 h1:f6CCNiTjQZ0uWK4jPwhwYB8QIGGfn0ssD9kVzRUUUpk=
+ github.com/yuin/gopher-lua v0.0.0-20180630135845-46796da1b0b4/go.mod h1:aEV29XrmTYFr3CiRxZeGHpkvbwq+prZduBqMaascyCU=
+@@ -778,6 +782,7 @@ golang.org/x/net v0.0.0-20191004110552-13f9640d40b9/go.mod h1:z5CRVTTTmAJ677TzLL
+ golang.org/x/net v0.0.0-20191007182048-72f939374954/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
+ golang.org/x/net v0.0.0-20191209160850-c0dbc17a3553/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
+ golang.org/x/net v0.0.0-20200202094626-16171245cfb2/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
++golang.org/x/net v0.0.0-20200226121028-0de0cce0169b/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
+ golang.org/x/net v0.0.0-20200425230154-ff2c4b7c35a0/go.mod h1:qpuaurCH72eLCgpAm/N6yyVIVM9cpaDIP3A8BGJEC5A=
+ golang.org/x/net v0.0.0-20200813134508-3edf25e44fcc/go.mod h1:/O7V0waA8r7cgGh81Ro3o1hOxt32SMVPicZroKQ2sZA=
+ golang.org/x/net v0.0.0-20200822124328-c89045814202/go.mod h1:/O7V0waA8r7cgGh81Ro3o1hOxt32SMVPicZroKQ2sZA=
+@@ -886,8 +891,11 @@ golang.org/x/tools v0.0.0-20191227053925-7b8e75db28f4/go.mod h1:TB2adYChydJhpapK
+ golang.org/x/tools v0.0.0-20200130002326-2f3ba24bd6e7/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28=
+ golang.org/x/tools v0.0.0-20200207183749-b753a1ba74fa/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28=
+ golang.org/x/tools v0.0.0-20200212150539-ea181f53ac56/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28=
++golang.org/x/tools v0.0.0-20200619180055-7c47624df98f/go.mod h1:EkVYQZoAsY45+roYkvgYkIh4xh/qjgUK9TdY2XT94GE=
+ golang.org/x/tools v0.0.0-20201022035929-9cf592e881e9 h1:sEvmEcJVKBNUvgCUClbUQeHOAa9U0I2Ce1BooMvVCY4=
+ golang.org/x/tools v0.0.0-20201022035929-9cf592e881e9/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA=
++golang.org/x/tools v0.0.0-20210106214847-113979e3529a h1:CB3a9Nez8M13wwlr/E2YtwoU+qYHKfC+JrDa45RXXoQ=
++golang.org/x/tools v0.0.0-20210106214847-113979e3529a/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA=
+ golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
+ golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
+ golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
+diff --git a/vendor/github.com/gogo/protobuf/proto/text_parser.go b/vendor/github.com/gogo/protobuf/proto/text_parser.go
+index 1ce0be2..f85c0cc 100644
+--- a/vendor/github.com/gogo/protobuf/proto/text_parser.go
++++ b/vendor/github.com/gogo/protobuf/proto/text_parser.go
+@@ -318,7 +318,7 @@ func unescape(s string) (ch string, tail string, err error) {
+ 		if i > utf8.MaxRune {
+ 			return "", "", fmt.Errorf(`\%c%s is not a valid Unicode code point`, r, ss)
+ 		}
+-		return string(i), s, nil
++		return string(rune(i)), s, nil
+ 	}
+ 	return "", "", fmt.Errorf(`unknown escape \%c`, r)
+ }
+diff --git a/vendor/github.com/gogo/protobuf/types/any.pb.go b/vendor/github.com/gogo/protobuf/types/any.pb.go
+index 98e269d..e3d4d94 100644
+--- a/vendor/github.com/gogo/protobuf/types/any.pb.go
++++ b/vendor/github.com/gogo/protobuf/types/any.pb.go
+@@ -592,10 +592,7 @@ func (m *Any) Unmarshal(dAtA []byte) error {
+ 			if err != nil {
+ 				return err
+ 			}
+-			if skippy < 0 {
+-				return ErrInvalidLengthAny
+-			}
+-			if (iNdEx + skippy) < 0 {
++			if (skippy < 0) || (iNdEx+skippy) < 0 {
+ 				return ErrInvalidLengthAny
+ 			}
+ 			if (iNdEx + skippy) > l {
+diff --git a/vendor/github.com/gogo/protobuf/types/api.pb.go b/vendor/github.com/gogo/protobuf/types/api.pb.go
+index 58bf4b5..83e8869 100644
+--- a/vendor/github.com/gogo/protobuf/types/api.pb.go
++++ b/vendor/github.com/gogo/protobuf/types/api.pb.go
+@@ -1677,10 +1677,7 @@ func (m *Api) Unmarshal(dAtA []byte) error {
+ 			if err != nil {
+ 				return err
+ 			}
+-			if skippy < 0 {
+-				return ErrInvalidLengthApi
+-			}
+-			if (iNdEx + skippy) < 0 {
++			if (skippy < 0) || (iNdEx+skippy) < 0 {
+ 				return ErrInvalidLengthApi
+ 			}
+ 			if (iNdEx + skippy) > l {
+@@ -1920,10 +1917,7 @@ func (m *Method) Unmarshal(dAtA []byte) error {
+ 			if err != nil {
+ 				return err
+ 			}
+-			if skippy < 0 {
+-				return ErrInvalidLengthApi
+-			}
+-			if (iNdEx + skippy) < 0 {
++			if (skippy < 0) || (iNdEx+skippy) < 0 {
+ 				return ErrInvalidLengthApi
+ 			}
+ 			if (iNdEx + skippy) > l {
+@@ -2038,10 +2032,7 @@ func (m *Mixin) Unmarshal(dAtA []byte) error {
+ 			if err != nil {
+ 				return err
+ 			}
+-			if skippy < 0 {
+-				return ErrInvalidLengthApi
+-			}
+-			if (iNdEx + skippy) < 0 {
++			if (skippy < 0) || (iNdEx+skippy) < 0 {
+ 				return ErrInvalidLengthApi
+ 			}
+ 			if (iNdEx + skippy) > l {
+diff --git a/vendor/github.com/gogo/protobuf/types/duration.pb.go b/vendor/github.com/gogo/protobuf/types/duration.pb.go
+index 3959f06..4deafcb 100644
+--- a/vendor/github.com/gogo/protobuf/types/duration.pb.go
++++ b/vendor/github.com/gogo/protobuf/types/duration.pb.go
+@@ -415,10 +415,7 @@ func (m *Duration) Unmarshal(dAtA []byte) error {
+ 			if err != nil {
+ 				return err
+ 			}
+-			if skippy < 0 {
+-				return ErrInvalidLengthDuration
+-			}
+-			if (iNdEx + skippy) < 0 {
++			if (skippy < 0) || (iNdEx+skippy) < 0 {
+ 				return ErrInvalidLengthDuration
+ 			}
+ 			if (iNdEx + skippy) > l {
+diff --git a/vendor/github.com/gogo/protobuf/types/empty.pb.go b/vendor/github.com/gogo/protobuf/types/empty.pb.go
+index 17e3aa5..9e94748 100644
+--- a/vendor/github.com/gogo/protobuf/types/empty.pb.go
++++ b/vendor/github.com/gogo/protobuf/types/empty.pb.go
+@@ -360,10 +360,7 @@ func (m *Empty) Unmarshal(dAtA []byte) error {
+ 			if err != nil {
+ 				return err
+ 			}
+-			if skippy < 0 {
+-				return ErrInvalidLengthEmpty
+-			}
+-			if (iNdEx + skippy) < 0 {
++			if (skippy < 0) || (iNdEx+skippy) < 0 {
+ 				return ErrInvalidLengthEmpty
+ 			}
+ 			if (iNdEx + skippy) > l {
+diff --git a/vendor/github.com/gogo/protobuf/types/field_mask.pb.go b/vendor/github.com/gogo/protobuf/types/field_mask.pb.go
+index 7226b57..6ae346d 100644
+--- a/vendor/github.com/gogo/protobuf/types/field_mask.pb.go
++++ b/vendor/github.com/gogo/protobuf/types/field_mask.pb.go
+@@ -636,10 +636,7 @@ func (m *FieldMask) Unmarshal(dAtA []byte) error {
+ 			if err != nil {
+ 				return err
+ 			}
+-			if skippy < 0 {
+-				return ErrInvalidLengthFieldMask
+-			}
+-			if (iNdEx + skippy) < 0 {
++			if (skippy < 0) || (iNdEx+skippy) < 0 {
+ 				return ErrInvalidLengthFieldMask
+ 			}
+ 			if (iNdEx + skippy) > l {
+diff --git a/vendor/github.com/gogo/protobuf/types/source_context.pb.go b/vendor/github.com/gogo/protobuf/types/source_context.pb.go
+index 61045ce..8e6ce71 100644
+--- a/vendor/github.com/gogo/protobuf/types/source_context.pb.go
++++ b/vendor/github.com/gogo/protobuf/types/source_context.pb.go
+@@ -422,10 +422,7 @@ func (m *SourceContext) Unmarshal(dAtA []byte) error {
+ 			if err != nil {
+ 				return err
+ 			}
+-			if skippy < 0 {
+-				return ErrInvalidLengthSourceContext
+-			}
+-			if (iNdEx + skippy) < 0 {
++			if (skippy < 0) || (iNdEx+skippy) < 0 {
+ 				return ErrInvalidLengthSourceContext
+ 			}
+ 			if (iNdEx + skippy) > l {
+diff --git a/vendor/github.com/gogo/protobuf/types/struct.pb.go b/vendor/github.com/gogo/protobuf/types/struct.pb.go
+index cea553e..c045731 100644
+--- a/vendor/github.com/gogo/protobuf/types/struct.pb.go
++++ b/vendor/github.com/gogo/protobuf/types/struct.pb.go
+@@ -1862,7 +1862,7 @@ func (m *Struct) Unmarshal(dAtA []byte) error {
+ 					if err != nil {
+ 						return err
+ 					}
+-					if skippy < 0 {
++					if (skippy < 0) || (iNdEx+skippy) < 0 {
+ 						return ErrInvalidLengthStruct
+ 					}
+ 					if (iNdEx + skippy) > postIndex {
+@@ -1879,10 +1879,7 @@ func (m *Struct) Unmarshal(dAtA []byte) error {
+ 			if err != nil {
+ 				return err
+ 			}
+-			if skippy < 0 {
+-				return ErrInvalidLengthStruct
+-			}
+-			if (iNdEx + skippy) < 0 {
++			if (skippy < 0) || (iNdEx+skippy) < 0 {
+ 				return ErrInvalidLengthStruct
+ 			}
+ 			if (iNdEx + skippy) > l {
+@@ -2087,10 +2084,7 @@ func (m *Value) Unmarshal(dAtA []byte) error {
+ 			if err != nil {
+ 				return err
+ 			}
+-			if skippy < 0 {
+-				return ErrInvalidLengthStruct
+-			}
+-			if (iNdEx + skippy) < 0 {
++			if (skippy < 0) || (iNdEx+skippy) < 0 {
+ 				return ErrInvalidLengthStruct
+ 			}
+ 			if (iNdEx + skippy) > l {
+@@ -2175,10 +2169,7 @@ func (m *ListValue) Unmarshal(dAtA []byte) error {
+ 			if err != nil {
+ 				return err
+ 			}
+-			if skippy < 0 {
+-				return ErrInvalidLengthStruct
+-			}
+-			if (iNdEx + skippy) < 0 {
++			if (skippy < 0) || (iNdEx+skippy) < 0 {
+ 				return ErrInvalidLengthStruct
+ 			}
+ 			if (iNdEx + skippy) > l {
+diff --git a/vendor/github.com/gogo/protobuf/types/timestamp.pb.go b/vendor/github.com/gogo/protobuf/types/timestamp.pb.go
+index b818752..45db7b3 100644
+--- a/vendor/github.com/gogo/protobuf/types/timestamp.pb.go
++++ b/vendor/github.com/gogo/protobuf/types/timestamp.pb.go
+@@ -437,10 +437,7 @@ func (m *Timestamp) Unmarshal(dAtA []byte) error {
+ 			if err != nil {
+ 				return err
+ 			}
+-			if skippy < 0 {
+-				return ErrInvalidLengthTimestamp
+-			}
+-			if (iNdEx + skippy) < 0 {
++			if (skippy < 0) || (iNdEx+skippy) < 0 {
+ 				return ErrInvalidLengthTimestamp
+ 			}
+ 			if (iNdEx + skippy) > l {
+diff --git a/vendor/github.com/gogo/protobuf/types/type.pb.go b/vendor/github.com/gogo/protobuf/types/type.pb.go
+index 13b7ec0..791427b 100644
+--- a/vendor/github.com/gogo/protobuf/types/type.pb.go
++++ b/vendor/github.com/gogo/protobuf/types/type.pb.go
+@@ -2483,10 +2483,7 @@ func (m *Type) Unmarshal(dAtA []byte) error {
+ 			if err != nil {
+ 				return err
+ 			}
+-			if skippy < 0 {
+-				return ErrInvalidLengthType
+-			}
+-			if (iNdEx + skippy) < 0 {
++			if (skippy < 0) || (iNdEx+skippy) < 0 {
+ 				return ErrInvalidLengthType
+ 			}
+ 			if (iNdEx + skippy) > l {
+@@ -2795,10 +2792,7 @@ func (m *Field) Unmarshal(dAtA []byte) error {
+ 			if err != nil {
+ 				return err
+ 			}
+-			if skippy < 0 {
+-				return ErrInvalidLengthType
+-			}
+-			if (iNdEx + skippy) < 0 {
++			if (skippy < 0) || (iNdEx+skippy) < 0 {
+ 				return ErrInvalidLengthType
+ 			}
+ 			if (iNdEx + skippy) > l {
+@@ -3004,10 +2998,7 @@ func (m *Enum) Unmarshal(dAtA []byte) error {
+ 			if err != nil {
+ 				return err
+ 			}
+-			if skippy < 0 {
+-				return ErrInvalidLengthType
+-			}
+-			if (iNdEx + skippy) < 0 {
++			if (skippy < 0) || (iNdEx+skippy) < 0 {
+ 				return ErrInvalidLengthType
+ 			}
+ 			if (iNdEx + skippy) > l {
+@@ -3143,10 +3134,7 @@ func (m *EnumValue) Unmarshal(dAtA []byte) error {
+ 			if err != nil {
+ 				return err
+ 			}
+-			if skippy < 0 {
+-				return ErrInvalidLengthType
+-			}
+-			if (iNdEx + skippy) < 0 {
++			if (skippy < 0) || (iNdEx+skippy) < 0 {
+ 				return ErrInvalidLengthType
+ 			}
+ 			if (iNdEx + skippy) > l {
+@@ -3265,10 +3253,7 @@ func (m *Option) Unmarshal(dAtA []byte) error {
+ 			if err != nil {
+ 				return err
+ 			}
+-			if skippy < 0 {
+-				return ErrInvalidLengthType
+-			}
+-			if (iNdEx + skippy) < 0 {
++			if (skippy < 0) || (iNdEx+skippy) < 0 {
+ 				return ErrInvalidLengthType
+ 			}
+ 			if (iNdEx + skippy) > l {
+diff --git a/vendor/github.com/gogo/protobuf/types/wrappers.pb.go b/vendor/github.com/gogo/protobuf/types/wrappers.pb.go
+index 8f1edb5..8d41542 100644
+--- a/vendor/github.com/gogo/protobuf/types/wrappers.pb.go
++++ b/vendor/github.com/gogo/protobuf/types/wrappers.pb.go
+@@ -2020,10 +2020,7 @@ func (m *DoubleValue) Unmarshal(dAtA []byte) error {
+ 			if err != nil {
+ 				return err
+ 			}
+-			if skippy < 0 {
+-				return ErrInvalidLengthWrappers
+-			}
+-			if (iNdEx + skippy) < 0 {
++			if (skippy < 0) || (iNdEx+skippy) < 0 {
+ 				return ErrInvalidLengthWrappers
+ 			}
+ 			if (iNdEx + skippy) > l {
+@@ -2085,10 +2082,7 @@ func (m *FloatValue) Unmarshal(dAtA []byte) error {
+ 			if err != nil {
+ 				return err
+ 			}
+-			if skippy < 0 {
+-				return ErrInvalidLengthWrappers
+-			}
+-			if (iNdEx + skippy) < 0 {
++			if (skippy < 0) || (iNdEx+skippy) < 0 {
+ 				return ErrInvalidLengthWrappers
+ 			}
+ 			if (iNdEx + skippy) > l {
+@@ -2158,10 +2152,7 @@ func (m *Int64Value) Unmarshal(dAtA []byte) error {
+ 			if err != nil {
+ 				return err
+ 			}
+-			if skippy < 0 {
+-				return ErrInvalidLengthWrappers
+-			}
+-			if (iNdEx + skippy) < 0 {
++			if (skippy < 0) || (iNdEx+skippy) < 0 {
+ 				return ErrInvalidLengthWrappers
+ 			}
+ 			if (iNdEx + skippy) > l {
+@@ -2231,10 +2222,7 @@ func (m *UInt64Value) Unmarshal(dAtA []byte) error {
+ 			if err != nil {
+ 				return err
+ 			}
+-			if skippy < 0 {
+-				return ErrInvalidLengthWrappers
+-			}
+-			if (iNdEx + skippy) < 0 {
++			if (skippy < 0) || (iNdEx+skippy) < 0 {
+ 				return ErrInvalidLengthWrappers
+ 			}
+ 			if (iNdEx + skippy) > l {
+@@ -2304,10 +2292,7 @@ func (m *Int32Value) Unmarshal(dAtA []byte) error {
+ 			if err != nil {
+ 				return err
+ 			}
+-			if skippy < 0 {
+-				return ErrInvalidLengthWrappers
+-			}
+-			if (iNdEx + skippy) < 0 {
++			if (skippy < 0) || (iNdEx+skippy) < 0 {
+ 				return ErrInvalidLengthWrappers
+ 			}
+ 			if (iNdEx + skippy) > l {
+@@ -2377,10 +2362,7 @@ func (m *UInt32Value) Unmarshal(dAtA []byte) error {
+ 			if err != nil {
+ 				return err
+ 			}
+-			if skippy < 0 {
+-				return ErrInvalidLengthWrappers
+-			}
+-			if (iNdEx + skippy) < 0 {
++			if (skippy < 0) || (iNdEx+skippy) < 0 {
+ 				return ErrInvalidLengthWrappers
+ 			}
+ 			if (iNdEx + skippy) > l {
+@@ -2451,10 +2433,7 @@ func (m *BoolValue) Unmarshal(dAtA []byte) error {
+ 			if err != nil {
+ 				return err
+ 			}
+-			if skippy < 0 {
+-				return ErrInvalidLengthWrappers
+-			}
+-			if (iNdEx + skippy) < 0 {
++			if (skippy < 0) || (iNdEx+skippy) < 0 {
+ 				return ErrInvalidLengthWrappers
+ 			}
+ 			if (iNdEx + skippy) > l {
+@@ -2537,10 +2516,7 @@ func (m *StringValue) Unmarshal(dAtA []byte) error {
+ 			if err != nil {
+ 				return err
+ 			}
+-			if skippy < 0 {
+-				return ErrInvalidLengthWrappers
+-			}
+-			if (iNdEx + skippy) < 0 {
++			if (skippy < 0) || (iNdEx+skippy) < 0 {
+ 				return ErrInvalidLengthWrappers
+ 			}
+ 			if (iNdEx + skippy) > l {
+@@ -2625,10 +2601,7 @@ func (m *BytesValue) Unmarshal(dAtA []byte) error {
+ 			if err != nil {
+ 				return err
+ 			}
+-			if skippy < 0 {
+-				return ErrInvalidLengthWrappers
+-			}
+-			if (iNdEx + skippy) < 0 {
++			if (skippy < 0) || (iNdEx+skippy) < 0 {
+ 				return ErrInvalidLengthWrappers
+ 			}
+ 			if (iNdEx + skippy) > l {
+diff --git a/vendor/golang.org/x/tools/cmd/goimports/doc.go b/vendor/golang.org/x/tools/cmd/goimports/doc.go
+index 7033e4d..f344d80 100644
+--- a/vendor/golang.org/x/tools/cmd/goimports/doc.go
++++ b/vendor/golang.org/x/tools/cmd/goimports/doc.go
+@@ -1,3 +1,7 @@
++// Copyright 2013 The Go Authors. All rights reserved.
++// Use of this source code is governed by a BSD-style
++// license that can be found in the LICENSE file.
++
+ /*
+ 
+ Command goimports updates your Go import lines,
+diff --git a/vendor/golang.org/x/tools/go/analysis/analysis.go b/vendor/golang.org/x/tools/go/analysis/analysis.go
+index 8c3c2e7..d11505a 100644
+--- a/vendor/golang.org/x/tools/go/analysis/analysis.go
++++ b/vendor/golang.org/x/tools/go/analysis/analysis.go
+@@ -1,3 +1,7 @@
++// Copyright 2018 The Go Authors. All rights reserved.
++// Use of this source code is governed by a BSD-style
++// license that can be found in the LICENSE file.
++
+ package analysis
+ 
+ import (
+diff --git a/vendor/golang.org/x/tools/go/analysis/diagnostic.go b/vendor/golang.org/x/tools/go/analysis/diagnostic.go
+index 57eaf6f..cd462a0 100644
+--- a/vendor/golang.org/x/tools/go/analysis/diagnostic.go
++++ b/vendor/golang.org/x/tools/go/analysis/diagnostic.go
+@@ -1,3 +1,7 @@
++// Copyright 2019 The Go Authors. All rights reserved.
++// Use of this source code is governed by a BSD-style
++// license that can be found in the LICENSE file.
++
+ package analysis
+ 
+ import "go/token"
+diff --git a/vendor/golang.org/x/tools/go/analysis/doc.go b/vendor/golang.org/x/tools/go/analysis/doc.go
+index 9fa3302..94a3bd5 100644
+--- a/vendor/golang.org/x/tools/go/analysis/doc.go
++++ b/vendor/golang.org/x/tools/go/analysis/doc.go
+@@ -1,3 +1,7 @@
++// Copyright 2018 The Go Authors. All rights reserved.
++// Use of this source code is governed by a BSD-style
++// license that can be found in the LICENSE file.
++
+ /*
+ 
+ Package analysis defines the interface between a modular static
+diff --git a/vendor/golang.org/x/tools/go/analysis/validate.go b/vendor/golang.org/x/tools/go/analysis/validate.go
+index ad0e727..23e57bf 100644
+--- a/vendor/golang.org/x/tools/go/analysis/validate.go
++++ b/vendor/golang.org/x/tools/go/analysis/validate.go
+@@ -1,3 +1,7 @@
++// Copyright 2018 The Go Authors. All rights reserved.
++// Use of this source code is governed by a BSD-style
++// license that can be found in the LICENSE file.
++
+ package analysis
+ 
+ import (
+diff --git a/vendor/golang.org/x/tools/go/ast/astutil/util.go b/vendor/golang.org/x/tools/go/ast/astutil/util.go
+index 7630629..919d530 100644
+--- a/vendor/golang.org/x/tools/go/ast/astutil/util.go
++++ b/vendor/golang.org/x/tools/go/ast/astutil/util.go
+@@ -1,3 +1,7 @@
++// Copyright 2015 The Go Authors. All rights reserved.
++// Use of this source code is governed by a BSD-style
++// license that can be found in the LICENSE file.
++
+ package astutil
+ 
+ import "go/ast"
+diff --git a/vendor/golang.org/x/tools/go/ast/inspector/typeof.go b/vendor/golang.org/x/tools/go/ast/inspector/typeof.go
+index d61301b..b6b00cf 100644
+--- a/vendor/golang.org/x/tools/go/ast/inspector/typeof.go
++++ b/vendor/golang.org/x/tools/go/ast/inspector/typeof.go
+@@ -1,3 +1,7 @@
++// Copyright 2018 The Go Authors. All rights reserved.
++// Use of this source code is governed by a BSD-style
++// license that can be found in the LICENSE file.
++
+ package inspector
+ 
+ // This file defines func typeOf(ast.Node) uint64.
+diff --git a/vendor/golang.org/x/tools/go/buildutil/fakecontext.go b/vendor/golang.org/x/tools/go/buildutil/fakecontext.go
+index 8b7f066..5fc672f 100644
+--- a/vendor/golang.org/x/tools/go/buildutil/fakecontext.go
++++ b/vendor/golang.org/x/tools/go/buildutil/fakecontext.go
+@@ -1,3 +1,7 @@
++// Copyright 2015 The Go Authors. All rights reserved.
++// Use of this source code is governed by a BSD-style
++// license that can be found in the LICENSE file.
++
+ package buildutil
+ 
+ import (
+diff --git a/vendor/golang.org/x/tools/go/buildutil/tags.go b/vendor/golang.org/x/tools/go/buildutil/tags.go
+index 486606f..6da0ce4 100644
+--- a/vendor/golang.org/x/tools/go/buildutil/tags.go
++++ b/vendor/golang.org/x/tools/go/buildutil/tags.go
+@@ -1,3 +1,7 @@
++// Copyright 2015 The Go Authors. All rights reserved.
++// Use of this source code is governed by a BSD-style
++// license that can be found in the LICENSE file.
++
+ package buildutil
+ 
+ // This logic was copied from stringsFlag from $GOROOT/src/cmd/go/build.go.
+diff --git a/vendor/golang.org/x/tools/go/internal/packagesdriver/sizes.go b/vendor/golang.org/x/tools/go/internal/packagesdriver/sizes.go
+index 35bc6a4..f4d73b2 100644
+--- a/vendor/golang.org/x/tools/go/internal/packagesdriver/sizes.go
++++ b/vendor/golang.org/x/tools/go/internal/packagesdriver/sizes.go
+@@ -6,12 +6,9 @@
+ package packagesdriver
+ 
+ import (
+-	"bytes"
+ 	"context"
+-	"encoding/json"
+ 	"fmt"
+ 	"go/types"
+-	"os/exec"
+ 	"strings"
+ 
+ 	"golang.org/x/tools/internal/gocommand"
+@@ -19,67 +16,6 @@ import (
+ 
+ var debug = false
+ 
+-func GetSizes(ctx context.Context, buildFlags, env []string, gocmdRunner *gocommand.Runner, dir string) (types.Sizes, error) {
+-	// TODO(matloob): Clean this up. This code is mostly a copy of packages.findExternalDriver.
+-	const toolPrefix = "GOPACKAGESDRIVER="
+-	tool := ""
+-	for _, env := range env {
+-		if val := strings.TrimPrefix(env, toolPrefix); val != env {
+-			tool = val
+-		}
+-	}
+-
+-	if tool == "" {
+-		var err error
+-		tool, err = exec.LookPath("gopackagesdriver")
+-		if err != nil {
+-			// We did not find the driver, so use "go list".
+-			tool = "off"
+-		}
+-	}
+-
+-	if tool == "off" {
+-		inv := gocommand.Invocation{
+-			BuildFlags: buildFlags,
+-			Env:        env,
+-			WorkingDir: dir,
+-		}
+-		return GetSizesGolist(ctx, inv, gocmdRunner)
+-	}
+-
+-	req, err := json.Marshal(struct {
+-		Command    string   `json:"command"`
+-		Env        []string `json:"env"`
+-		BuildFlags []string `json:"build_flags"`
+-	}{
+-		Command:    "sizes",
+-		Env:        env,
+-		BuildFlags: buildFlags,
+-	})
+-	if err != nil {
+-		return nil, fmt.Errorf("failed to encode message to driver tool: %v", err)
+-	}
+-
+-	buf := new(bytes.Buffer)
+-	cmd := exec.CommandContext(ctx, tool)
+-	cmd.Dir = dir
+-	cmd.Env = env
+-	cmd.Stdin = bytes.NewReader(req)
+-	cmd.Stdout = buf
+-	cmd.Stderr = new(bytes.Buffer)
+-	if err := cmd.Run(); err != nil {
+-		return nil, fmt.Errorf("%v: %v: %s", tool, err, cmd.Stderr)
+-	}
+-	var response struct {
+-		// Sizes, if not nil, is the types.Sizes to use when type checking.
+-		Sizes *types.StdSizes
+-	}
+-	if err := json.Unmarshal(buf.Bytes(), &response); err != nil {
+-		return nil, err
+-	}
+-	return response.Sizes, nil
+-}
+-
+ func GetSizesGolist(ctx context.Context, inv gocommand.Invocation, gocmdRunner *gocommand.Runner) (types.Sizes, error) {
+ 	inv.Verb = "list"
+ 	inv.Args = []string{"-f", "{{context.GOARCH}} {{context.Compiler}}", "--", "unsafe"}
+diff --git a/vendor/golang.org/x/tools/go/packages/external.go b/vendor/golang.org/x/tools/go/packages/external.go
+index 8c8473f..7db1d12 100644
+--- a/vendor/golang.org/x/tools/go/packages/external.go
++++ b/vendor/golang.org/x/tools/go/packages/external.go
+@@ -89,7 +89,7 @@ func findExternalDriver(cfg *Config) driver {
+ 			return nil, fmt.Errorf("%v: %v: %s", tool, err, cmd.Stderr)
+ 		}
+ 		if len(stderr.Bytes()) != 0 && os.Getenv("GOPACKAGESPRINTDRIVERERRORS") != "" {
+-			fmt.Fprintf(os.Stderr, "%s stderr: <<%s>>\n", cmdDebugStr(cmd, words...), stderr)
++			fmt.Fprintf(os.Stderr, "%s stderr: <<%s>>\n", cmdDebugStr(cmd), stderr)
+ 		}
+ 
+ 		var response driverResponse
+diff --git a/vendor/golang.org/x/tools/go/packages/golist.go b/vendor/golang.org/x/tools/go/packages/golist.go
+index 787783c..c83ca09 100644
+--- a/vendor/golang.org/x/tools/go/packages/golist.go
++++ b/vendor/golang.org/x/tools/go/packages/golist.go
+@@ -10,6 +10,7 @@ import (
+ 	"encoding/json"
+ 	"fmt"
+ 	"go/types"
++	"io/ioutil"
+ 	"log"
+ 	"os"
+ 	"os/exec"
+@@ -208,56 +209,58 @@ extractQueries:
+ 		}
+ 	}
+ 
+-	modifiedPkgs, needPkgs, err := state.processGolistOverlay(response)
+-	if err != nil {
+-		return nil, err
+-	}
++	// Only use go/packages' overlay processing if we're using a Go version
++	// below 1.16. Otherwise, go list handles it.
++	if goVersion, err := state.getGoVersion(); err == nil && goVersion < 16 {
++		modifiedPkgs, needPkgs, err := state.processGolistOverlay(response)
++		if err != nil {
++			return nil, err
++		}
+ 
+-	var containsCandidates []string
+-	if len(containFiles) > 0 {
+-		containsCandidates = append(containsCandidates, modifiedPkgs...)
+-		containsCandidates = append(containsCandidates, needPkgs...)
+-	}
+-	if err := state.addNeededOverlayPackages(response, needPkgs); err != nil {
+-		return nil, err
+-	}
+-	// Check candidate packages for containFiles.
+-	if len(containFiles) > 0 {
+-		for _, id := range containsCandidates {
+-			pkg, ok := response.seenPackages[id]
+-			if !ok {
+-				response.addPackage(&Package{
+-					ID: id,
+-					Errors: []Error{
+-						{
++		var containsCandidates []string
++		if len(containFiles) > 0 {
++			containsCandidates = append(containsCandidates, modifiedPkgs...)
++			containsCandidates = append(containsCandidates, needPkgs...)
++		}
++		if err := state.addNeededOverlayPackages(response, needPkgs); err != nil {
++			return nil, err
++		}
++		// Check candidate packages for containFiles.
++		if len(containFiles) > 0 {
++			for _, id := range containsCandidates {
++				pkg, ok := response.seenPackages[id]
++				if !ok {
++					response.addPackage(&Package{
++						ID: id,
++						Errors: []Error{{
+ 							Kind: ListError,
+ 							Msg:  fmt.Sprintf("package %s expected but not seen", id),
+-						},
+-					},
+-				})
+-				continue
+-			}
+-			for _, f := range containFiles {
+-				for _, g := range pkg.GoFiles {
+-					if sameFile(f, g) {
+-						response.addRoot(id)
++						}},
++					})
++					continue
++				}
++				for _, f := range containFiles {
++					for _, g := range pkg.GoFiles {
++						if sameFile(f, g) {
++							response.addRoot(id)
++						}
+ 					}
+ 				}
+ 			}
+ 		}
+-	}
+-	// Add root for any package that matches a pattern. This applies only to
+-	// packages that are modified by overlays, since they are not added as
+-	// roots automatically.
+-	for _, pattern := range restPatterns {
+-		match := matchPattern(pattern)
+-		for _, pkgID := range modifiedPkgs {
+-			pkg, ok := response.seenPackages[pkgID]
+-			if !ok {
+-				continue
+-			}
+-			if match(pkg.PkgPath) {
+-				response.addRoot(pkg.ID)
++		// Add root for any package that matches a pattern. This applies only to
++		// packages that are modified by overlays, since they are not added as
++		// roots automatically.
++		for _, pattern := range restPatterns {
++			match := matchPattern(pattern)
++			for _, pkgID := range modifiedPkgs {
++				pkg, ok := response.seenPackages[pkgID]
++				if !ok {
++					continue
++				}
++				if match(pkg.PkgPath) {
++					response.addRoot(pkg.ID)
++				}
+ 			}
+ 		}
+ 	}
+@@ -824,6 +827,7 @@ func (state *golistState) cfgInvocation() gocommand.Invocation {
+ 		BuildFlags: cfg.BuildFlags,
+ 		ModFile:    cfg.modFile,
+ 		ModFlag:    cfg.modFlag,
++		CleanEnv:   cfg.Env != nil,
+ 		Env:        cfg.Env,
+ 		Logf:       cfg.Logf,
+ 		WorkingDir: cfg.Dir,
+@@ -835,6 +839,26 @@ func (state *golistState) invokeGo(verb string, args ...string) (*bytes.Buffer,
+ 	cfg := state.cfg
+ 
+ 	inv := state.cfgInvocation()
++
++	// For Go versions 1.16 and above, `go list` accepts overlays directly via
++	// the -overlay flag. Set it, if it's available.
++	//
++	// The check for "list" is not necessarily required, but we should avoid
++	// getting the go version if possible.
++	if verb == "list" {
++		goVersion, err := state.getGoVersion()
++		if err != nil {
++			return nil, err
++		}
++		if goVersion >= 16 {
++			filename, cleanup, err := state.writeOverlays()
++			if err != nil {
++				return nil, err
++			}
++			defer cleanup()
++			inv.Overlay = filename
++		}
++	}
+ 	inv.Verb = verb
+ 	inv.Args = args
+ 	gocmdRunner := cfg.gocmdRunner
+@@ -878,8 +902,13 @@ func (state *golistState) invokeGo(verb string, args ...string) (*bytes.Buffer,
+ 			return unicode.IsOneOf([]*unicode.RangeTable{unicode.L, unicode.M, unicode.N, unicode.P, unicode.S}, r) &&
+ 				!strings.ContainsRune("!\"#$%&'()*,:;<=>?[\\]^`{|}\uFFFD", r)
+ 		}
++		// golang/go#36770: Handle case where cmd/go prints module download messages before the error.
++		msg := stderr.String()
++		for strings.HasPrefix(msg, "go: downloading") {
++			msg = msg[strings.IndexRune(msg, '\n')+1:]
++		}
+ 		if len(stderr.String()) > 0 && strings.HasPrefix(stderr.String(), "# ") {
+-			msg := stderr.String()[len("# "):]
++			msg := msg[len("# "):]
+ 			if strings.HasPrefix(strings.TrimLeftFunc(msg, isPkgPathRune), "\n") {
+ 				return stdout, nil
+ 			}
+@@ -976,6 +1005,67 @@ func (state *golistState) invokeGo(verb string, args ...string) (*bytes.Buffer,
+ 	return stdout, nil
+ }
+ 
++// OverlayJSON is the format overlay files are expected to be in.
++// The Replace map maps from overlaid paths to replacement paths:
++// the Go command will forward all reads trying to open
++// each overlaid path to its replacement path, or consider the overlaid
++// path not to exist if the replacement path is empty.
++//
++// From golang/go#39958.
++type OverlayJSON struct {
++	Replace map[string]string `json:"replace,omitempty"`
++}
++
++// writeOverlays writes out files for go list's -overlay flag, as described
++// above.
++func (state *golistState) writeOverlays() (filename string, cleanup func(), err error) {
++	// Do nothing if there are no overlays in the config.
++	if len(state.cfg.Overlay) == 0 {
++		return "", func() {}, nil
++	}
++	dir, err := ioutil.TempDir("", "gopackages-*")
++	if err != nil {
++		return "", nil, err
++	}
++	// The caller must clean up this directory, unless this function returns an
++	// error.
++	cleanup = func() {
++		os.RemoveAll(dir)
++	}
++	defer func() {
++		if err != nil {
++			cleanup()
++		}
++	}()
++	overlays := map[string]string{}
++	for k, v := range state.cfg.Overlay {
++		// Create a unique filename for the overlaid files, to avoid
++		// creating nested directories.
++		noSeparator := strings.Join(strings.Split(filepath.ToSlash(k), "/"), "")
++		f, err := ioutil.TempFile(dir, fmt.Sprintf("*-%s", noSeparator))
++		if err != nil {
++			return "", func() {}, err
++		}
++		if _, err := f.Write(v); err != nil {
++			return "", func() {}, err
++		}
++		if err := f.Close(); err != nil {
++			return "", func() {}, err
++		}
++		overlays[k] = f.Name()
++	}
++	b, err := json.Marshal(OverlayJSON{Replace: overlays})
++	if err != nil {
++		return "", func() {}, err
++	}
++	// Write out the overlay file that contains the filepath mappings.
++	filename = filepath.Join(dir, "overlay.json")
++	if err := ioutil.WriteFile(filename, b, 0665); err != nil {
++		return "", func() {}, err
++	}
++	return filename, cleanup, nil
++}
++
+ func containsGoFile(s []string) bool {
+ 	for _, f := range s {
+ 		if strings.HasSuffix(f, ".go") {
+@@ -985,17 +1075,22 @@ func containsGoFile(s []string) bool {
+ 	return false
+ }
+ 
+-func cmdDebugStr(cmd *exec.Cmd, args ...string) string {
++func cmdDebugStr(cmd *exec.Cmd) string {
+ 	env := make(map[string]string)
+ 	for _, kv := range cmd.Env {
+-		split := strings.Split(kv, "=")
++		split := strings.SplitN(kv, "=", 2)
+ 		k, v := split[0], split[1]
+ 		env[k] = v
+ 	}
+-	var quotedArgs []string
+-	for _, arg := range args {
+-		quotedArgs = append(quotedArgs, strconv.Quote(arg))
+-	}
+ 
+-	return fmt.Sprintf("GOROOT=%v GOPATH=%v GO111MODULE=%v PWD=%v go %s", env["GOROOT"], env["GOPATH"], env["GO111MODULE"], env["PWD"], strings.Join(quotedArgs, " "))
++	var args []string
++	for _, arg := range cmd.Args {
++		quoted := strconv.Quote(arg)
++		if quoted[1:len(quoted)-1] != arg || strings.Contains(arg, " ") {
++			args = append(args, quoted)
++		} else {
++			args = append(args, arg)
++		}
++	}
++	return fmt.Sprintf("GOROOT=%v GOPATH=%v GO111MODULE=%v GOPROXY=%v PWD=%v %v", env["GOROOT"], env["GOPATH"], env["GO111MODULE"], env["GOPROXY"], env["PWD"], strings.Join(args, " "))
+ }
+diff --git a/vendor/golang.org/x/tools/go/packages/visit.go b/vendor/golang.org/x/tools/go/packages/visit.go
+index b13cb08..a1dcc40 100644
+--- a/vendor/golang.org/x/tools/go/packages/visit.go
++++ b/vendor/golang.org/x/tools/go/packages/visit.go
+@@ -1,3 +1,7 @@
++// Copyright 2018 The Go Authors. All rights reserved.
++// Use of this source code is governed by a BSD-style
++// license that can be found in the LICENSE file.
++
+ package packages
+ 
+ import (
+diff --git a/vendor/golang.org/x/tools/internal/event/core/event.go b/vendor/golang.org/x/tools/internal/event/core/event.go
+index e37b494..a6cf0e6 100644
+--- a/vendor/golang.org/x/tools/internal/event/core/event.go
++++ b/vendor/golang.org/x/tools/internal/event/core/event.go
+@@ -12,7 +12,7 @@ import (
+ 	"golang.org/x/tools/internal/event/label"
+ )
+ 
+-// Event holds the information about an event of note that ocurred.
++// Event holds the information about an event of note that occurred.
+ type Event struct {
+ 	at time.Time
+ 
+diff --git a/vendor/golang.org/x/tools/internal/gocommand/invoke.go b/vendor/golang.org/x/tools/internal/gocommand/invoke.go
+index b5c061b..f65aad4 100644
+--- a/vendor/golang.org/x/tools/internal/gocommand/invoke.go
++++ b/vendor/golang.org/x/tools/internal/gocommand/invoke.go
+@@ -13,6 +13,7 @@ import (
+ 	"os"
+ 	"os/exec"
+ 	"regexp"
++	"strconv"
+ 	"strings"
+ 	"sync"
+ 	"time"
+@@ -132,6 +133,10 @@ type Invocation struct {
+ 	BuildFlags []string
+ 	ModFlag    string
+ 	ModFile    string
++	Overlay    string
++	// If CleanEnv is set, the invocation will run only with the environment
++	// in Env, not starting with os.Environ.
++	CleanEnv   bool
+ 	Env        []string
+ 	WorkingDir string
+ 	Logf       func(format string, args ...interface{})
+@@ -171,6 +176,11 @@ func (i *Invocation) run(ctx context.Context, stdout, stderr io.Writer) error {
+ 			goArgs = append(goArgs, "-mod="+i.ModFlag)
+ 		}
+ 	}
++	appendOverlayFlag := func() {
++		if i.Overlay != "" {
++			goArgs = append(goArgs, "-overlay="+i.Overlay)
++		}
++	}
+ 
+ 	switch i.Verb {
+ 	case "env", "version":
+@@ -189,6 +199,7 @@ func (i *Invocation) run(ctx context.Context, stdout, stderr io.Writer) error {
+ 		goArgs = append(goArgs, i.BuildFlags...)
+ 		appendModFile()
+ 		appendModFlag()
++		appendOverlayFlag()
+ 		goArgs = append(goArgs, i.Args...)
+ 	}
+ 	cmd := exec.Command("go", goArgs...)
+@@ -200,7 +211,10 @@ func (i *Invocation) run(ctx context.Context, stdout, stderr io.Writer) error {
+ 	// The Go stdlib has a special feature where if the cwd and the PWD are the
+ 	// same node then it trusts the PWD, so by setting it in the env for the child
+ 	// process we fix up all the paths returned by the go command.
+-	cmd.Env = append(os.Environ(), i.Env...)
++	if !i.CleanEnv {
++		cmd.Env = os.Environ()
++	}
++	cmd.Env = append(cmd.Env, i.Env...)
+ 	if i.WorkingDir != "" {
+ 		cmd.Env = append(cmd.Env, "PWD="+i.WorkingDir)
+ 		cmd.Dir = i.WorkingDir
+@@ -241,10 +255,19 @@ func runCmdContext(ctx context.Context, cmd *exec.Cmd) error {
+ func cmdDebugStr(cmd *exec.Cmd) string {
+ 	env := make(map[string]string)
+ 	for _, kv := range cmd.Env {
+-		split := strings.Split(kv, "=")
++		split := strings.SplitN(kv, "=", 2)
+ 		k, v := split[0], split[1]
+ 		env[k] = v
+ 	}
+ 
+-	return fmt.Sprintf("GOROOT=%v GOPATH=%v GO111MODULE=%v GOPROXY=%v PWD=%v go %v", env["GOROOT"], env["GOPATH"], env["GO111MODULE"], env["GOPROXY"], env["PWD"], cmd.Args)
++	var args []string
++	for _, arg := range cmd.Args {
++		quoted := strconv.Quote(arg)
++		if quoted[1:len(quoted)-1] != arg || strings.Contains(arg, " ") {
++			args = append(args, quoted)
++		} else {
++			args = append(args, arg)
++		}
++	}
++	return fmt.Sprintf("GOROOT=%v GOPATH=%v GO111MODULE=%v GOPROXY=%v PWD=%v %v", env["GOROOT"], env["GOPATH"], env["GO111MODULE"], env["GOPROXY"], env["PWD"], strings.Join(args, " "))
+ }
+diff --git a/vendor/golang.org/x/tools/internal/gocommand/version.go b/vendor/golang.org/x/tools/internal/gocommand/version.go
+index 60d45ac..0cebac6 100644
+--- a/vendor/golang.org/x/tools/internal/gocommand/version.go
++++ b/vendor/golang.org/x/tools/internal/gocommand/version.go
+@@ -16,9 +16,20 @@ func GoVersion(ctx context.Context, inv Invocation, r *Runner) (int, error) {
+ 	inv.Verb = "list"
+ 	inv.Args = []string{"-e", "-f", `{{context.ReleaseTags}}`}
+ 	inv.Env = append(append([]string{}, inv.Env...), "GO111MODULE=off")
+-	// Unset any unneeded flags.
++	// Unset any unneeded flags, and remove them from BuildFlags, if they're
++	// present.
+ 	inv.ModFile = ""
+ 	inv.ModFlag = ""
++	var buildFlags []string
++	for _, flag := range inv.BuildFlags {
++		// Flags can be prefixed by one or two dashes.
++		f := strings.TrimPrefix(strings.TrimPrefix(flag, "-"), "-")
++		if strings.HasPrefix(f, "mod=") || strings.HasPrefix(f, "modfile=") {
++			continue
++		}
++		buildFlags = append(buildFlags, flag)
++	}
++	inv.BuildFlags = buildFlags
+ 	stdoutBytes, err := r.Run(ctx, inv)
+ 	if err != nil {
+ 		return 0, err
+diff --git a/vendor/golang.org/x/tools/internal/imports/mod.go b/vendor/golang.org/x/tools/internal/imports/mod.go
+index 8a83613..901449a 100644
+--- a/vendor/golang.org/x/tools/internal/imports/mod.go
++++ b/vendor/golang.org/x/tools/internal/imports/mod.go
+@@ -1,3 +1,7 @@
++// Copyright 2019 The Go Authors. All rights reserved.
++// Use of this source code is governed by a BSD-style
++// license that can be found in the LICENSE file.
++
+ package imports
+ 
+ import (
+@@ -88,7 +92,11 @@ func (r *ModuleResolver) init() error {
+ 	if gmc := r.env.Env["GOMODCACHE"]; gmc != "" {
+ 		r.moduleCacheDir = gmc
+ 	} else {
+-		r.moduleCacheDir = filepath.Join(filepath.SplitList(goenv["GOPATH"])[0], "/pkg/mod")
++		gopaths := filepath.SplitList(goenv["GOPATH"])
++		if len(gopaths) == 0 {
++			return fmt.Errorf("empty GOPATH")
++		}
++		r.moduleCacheDir = filepath.Join(gopaths[0], "/pkg/mod")
+ 	}
+ 
+ 	sort.Slice(r.modsByModPath, func(i, j int) bool {
+@@ -347,10 +355,11 @@ func (r *ModuleResolver) modInfo(dir string) (modDir string, modName string) {
+ 	}
+ 
+ 	if r.dirInModuleCache(dir) {
+-		matches := modCacheRegexp.FindStringSubmatch(dir)
+-		index := strings.Index(dir, matches[1]+"@"+matches[2])
+-		modDir := filepath.Join(dir[:index], matches[1]+"@"+matches[2])
+-		return modDir, readModName(filepath.Join(modDir, "go.mod"))
++		if matches := modCacheRegexp.FindStringSubmatch(dir); len(matches) == 3 {
++			index := strings.Index(dir, matches[1]+"@"+matches[2])
++			modDir := filepath.Join(dir[:index], matches[1]+"@"+matches[2])
++			return modDir, readModName(filepath.Join(modDir, "go.mod"))
++		}
+ 	}
+ 	for {
+ 		if info, ok := r.cacheLoad(dir); ok {
+diff --git a/vendor/golang.org/x/tools/internal/imports/mod_cache.go b/vendor/golang.org/x/tools/internal/imports/mod_cache.go
+index 5b4f03a..18dada4 100644
+--- a/vendor/golang.org/x/tools/internal/imports/mod_cache.go
++++ b/vendor/golang.org/x/tools/internal/imports/mod_cache.go
+@@ -1,3 +1,7 @@
++// Copyright 2019 The Go Authors. All rights reserved.
++// Use of this source code is governed by a BSD-style
++// license that can be found in the LICENSE file.
++
+ package imports
+ 
+ import (
+diff --git a/vendor/golang.org/x/tools/internal/packagesinternal/packages.go b/vendor/golang.org/x/tools/internal/packagesinternal/packages.go
+index 1335a5e..d4ec6f9 100644
+--- a/vendor/golang.org/x/tools/internal/packagesinternal/packages.go
++++ b/vendor/golang.org/x/tools/internal/packagesinternal/packages.go
+@@ -1,3 +1,7 @@
++// Copyright 2020 The Go Authors. All rights reserved.
++// Use of this source code is governed by a BSD-style
++// license that can be found in the LICENSE file.
++
+ // Package packagesinternal exposes internal-only fields from go/packages.
+ package packagesinternal
+ 
+diff --git a/vendor/golang.org/x/tools/internal/typesinternal/errorcode.go b/vendor/golang.org/x/tools/internal/typesinternal/errorcode.go
+new file mode 100644
+index 0000000..65473eb
+--- /dev/null
++++ b/vendor/golang.org/x/tools/internal/typesinternal/errorcode.go
+@@ -0,0 +1,1358 @@
++// Copyright 2020 The Go Authors. All rights reserved.
++// Use of this source code is governed by a BSD-style
++// license that can be found in the LICENSE file.
++
++package typesinternal
++
++//go:generate stringer -type=ErrorCode
++
++type ErrorCode int
++
++// This file defines the error codes that can be produced during type-checking.
++// Collectively, these codes provide an identifier that may be used to
++// implement special handling for certain types of errors.
++//
++// Error codes should be fine-grained enough that the exact nature of the error
++// can be easily determined, but coarse enough that they are not an
++// implementation detail of the type checking algorithm. As a rule-of-thumb,
++// errors should be considered equivalent if there is a theoretical refactoring
++// of the type checker in which they are emitted in exactly one place. For
++// example, the type checker emits different error messages for "too many
++// arguments" and "too few arguments", but one can imagine an alternative type
++// checker where this check instead just emits a single "wrong number of
++// arguments", so these errors should have the same code.
++//
++// Error code names should be as brief as possible while retaining accuracy and
++// distinctiveness. In most cases names should start with an adjective
++// describing the nature of the error (e.g. "invalid", "unused", "misplaced"),
++// and end with a noun identifying the relevant language object. For example,
++// "DuplicateDecl" or "InvalidSliceExpr". For brevity, naming follows the
++// convention that "bad" implies a problem with syntax, and "invalid" implies a
++// problem with types.
++
++const (
++	_ ErrorCode = iota
++
++	// Test is reserved for errors that only apply while in self-test mode.
++	Test
++
++	/* package names */
++
++	// BlankPkgName occurs when a package name is the blank identifier "_".
++	//
++	// Per the spec:
++	//  "The PackageName must not be the blank identifier."
++	BlankPkgName
++
++	// MismatchedPkgName occurs when a file's package name doesn't match the
++	// package name already established by other files.
++	MismatchedPkgName
++
++	// InvalidPkgUse occurs when a package identifier is used outside of a
++	// selector expression.
++	//
++	// Example:
++	//  import "fmt"
++	//
++	//  var _ = fmt
++	InvalidPkgUse
++
++	/* imports */
++
++	// BadImportPath occurs when an import path is not valid.
++	BadImportPath
++
++	// BrokenImport occurs when importing a package fails.
++	//
++	// Example:
++	//  import "amissingpackage"
++	BrokenImport
++
++	// ImportCRenamed occurs when the special import "C" is renamed. "C" is a
++	// pseudo-package, and must not be renamed.
++	//
++	// Example:
++	//  import _ "C"
++	ImportCRenamed
++
++	// UnusedImport occurs when an import is unused.
++	//
++	// Example:
++	//  import "fmt"
++	//
++	//  func main() {}
++	UnusedImport
++
++	/* initialization */
++
++	// InvalidInitCycle occurs when an invalid cycle is detected within the
++	// initialization graph.
++	//
++	// Example:
++	//  var x int = f()
++	//
++	//  func f() int { return x }
++	InvalidInitCycle
++
++	/* decls */
++
++	// DuplicateDecl occurs when an identifier is declared multiple times.
++	//
++	// Example:
++	//  var x = 1
++	//  var x = 2
++	DuplicateDecl
++
++	// InvalidDeclCycle occurs when a declaration cycle is not valid.
++	//
++	// Example:
++	//  import "unsafe"
++	//
++	//  type T struct {
++	//  	a [n]int
++	//  }
++	//
++	//  var n = unsafe.Sizeof(T{})
++	InvalidDeclCycle
++
++	// InvalidTypeCycle occurs when a cycle in type definitions results in a
++	// type that is not well-defined.
++	//
++	// Example:
++	//  import "unsafe"
++	//
++	//  type T [unsafe.Sizeof(T{})]int
++	InvalidTypeCycle
++
++	/* decls > const */
++
++	// InvalidConstInit occurs when a const declaration has a non-constant
++	// initializer.
++	//
++	// Example:
++	//  var x int
++	//  const _ = x
++	InvalidConstInit
++
++	// InvalidConstVal occurs when a const value cannot be converted to its
++	// target type.
++	//
++	// TODO(findleyr): this error code and example are not very clear. Consider
++	// removing it.
++	//
++	// Example:
++	//  const _ = 1 << "hello"
++	InvalidConstVal
++
++	// InvalidConstType occurs when the underlying type in a const declaration
++	// is not a valid constant type.
++	//
++	// Example:
++	//  const c *int = 4
++	InvalidConstType
++
++	/* decls > var (+ other variable assignment codes) */
++
++	// UntypedNil occurs when the predeclared (untyped) value nil is used to
++	// initialize a variable declared without an explicit type.
++	//
++	// Example:
++	//  var x = nil
++	UntypedNil
++
++	// WrongAssignCount occurs when the number of values on the right-hand side
++	// of an assignment or or initialization expression does not match the number
++	// of variables on the left-hand side.
++	//
++	// Example:
++	//  var x = 1, 2
++	WrongAssignCount
++
++	// UnassignableOperand occurs when the left-hand side of an assignment is
++	// not assignable.
++	//
++	// Example:
++	//  func f() {
++	//  	const c = 1
++	//  	c = 2
++	//  }
++	UnassignableOperand
++
++	// NoNewVar occurs when a short variable declaration (':=') does not declare
++	// new variables.
++	//
++	// Example:
++	//  func f() {
++	//  	x := 1
++	//  	x := 2
++	//  }
++	NoNewVar
++
++	// MultiValAssignOp occurs when an assignment operation (+=, *=, etc) does
++	// not have single-valued left-hand or right-hand side.
++	//
++	// Per the spec:
++	//  "In assignment operations, both the left- and right-hand expression lists
++	//  must contain exactly one single-valued expression"
++	//
++	// Example:
++	//  func f() int {
++	//  	x, y := 1, 2
++	//  	x, y += 1
++	//  	return x + y
++	//  }
++	MultiValAssignOp
++
++	// InvalidIfaceAssign occurs when a value of type T is used as an
++	// interface, but T does not implement a method of the expected interface.
++	//
++	// Example:
++	//  type I interface {
++	//  	f()
++	//  }
++	//
++	//  type T int
++	//
++	//  var x I = T(1)
++	InvalidIfaceAssign
++
++	// InvalidChanAssign occurs when a chan assignment is invalid.
++	//
++	// Per the spec, a value x is assignable to a channel type T if:
++	//  "x is a bidirectional channel value, T is a channel type, x's type V and
++	//  T have identical element types, and at least one of V or T is not a
++	//  defined type."
++	//
++	// Example:
++	//  type T1 chan int
++	//  type T2 chan int
++	//
++	//  var x T1
++	//  // Invalid assignment because both types are named
++	//  var _ T2 = x
++	InvalidChanAssign
++
++	// IncompatibleAssign occurs when the type of the right-hand side expression
++	// in an assignment cannot be assigned to the type of the variable being
++	// assigned.
++	//
++	// Example:
++	//  var x []int
++	//  var _ int = x
++	IncompatibleAssign
++
++	// UnaddressableFieldAssign occurs when trying to assign to a struct field
++	// in a map value.
++	//
++	// Example:
++	//  func f() {
++	//  	m := make(map[string]struct{i int})
++	//  	m["foo"].i = 42
++	//  }
++	UnaddressableFieldAssign
++
++	/* decls > type (+ other type expression codes) */
++
++	// NotAType occurs when the identifier used as the underlying type in a type
++	// declaration or the right-hand side of a type alias does not denote a type.
++	//
++	// Example:
++	//  var S = 2
++	//
++	//  type T S
++	NotAType
++
++	// InvalidArrayLen occurs when an array length is not a constant value.
++	//
++	// Example:
++	//  var n = 3
++	//  var _ = [n]int{}
++	InvalidArrayLen
++
++	// BlankIfaceMethod occurs when a method name is '_'.
++	//
++	// Per the spec:
++	//  "The name of each explicitly specified method must be unique and not
++	//  blank."
++	//
++	// Example:
++	//  type T interface {
++	//  	_(int)
++	//  }
++	BlankIfaceMethod
++
++	// IncomparableMapKey occurs when a map key type does not support the == and
++	// != operators.
++	//
++	// Per the spec:
++	//  "The comparison operators == and != must be fully defined for operands of
++	//  the key type; thus the key type must not be a function, map, or slice."
++	//
++	// Example:
++	//  var x map[T]int
++	//
++	//  type T []int
++	IncomparableMapKey
++
++	// InvalidIfaceEmbed occurs when a non-interface type is embedded in an
++	// interface.
++	//
++	// Example:
++	//  type T struct {}
++	//
++	//  func (T) m()
++	//
++	//  type I interface {
++	//  	T
++	//  }
++	InvalidIfaceEmbed
++
++	// InvalidPtrEmbed occurs when an embedded field is of the pointer form *T,
++	// and T itself is itself a pointer, an unsafe.Pointer, or an interface.
++	//
++	// Per the spec:
++	//  "An embedded field must be specified as a type name T or as a pointer to
++	//  a non-interface type name *T, and T itself may not be a pointer type."
++	//
++	// Example:
++	//  type T *int
++	//
++	//  type S struct {
++	//  	*T
++	//  }
++	InvalidPtrEmbed
++
++	/* decls > func and method */
++
++	// BadRecv occurs when a method declaration does not have exactly one
++	// receiver parameter.
++	//
++	// Example:
++	//  func () _() {}
++	BadRecv
++
++	// InvalidRecv occurs when a receiver type expression is not of the form T
++	// or *T, or T is a pointer type.
++	//
++	// Example:
++	//  type T struct {}
++	//
++	//  func (**T) m() {}
++	InvalidRecv
++
++	// DuplicateFieldAndMethod occurs when an identifier appears as both a field
++	// and method name.
++	//
++	// Example:
++	//  type T struct {
++	//  	m int
++	//  }
++	//
++	//  func (T) m() {}
++	DuplicateFieldAndMethod
++
++	// DuplicateMethod occurs when two methods on the same receiver type have
++	// the same name.
++	//
++	// Example:
++	//  type T struct {}
++	//  func (T) m() {}
++	//  func (T) m(i int) int { return i }
++	DuplicateMethod
++
++	/* decls > special */
++
++	// InvalidBlank occurs when a blank identifier is used as a value or type.
++	//
++	// Per the spec:
++	//  "The blank identifier may appear as an operand only on the left-hand side
++	//  of an assignment."
++	//
++	// Example:
++	//  var x = _
++	InvalidBlank
++
++	// InvalidIota occurs when the predeclared identifier iota is used outside
++	// of a constant declaration.
++	//
++	// Example:
++	//  var x = iota
++	InvalidIota
++
++	// MissingInitBody occurs when an init function is missing its body.
++	//
++	// Example:
++	//  func init()
++	MissingInitBody
++
++	// InvalidInitSig occurs when an init function declares parameters or
++	// results.
++	//
++	// Example:
++	//  func init() int { return 1 }
++	InvalidInitSig
++
++	// InvalidInitDecl occurs when init is declared as anything other than a
++	// function.
++	//
++	// Example:
++	//  var init = 1
++	InvalidInitDecl
++
++	// InvalidMainDecl occurs when main is declared as anything other than a
++	// function, in a main package.
++	InvalidMainDecl
++
++	/* exprs */
++
++	// TooManyValues occurs when a function returns too many values for the
++	// expression context in which it is used.
++	//
++	// Example:
++	//  func ReturnTwo() (int, int) {
++	//  	return 1, 2
++	//  }
++	//
++	//  var x = ReturnTwo()
++	TooManyValues
++
++	// NotAnExpr occurs when a type expression is used where a value expression
++	// is expected.
++	//
++	// Example:
++	//  type T struct {}
++	//
++	//  func f() {
++	//  	T
++	//  }
++	NotAnExpr
++
++	/* exprs > const */
++
++	// TruncatedFloat occurs when a float constant is truncated to an integer
++	// value.
++	//
++	// Example:
++	//  var _ int = 98.6
++	TruncatedFloat
++
++	// NumericOverflow occurs when a numeric constant overflows its target type.
++	//
++	// Example:
++	//  var x int8 = 1000
++	NumericOverflow
++
++	/* exprs > operation */
++
++	// UndefinedOp occurs when an operator is not defined for the type(s) used
++	// in an operation.
++	//
++	// Example:
++	//  var c = "a" - "b"
++	UndefinedOp
++
++	// MismatchedTypes occurs when operand types are incompatible in a binary
++	// operation.
++	//
++	// Example:
++	//  var a = "hello"
++	//  var b = 1
++	//  var c = a - b
++	MismatchedTypes
++
++	// DivByZero occurs when a division operation is provable at compile
++	// time to be a division by zero.
++	//
++	// Example:
++	//  const divisor = 0
++	//  var x int = 1/divisor
++	DivByZero
++
++	// NonNumericIncDec occurs when an increment or decrement operator is
++	// applied to a non-numeric value.
++	//
++	// Example:
++	//  func f() {
++	//  	var c = "c"
++	//  	c++
++	//  }
++	NonNumericIncDec
++
++	/* exprs > ptr */
++
++	// UnaddressableOperand occurs when the & operator is applied to an
++	// unaddressable expression.
++	//
++	// Example:
++	//  var x = &1
++	UnaddressableOperand
++
++	// InvalidIndirection occurs when a non-pointer value is indirected via the
++	// '*' operator.
++	//
++	// Example:
++	//  var x int
++	//  var y = *x
++	InvalidIndirection
++
++	/* exprs > [] */
++
++	// NonIndexableOperand occurs when an index operation is applied to a value
++	// that cannot be indexed.
++	//
++	// Example:
++	//  var x = 1
++	//  var y = x[1]
++	NonIndexableOperand
++
++	// InvalidIndex occurs when an index argument is not of integer type,
++	// negative, or out-of-bounds.
++	//
++	// Example:
++	//  var s = [...]int{1,2,3}
++	//  var x = s[5]
++	//
++	// Example:
++	//  var s = []int{1,2,3}
++	//  var _ = s[-1]
++	//
++	// Example:
++	//  var s = []int{1,2,3}
++	//  var i string
++	//  var _ = s[i]
++	InvalidIndex
++
++	// SwappedSliceIndices occurs when constant indices in a slice expression
++	// are decreasing in value.
++	//
++	// Example:
++	//  var _ = []int{1,2,3}[2:1]
++	SwappedSliceIndices
++
++	/* operators > slice */
++
++	// NonSliceableOperand occurs when a slice operation is applied to a value
++	// whose type is not sliceable, or is unaddressable.
++	//
++	// Example:
++	//  var x = [...]int{1, 2, 3}[:1]
++	//
++	// Example:
++	//  var x = 1
++	//  var y = 1[:1]
++	NonSliceableOperand
++
++	// InvalidSliceExpr occurs when a three-index slice expression (a[x:y:z]) is
++	// applied to a string.
++	//
++	// Example:
++	//  var s = "hello"
++	//  var x = s[1:2:3]
++	InvalidSliceExpr
++
++	/* exprs > shift */
++
++	// InvalidShiftCount occurs when the right-hand side of a shift operation is
++	// either non-integer, negative, or too large.
++	//
++	// Example:
++	//  var (
++	//  	x string
++	//  	y int = 1 << x
++	//  )
++	InvalidShiftCount
++
++	// InvalidShiftOperand occurs when the shifted operand is not an integer.
++	//
++	// Example:
++	//  var s = "hello"
++	//  var x = s << 2
++	InvalidShiftOperand
++
++	/* exprs > chan */
++
++	// InvalidReceive occurs when there is a channel receive from a value that
++	// is either not a channel, or is a send-only channel.
++	//
++	// Example:
++	//  func f() {
++	//  	var x = 1
++	//  	<-x
++	//  }
++	InvalidReceive
++
++	// InvalidSend occurs when there is a channel send to a value that is not a
++	// channel, or is a receive-only channel.
++	//
++	// Example:
++	//  func f() {
++	//  	var x = 1
++	//  	x <- "hello!"
++	//  }
++	InvalidSend
++
++	/* exprs > literal */
++
++	// DuplicateLitKey occurs when an index is duplicated in a slice, array, or
++	// map literal.
++	//
++	// Example:
++	//  var _ = []int{0:1, 0:2}
++	//
++	// Example:
++	//  var _ = map[string]int{"a": 1, "a": 2}
++	DuplicateLitKey
++
++	// MissingLitKey occurs when a map literal is missing a key expression.
++	//
++	// Example:
++	//  var _ = map[string]int{1}
++	MissingLitKey
++
++	// InvalidLitIndex occurs when the key in a key-value element of a slice or
++	// array literal is not an integer constant.
++	//
++	// Example:
++	//  var i = 0
++	//  var x = []string{i: "world"}
++	InvalidLitIndex
++
++	// OversizeArrayLit occurs when an array literal exceeds its length.
++	//
++	// Example:
++	//  var _ = [2]int{1,2,3}
++	OversizeArrayLit
++
++	// MixedStructLit occurs when a struct literal contains a mix of positional
++	// and named elements.
++	//
++	// Example:
++	//  var _ = struct{i, j int}{i: 1, 2}
++	MixedStructLit
++
++	// InvalidStructLit occurs when a positional struct literal has an incorrect
++	// number of values.
++	//
++	// Example:
++	//  var _ = struct{i, j int}{1,2,3}
++	InvalidStructLit
++
++	// MissingLitField occurs when a struct literal refers to a field that does
++	// not exist on the struct type.
++	//
++	// Example:
++	//  var _ = struct{i int}{j: 2}
++	MissingLitField
++
++	// DuplicateLitField occurs when a struct literal contains duplicated
++	// fields.
++	//
++	// Example:
++	//  var _ = struct{i int}{i: 1, i: 2}
++	DuplicateLitField
++
++	// UnexportedLitField occurs when a positional struct literal implicitly
++	// assigns an unexported field of an imported type.
++	UnexportedLitField
++
++	// InvalidLitField occurs when a field name is not a valid identifier.
++	//
++	// Example:
++	//  var _ = struct{i int}{1: 1}
++	InvalidLitField
++
++	// UntypedLit occurs when a composite literal omits a required type
++	// identifier.
++	//
++	// Example:
++	//  type outer struct{
++	//  	inner struct { i int }
++	//  }
++	//
++	//  var _ = outer{inner: {1}}
++	UntypedLit
++
++	// InvalidLit occurs when a composite literal expression does not match its
++	// type.
++	//
++	// Example:
++	//  type P *struct{
++	//  	x int
++	//  }
++	//  var _ = P {}
++	InvalidLit
++
++	/* exprs > selector */
++
++	// AmbiguousSelector occurs when a selector is ambiguous.
++	//
++	// Example:
++	//  type E1 struct { i int }
++	//  type E2 struct { i int }
++	//  type T struct { E1; E2 }
++	//
++	//  var x T
++	//  var _ = x.i
++	AmbiguousSelector
++
++	// UndeclaredImportedName occurs when a package-qualified identifier is
++	// undeclared by the imported package.
++	//
++	// Example:
++	//  import "go/types"
++	//
++	//  var _ = types.NotAnActualIdentifier
++	UndeclaredImportedName
++
++	// UnexportedName occurs when a selector refers to an unexported identifier
++	// of an imported package.
++	//
++	// Example:
++	//  import "reflect"
++	//
++	//  type _ reflect.flag
++	UnexportedName
++
++	// UndeclaredName occurs when an identifier is not declared in the current
++	// scope.
++	//
++	// Example:
++	//  var x T
++	UndeclaredName
++
++	// MissingFieldOrMethod occurs when a selector references a field or method
++	// that does not exist.
++	//
++	// Example:
++	//  type T struct {}
++	//
++	//  var x = T{}.f
++	MissingFieldOrMethod
++
++	/* exprs > ... */
++
++	// BadDotDotDotSyntax occurs when a "..." occurs in a context where it is
++	// not valid.
++	//
++	// Example:
++	//  var _ = map[int][...]int{0: {}}
++	BadDotDotDotSyntax
++
++	// NonVariadicDotDotDot occurs when a "..." is used on the final argument to
++	// a non-variadic function.
++	//
++	// Example:
++	//  func printArgs(s []string) {
++	//  	for _, a := range s {
++	//  		println(a)
++	//  	}
++	//  }
++	//
++	//  func f() {
++	//  	s := []string{"a", "b", "c"}
++	//  	printArgs(s...)
++	//  }
++	NonVariadicDotDotDot
++
++	// MisplacedDotDotDot occurs when a "..." is used somewhere other than the
++	// final argument to a function call.
++	//
++	// Example:
++	//  func printArgs(args ...int) {
++	//  	for _, a := range args {
++	//  		println(a)
++	//  	}
++	//  }
++	//
++	//  func f() {
++	//  	a := []int{1,2,3}
++	//  	printArgs(0, a...)
++	//  }
++	MisplacedDotDotDot
++
++	// InvalidDotDotDotOperand occurs when a "..." operator is applied to a
++	// single-valued operand.
++	//
++	// Example:
++	//  func printArgs(args ...int) {
++	//  	for _, a := range args {
++	//  		println(a)
++	//  	}
++	//  }
++	//
++	//  func f() {
++	//  	a := 1
++	//  	printArgs(a...)
++	//  }
++	//
++	// Example:
++	//  func args() (int, int) {
++	//  	return 1, 2
++	//  }
++	//
++	//  func printArgs(args ...int) {
++	//  	for _, a := range args {
++	//  		println(a)
++	//  	}
++	//  }
++	//
++	//  func g() {
++	//  	printArgs(args()...)
++	//  }
++	InvalidDotDotDotOperand
++
++	// InvalidDotDotDot occurs when a "..." is used in a non-variadic built-in
++	// function.
++	//
++	// Example:
++	//  var s = []int{1, 2, 3}
++	//  var l = len(s...)
++	InvalidDotDotDot
++
++	/* exprs > built-in */
++
++	// UncalledBuiltin occurs when a built-in function is used as a
++	// function-valued expression, instead of being called.
++	//
++	// Per the spec:
++	//  "The built-in functions do not have standard Go types, so they can only
++	//  appear in call expressions; they cannot be used as function values."
++	//
++	// Example:
++	//  var _ = copy
++	UncalledBuiltin
++
++	// InvalidAppend occurs when append is called with a first argument that is
++	// not a slice.
++	//
++	// Example:
++	//  var _ = append(1, 2)
++	InvalidAppend
++
++	// InvalidCap occurs when an argument to the cap built-in function is not of
++	// supported type.
++	//
++	// See https://golang.org/ref/spec#Lengthand_capacity for information on
++	// which underlying types are supported as arguments to cap and len.
++	//
++	// Example:
++	//  var s = 2
++	//  var x = cap(s)
++	InvalidCap
++
++	// InvalidClose occurs when close(...) is called with an argument that is
++	// not of channel type, or that is a receive-only channel.
++	//
++	// Example:
++	//  func f() {
++	//  	var x int
++	//  	close(x)
++	//  }
++	InvalidClose
++
++	// InvalidCopy occurs when the arguments are not of slice type or do not
++	// have compatible type.
++	//
++	// See https://golang.org/ref/spec#Appendingand_copying_slices for more
++	// information on the type requirements for the copy built-in.
++	//
++	// Example:
++	//  func f() {
++	//  	var x []int
++	//  	y := []int64{1,2,3}
++	//  	copy(x, y)
++	//  }
++	InvalidCopy
++
++	// InvalidComplex occurs when the complex built-in function is called with
++	// arguments with incompatible types.
++	//
++	// Example:
++	//  var _ = complex(float32(1), float64(2))
++	InvalidComplex
++
++	// InvalidDelete occurs when the delete built-in function is called with a
++	// first argument that is not a map.
++	//
++	// Example:
++	//  func f() {
++	//  	m := "hello"
++	//  	delete(m, "e")
++	//  }
++	InvalidDelete
++
++	// InvalidImag occurs when the imag built-in function is called with an
++	// argument that does not have complex type.
++	//
++	// Example:
++	//  var _ = imag(int(1))
++	InvalidImag
++
++	// InvalidLen occurs when an argument to the len built-in function is not of
++	// supported type.
++	//
++	// See https://golang.org/ref/spec#Lengthand_capacity for information on
++	// which underlying types are supported as arguments to cap and len.
++	//
++	// Example:
++	//  var s = 2
++	//  var x = len(s)
++	InvalidLen
++
++	// SwappedMakeArgs occurs when make is called with three arguments, and its
++	// length argument is larger than its capacity argument.
++	//
++	// Example:
++	//  var x = make([]int, 3, 2)
++	SwappedMakeArgs
++
++	// InvalidMake occurs when make is called with an unsupported type argument.
++	//
++	// See https://golang.org/ref/spec#Makingslices_maps_and_channels for
++	// information on the types that may be created using make.
++	//
++	// Example:
++	//  var x = make(int)
++	InvalidMake
++
++	// InvalidReal occurs when the real built-in function is called with an
++	// argument that does not have complex type.
++	//
++	// Example:
++	//  var _ = real(int(1))
++	InvalidReal
++
++	/* exprs > assertion */
++
++	// InvalidAssert occurs when a type assertion is applied to a
++	// value that is not of interface type.
++	//
++	// Example:
++	//  var x = 1
++	//  var _ = x.(float64)
++	InvalidAssert
++
++	// ImpossibleAssert occurs for a type assertion x.(T) when the value x of
++	// interface cannot have dynamic type T, due to a missing or mismatching
++	// method on T.
++	//
++	// Example:
++	//  type T int
++	//
++	//  func (t *T) m() int { return int(*t) }
++	//
++	//  type I interface { m() int }
++	//
++	//  var x I
++	//  var _ = x.(T)
++	ImpossibleAssert
++
++	/* exprs > conversion */
++
++	// InvalidConversion occurs when the argument type cannot be converted to the
++	// target.
++	//
++	// See https://golang.org/ref/spec#Conversions for the rules of
++	// convertibility.
++	//
++	// Example:
++	//  var x float64
++	//  var _ = string(x)
++	InvalidConversion
++
++	// InvalidUntypedConversion occurs when an there is no valid implicit
++	// conversion from an untyped value satisfying the type constraints of the
++	// context in which it is used.
++	//
++	// Example:
++	//  var _ = 1 + ""
++	InvalidUntypedConversion
++
++	/* offsetof */
++
++	// BadOffsetofSyntax occurs when unsafe.Offsetof is called with an argument
++	// that is not a selector expression.
++	//
++	// Example:
++	//  import "unsafe"
++	//
++	//  var x int
++	//  var _ = unsafe.Offsetof(x)
++	BadOffsetofSyntax
++
++	// InvalidOffsetof occurs when unsafe.Offsetof is called with a method
++	// selector, rather than a field selector, or when the field is embedded via
++	// a pointer.
++	//
++	// Per the spec:
++	//
++	//  "If f is an embedded field, it must be reachable without pointer
++	//  indirections through fields of the struct. "
++	//
++	// Example:
++	//  import "unsafe"
++	//
++	//  type T struct { f int }
++	//  type S struct { *T }
++	//  var s S
++	//  var _ = unsafe.Offsetof(s.f)
++	//
++	// Example:
++	//  import "unsafe"
++	//
++	//  type S struct{}
++	//
++	//  func (S) m() {}
++	//
++	//  var s S
++	//  var _ = unsafe.Offsetof(s.m)
++	InvalidOffsetof
++
++	/* control flow > scope */
++
++	// UnusedExpr occurs when a side-effect free expression is used as a
++	// statement. Such a statement has no effect.
++	//
++	// Example:
++	//  func f(i int) {
++	//  	i*i
++	//  }
++	UnusedExpr
++
++	// UnusedVar occurs when a variable is declared but unused.
++	//
++	// Example:
++	//  func f() {
++	//  	x := 1
++	//  }
++	UnusedVar
++
++	// MissingReturn occurs when a function with results is missing a return
++	// statement.
++	//
++	// Example:
++	//  func f() int {}
++	MissingReturn
++
++	// WrongResultCount occurs when a return statement returns an incorrect
++	// number of values.
++	//
++	// Example:
++	//  func ReturnOne() int {
++	//  	return 1, 2
++	//  }
++	WrongResultCount
++
++	// OutOfScopeResult occurs when the name of a value implicitly returned by
++	// an empty return statement is shadowed in a nested scope.
++	//
++	// Example:
++	//  func factor(n int) (i int) {
++	//  	for i := 2; i < n; i++ {
++	//  		if n%i == 0 {
++	//  			return
++	//  		}
++	//  	}
++	//  	return 0
++	//  }
++	OutOfScopeResult
++
++	/* control flow > if */
++
++	// InvalidCond occurs when an if condition is not a boolean expression.
++	//
++	// Example:
++	//  func checkReturn(i int) {
++	//  	if i {
++	//  		panic("non-zero return")
++	//  	}
++	//  }
++	InvalidCond
++
++	/* control flow > for */
++
++	// InvalidPostDecl occurs when there is a declaration in a for-loop post
++	// statement.
++	//
++	// Example:
++	//  func f() {
++	//  	for i := 0; i < 10; j := 0 {}
++	//  }
++	InvalidPostDecl
++
++	// InvalidChanRange occurs when a send-only channel used in a range
++	// expression.
++	//
++	// Example:
++	//  func sum(c chan<- int) {
++	//  	s := 0
++	//  	for i := range c {
++	//  		s += i
++	//  	}
++	//  }
++	InvalidChanRange
++
++	// InvalidIterVar occurs when two iteration variables are used while ranging
++	// over a channel.
++	//
++	// Example:
++	//  func f(c chan int) {
++	//  	for k, v := range c {
++	//  		println(k, v)
++	//  	}
++	//  }
++	InvalidIterVar
++
++	// InvalidRangeExpr occurs when the type of a range expression is not array,
++	// slice, string, map, or channel.
++	//
++	// Example:
++	//  func f(i int) {
++	//  	for j := range i {
++	//  		println(j)
++	//  	}
++	//  }
++	InvalidRangeExpr
++
++	/* control flow > switch */
++
++	// MisplacedBreak occurs when a break statement is not within a for, switch,
++	// or select statement of the innermost function definition.
++	//
++	// Example:
++	//  func f() {
++	//  	break
++	//  }
++	MisplacedBreak
++
++	// MisplacedContinue occurs when a continue statement is not within a for
++	// loop of the innermost function definition.
++	//
++	// Example:
++	//  func sumeven(n int) int {
++	//  	proceed := func() {
++	//  		continue
++	//  	}
++	//  	sum := 0
++	//  	for i := 1; i <= n; i++ {
++	//  		if i % 2 != 0 {
++	//  			proceed()
++	//  		}
++	//  		sum += i
++	//  	}
++	//  	return sum
++	//  }
++	MisplacedContinue
++
++	// MisplacedFallthrough occurs when a fallthrough statement is not within an
++	// expression switch.
++	//
++	// Example:
++	//  func typename(i interface{}) string {
++	//  	switch i.(type) {
++	//  	case int64:
++	//  		fallthrough
++	//  	case int:
++	//  		return "int"
++	//  	}
++	//  	return "unsupported"
++	//  }
++	MisplacedFallthrough
++
++	// DuplicateCase occurs when a type or expression switch has duplicate
++	// cases.
++	//
++	// Example:
++	//  func printInt(i int) {
++	//  	switch i {
++	//  	case 1:
++	//  		println("one")
++	//  	case 1:
++	//  		println("One")
++	//  	}
++	//  }
++	DuplicateCase
++
++	// DuplicateDefault occurs when a type or expression switch has multiple
++	// default clauses.
++	//
++	// Example:
++	//  func printInt(i int) {
++	//  	switch i {
++	//  	case 1:
++	//  		println("one")
++	//  	default:
++	//  		println("One")
++	//  	default:
++	//  		println("1")
++	//  	}
++	//  }
++	DuplicateDefault
++
++	// BadTypeKeyword occurs when a .(type) expression is used anywhere other
++	// than a type switch.
++	//
++	// Example:
++	//  type I interface {
++	//  	m()
++	//  }
++	//  var t I
++	//  var _ = t.(type)
++	BadTypeKeyword
++
++	// InvalidTypeSwitch occurs when .(type) is used on an expression that is
++	// not of interface type.
++	//
++	// Example:
++	//  func f(i int) {
++	//  	switch x := i.(type) {}
++	//  }
++	InvalidTypeSwitch
++
++	/* control flow > select */
++
++	// InvalidSelectCase occurs when a select case is not a channel send or
++	// receive.
++	//
++	// Example:
++	//  func checkChan(c <-chan int) bool {
++	//  	select {
++	//  	case c:
++	//  		return true
++	//  	default:
++	//  		return false
++	//  	}
++	//  }
++	InvalidSelectCase
++
++	/* control flow > labels and jumps */
++
++	// UndeclaredLabel occurs when an undeclared label is jumped to.
++	//
++	// Example:
++	//  func f() {
++	//  	goto L
++	//  }
++	UndeclaredLabel
++
++	// DuplicateLabel occurs when a label is declared more than once.
++	//
++	// Example:
++	//  func f() int {
++	//  L:
++	//  L:
++	//  	return 1
++	//  }
++	DuplicateLabel
++
++	// MisplacedLabel occurs when a break or continue label is not on a for,
++	// switch, or select statement.
++	//
++	// Example:
++	//  func f() {
++	//  L:
++	//  	a := []int{1,2,3}
++	//  	for _, e := range a {
++	//  		if e > 10 {
++	//  			break L
++	//  		}
++	//  		println(a)
++	//  	}
++	//  }
++	MisplacedLabel
++
++	// UnusedLabel occurs when a label is declared but not used.
++	//
++	// Example:
++	//  func f() {
++	//  L:
++	//  }
++	UnusedLabel
++
++	// JumpOverDecl occurs when a label jumps over a variable declaration.
++	//
++	// Example:
++	//  func f() int {
++	//  	goto L
++	//  	x := 2
++	//  L:
++	//  	x++
++	//  	return x
++	//  }
++	JumpOverDecl
++
++	// JumpIntoBlock occurs when a forward jump goes to a label inside a nested
++	// block.
++	//
++	// Example:
++	//  func f(x int) {
++	//  	goto L
++	//  	if x > 0 {
++	//  	L:
++	//  		print("inside block")
++	//  	}
++	// }
++	JumpIntoBlock
++
++	/* control flow > calls */
++
++	// InvalidMethodExpr occurs when a pointer method is called but the argument
++	// is not addressable.
++	//
++	// Example:
++	//  type T struct {}
++	//
++	//  func (*T) m() int { return 1 }
++	//
++	//  var _ = T.m(T{})
++	InvalidMethodExpr
++
++	// WrongArgCount occurs when too few or too many arguments are passed by a
++	// function call.
++	//
++	// Example:
++	//  func f(i int) {}
++	//  var x = f()
++	WrongArgCount
++
++	// InvalidCall occurs when an expression is called that is not of function
++	// type.
++	//
++	// Example:
++	//  var x = "x"
++	//  var y = x()
++	InvalidCall
++
++	/* control flow > suspended */
++
++	// UnusedResults occurs when a restricted expression-only built-in function
++	// is suspended via go or defer. Such a suspension discards the results of
++	// these side-effect free built-in functions, and therefore is ineffectual.
++	//
++	// Example:
++	//  func f(a []int) int {
++	//  	defer len(a)
++	//  	return i
++	//  }
++	UnusedResults
++
++	// InvalidDefer occurs when a deferred expression is not a function call,
++	// for example if the expression is a type conversion.
++	//
++	// Example:
++	//  func f(i int) int {
++	//  	defer int32(i)
++	//  	return i
++	//  }
++	InvalidDefer
++
++	// InvalidGo occurs when a go expression is not a function call, for example
++	// if the expression is a type conversion.
++	//
++	// Example:
++	//  func f(i int) int {
++	//  	go int32(i)
++	//  	return i
++	//  }
++	InvalidGo
++)
+diff --git a/vendor/golang.org/x/tools/internal/typesinternal/errorcode_string.go b/vendor/golang.org/x/tools/internal/typesinternal/errorcode_string.go
+new file mode 100644
+index 0000000..97f3ec8
+--- /dev/null
++++ b/vendor/golang.org/x/tools/internal/typesinternal/errorcode_string.go
+@@ -0,0 +1,152 @@
++// Code generated by "stringer -type=ErrorCode"; DO NOT EDIT.
++
++package typesinternal
++
++import "strconv"
++
++func _() {
++	// An "invalid array index" compiler error signifies that the constant values have changed.
++	// Re-run the stringer command to generate them again.
++	var x [1]struct{}
++	_ = x[Test-1]
++	_ = x[BlankPkgName-2]
++	_ = x[MismatchedPkgName-3]
++	_ = x[InvalidPkgUse-4]
++	_ = x[BadImportPath-5]
++	_ = x[BrokenImport-6]
++	_ = x[ImportCRenamed-7]
++	_ = x[UnusedImport-8]
++	_ = x[InvalidInitCycle-9]
++	_ = x[DuplicateDecl-10]
++	_ = x[InvalidDeclCycle-11]
++	_ = x[InvalidTypeCycle-12]
++	_ = x[InvalidConstInit-13]
++	_ = x[InvalidConstVal-14]
++	_ = x[InvalidConstType-15]
++	_ = x[UntypedNil-16]
++	_ = x[WrongAssignCount-17]
++	_ = x[UnassignableOperand-18]
++	_ = x[NoNewVar-19]
++	_ = x[MultiValAssignOp-20]
++	_ = x[InvalidIfaceAssign-21]
++	_ = x[InvalidChanAssign-22]
++	_ = x[IncompatibleAssign-23]
++	_ = x[UnaddressableFieldAssign-24]
++	_ = x[NotAType-25]
++	_ = x[InvalidArrayLen-26]
++	_ = x[BlankIfaceMethod-27]
++	_ = x[IncomparableMapKey-28]
++	_ = x[InvalidIfaceEmbed-29]
++	_ = x[InvalidPtrEmbed-30]
++	_ = x[BadRecv-31]
++	_ = x[InvalidRecv-32]
++	_ = x[DuplicateFieldAndMethod-33]
++	_ = x[DuplicateMethod-34]
++	_ = x[InvalidBlank-35]
++	_ = x[InvalidIota-36]
++	_ = x[MissingInitBody-37]
++	_ = x[InvalidInitSig-38]
++	_ = x[InvalidInitDecl-39]
++	_ = x[InvalidMainDecl-40]
++	_ = x[TooManyValues-41]
++	_ = x[NotAnExpr-42]
++	_ = x[TruncatedFloat-43]
++	_ = x[NumericOverflow-44]
++	_ = x[UndefinedOp-45]
++	_ = x[MismatchedTypes-46]
++	_ = x[DivByZero-47]
++	_ = x[NonNumericIncDec-48]
++	_ = x[UnaddressableOperand-49]
++	_ = x[InvalidIndirection-50]
++	_ = x[NonIndexableOperand-51]
++	_ = x[InvalidIndex-52]
++	_ = x[SwappedSliceIndices-53]
++	_ = x[NonSliceableOperand-54]
++	_ = x[InvalidSliceExpr-55]
++	_ = x[InvalidShiftCount-56]
++	_ = x[InvalidShiftOperand-57]
++	_ = x[InvalidReceive-58]
++	_ = x[InvalidSend-59]
++	_ = x[DuplicateLitKey-60]
++	_ = x[MissingLitKey-61]
++	_ = x[InvalidLitIndex-62]
++	_ = x[OversizeArrayLit-63]
++	_ = x[MixedStructLit-64]
++	_ = x[InvalidStructLit-65]
++	_ = x[MissingLitField-66]
++	_ = x[DuplicateLitField-67]
++	_ = x[UnexportedLitField-68]
++	_ = x[InvalidLitField-69]
++	_ = x[UntypedLit-70]
++	_ = x[InvalidLit-71]
++	_ = x[AmbiguousSelector-72]
++	_ = x[UndeclaredImportedName-73]
++	_ = x[UnexportedName-74]
++	_ = x[UndeclaredName-75]
++	_ = x[MissingFieldOrMethod-76]
++	_ = x[BadDotDotDotSyntax-77]
++	_ = x[NonVariadicDotDotDot-78]
++	_ = x[MisplacedDotDotDot-79]
++	_ = x[InvalidDotDotDotOperand-80]
++	_ = x[InvalidDotDotDot-81]
++	_ = x[UncalledBuiltin-82]
++	_ = x[InvalidAppend-83]
++	_ = x[InvalidCap-84]
++	_ = x[InvalidClose-85]
++	_ = x[InvalidCopy-86]
++	_ = x[InvalidComplex-87]
++	_ = x[InvalidDelete-88]
++	_ = x[InvalidImag-89]
++	_ = x[InvalidLen-90]
++	_ = x[SwappedMakeArgs-91]
++	_ = x[InvalidMake-92]
++	_ = x[InvalidReal-93]
++	_ = x[InvalidAssert-94]
++	_ = x[ImpossibleAssert-95]
++	_ = x[InvalidConversion-96]
++	_ = x[InvalidUntypedConversion-97]
++	_ = x[BadOffsetofSyntax-98]
++	_ = x[InvalidOffsetof-99]
++	_ = x[UnusedExpr-100]
++	_ = x[UnusedVar-101]
++	_ = x[MissingReturn-102]
++	_ = x[WrongResultCount-103]
++	_ = x[OutOfScopeResult-104]
++	_ = x[InvalidCond-105]
++	_ = x[InvalidPostDecl-106]
++	_ = x[InvalidChanRange-107]
++	_ = x[InvalidIterVar-108]
++	_ = x[InvalidRangeExpr-109]
++	_ = x[MisplacedBreak-110]
++	_ = x[MisplacedContinue-111]
++	_ = x[MisplacedFallthrough-112]
++	_ = x[DuplicateCase-113]
++	_ = x[DuplicateDefault-114]
++	_ = x[BadTypeKeyword-115]
++	_ = x[InvalidTypeSwitch-116]
++	_ = x[InvalidSelectCase-117]
++	_ = x[UndeclaredLabel-118]
++	_ = x[DuplicateLabel-119]
++	_ = x[MisplacedLabel-120]
++	_ = x[UnusedLabel-121]
++	_ = x[JumpOverDecl-122]
++	_ = x[JumpIntoBlock-123]
++	_ = x[InvalidMethodExpr-124]
++	_ = x[WrongArgCount-125]
++	_ = x[InvalidCall-126]
++	_ = x[UnusedResults-127]
++	_ = x[InvalidDefer-128]
++	_ = x[InvalidGo-129]
++}
++
++const _ErrorCode_name = "TestBlankPkgNameMismatchedPkgNameInvalidPkgUseBadImportPathBrokenImportImportCRenamedUnusedImportInvalidInitCycleDuplicateDeclInvalidDeclCycleInvalidTypeCycleInvalidConstInitInvalidConstValInvalidConstTypeUntypedNilWrongAssignCountUnassignableOperandNoNewVarMultiValAssignOpInvalidIfaceAssignInvalidChanAssignIncompatibleAssignUnaddressableFieldAssignNotATypeInvalidArrayLenBlankIfaceMethodIncomparableMapKeyInvalidIfaceEmbedInvalidPtrEmbedBadRecvInvalidRecvDuplicateFieldAndMethodDuplicateMethodInvalidBlankInvalidIotaMissingInitBodyInvalidInitSigInvalidInitDeclInvalidMainDeclTooManyValuesNotAnExprTruncatedFloatNumericOverflowUndefinedOpMismatchedTypesDivByZeroNonNumericIncDecUnaddressableOperandInvalidIndirectionNonIndexableOperandInvalidIndexSwappedSliceIndicesNonSliceableOperandInvalidSliceExprInvalidShiftCountInvalidShiftOperandInvalidReceiveInvalidSendDuplicateLitKeyMissingLitKeyInvalidLitIndexOversizeArrayLitMixedStructLitInvalidStructLitMissingLitFieldDuplicateLitFieldUnexportedLitFieldInvalidLitFieldUntypedLitInvalidLitAmbiguousSelectorUndeclaredImportedNameUnexportedNameUndeclaredNameMissingFieldOrMethodBadDotDotDotSyntaxNonVariadicDotDotDotMisplacedDotDotDotInvalidDotDotDotOperandInvalidDotDotDotUncalledBuiltinInvalidAppendInvalidCapInvalidCloseInvalidCopyInvalidComplexInvalidDeleteInvalidImagInvalidLenSwappedMakeArgsInvalidMakeInvalidRealInvalidAssertImpossibleAssertInvalidConversionInvalidUntypedConversionBadOffsetofSyntaxInvalidOffsetofUnusedExprUnusedVarMissingReturnWrongResultCountOutOfScopeResultInvalidCondInvalidPostDeclInvalidChanRangeInvalidIterVarInvalidRangeExprMisplacedBreakMisplacedContinueMisplacedFallthroughDuplicateCaseDuplicateDefaultBadTypeKeywordInvalidTypeSwitchInvalidSelectCaseUndeclaredLabelDuplicateLabelMisplacedLabelUnusedLabelJumpOverDeclJumpIntoBlockInvalidMethodExprWrongArgCountInvalidCallUnusedResultsInvalidDeferInvalidGo"
++
++var _ErrorCode_index = [...]uint16{0, 4, 16, 33, 46, 59, 71, 85, 97, 113, 126, 142, 158, 174, 189, 205, 215, 231, 250, 258, 274, 292, 309, 327, 351, 359, 374, 390, 408, 425, 440, 447, 458, 481, 496, 508, 519, 534, 548, 563, 578, 591, 600, 614, 629, 640, 655, 664, 680, 700, 718, 737, 749, 768, 787, 803, 820, 839, 853, 864, 879, 892, 907, 923, 937, 953, 968, 985, 1003, 1018, 1028, 1038, 1055, 1077, 1091, 1105, 1125, 1143, 1163, 1181, 1204, 1220, 1235, 1248, 1258, 1270, 1281, 1295, 1308, 1319, 1329, 1344, 1355, 1366, 1379, 1395, 1412, 1436, 1453, 1468, 1478, 1487, 1500, 1516, 1532, 1543, 1558, 1574, 1588, 1604, 1618, 1635, 1655, 1668, 1684, 1698, 1715, 1732, 1747, 1761, 1775, 1786, 1798, 1811, 1828, 1841, 1852, 1865, 1877, 1886}
++
++func (i ErrorCode) String() string {
++	i -= 1
++	if i < 0 || i >= ErrorCode(len(_ErrorCode_index)-1) {
++		return "ErrorCode(" + strconv.FormatInt(int64(i+1), 10) + ")"
++	}
++	return _ErrorCode_name[_ErrorCode_index[i]:_ErrorCode_index[i+1]]
++}
+diff --git a/vendor/golang.org/x/tools/internal/typesinternal/types.go b/vendor/golang.org/x/tools/internal/typesinternal/types.go
+index a5bb408..c3e1a39 100644
+--- a/vendor/golang.org/x/tools/internal/typesinternal/types.go
++++ b/vendor/golang.org/x/tools/internal/typesinternal/types.go
+@@ -2,9 +2,12 @@
+ // Use of this source code is governed by a BSD-style
+ // license that can be found in the LICENSE file.
+ 
++// Package typesinternal provides access to internal go/types APIs that are not
++// yet exported.
+ package typesinternal
+ 
+ import (
++	"go/token"
+ 	"go/types"
+ 	"reflect"
+ 	"unsafe"
+@@ -26,3 +29,17 @@ func SetUsesCgo(conf *types.Config) bool {
+ 
+ 	return true
+ }
++
++func ReadGo116ErrorData(terr types.Error) (ErrorCode, token.Pos, token.Pos, bool) {
++	var data [3]int
++	// By coincidence all of these fields are ints, which simplifies things.
++	v := reflect.ValueOf(terr)
++	for i, name := range []string{"go116code", "go116start", "go116end"} {
++		f := v.FieldByName(name)
++		if !f.IsValid() {
++			return 0, 0, 0, false
++		}
++		data[i] = int(f.Int())
++	}
++	return ErrorCode(data[0]), token.Pos(data[1]), token.Pos(data[2]), true
++}
+diff --git a/vendor/modules.txt b/vendor/modules.txt
+index dc6e25d..6681e7b 100644
+--- a/vendor/modules.txt
++++ b/vendor/modules.txt
+@@ -419,7 +419,7 @@ github.com/gobwas/glob/util/strings
+ github.com/gofrs/uuid
+ # github.com/gogo/googleapis v1.3.1
+ github.com/gogo/googleapis/google/api
+-# github.com/gogo/protobuf v1.3.1
++# github.com/gogo/protobuf v1.3.2
+ ## explicit
+ github.com/gogo/protobuf/gogoproto
+ github.com/gogo/protobuf/jsonpb
+@@ -1002,7 +1002,7 @@ golang.org/x/text/unicode/norm
+ golang.org/x/text/width
+ # golang.org/x/time v0.0.0-20190308202827-9d24e82272b4
+ golang.org/x/time/rate
+-# golang.org/x/tools v0.0.0-20201022035929-9cf592e881e9
++# golang.org/x/tools v0.0.0-20210106214847-113979e3529a
+ golang.org/x/tools/cmd/goimports
+ golang.org/x/tools/go/analysis
+ golang.org/x/tools/go/analysis/passes/inspect
diff --git a/debian/patches/series b/debian/patches/series
index 7de5f2c..34bbc19 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1,3 @@
 adjust-service-user.patch
 adjust-etc-telegraf.conf.patch
+CVE-2021-3121.patch
diff --git a/debian/repack-telegraf-with-vendor.sh b/debian/repack-telegraf-with-vendor.sh
index a13a5e7..2be0ed5 100755
--- a/debian/repack-telegraf-with-vendor.sh
+++ b/debian/repack-telegraf-with-vendor.sh
@@ -18,9 +18,15 @@ GOBIN=${GOBIN:-go}
 upstream_version="$2"
 orig_tar=$(realpath "../telegraf_${upstream_version}.orig.tar.xz")
 orig_dir="$PWD"
-work_dir="$(mktemp -d)"
+work_dir=$(mktemp -d)
 
-trap "rm -rf $work_dir" INT QUIT 0
+cleanup ()
+{
+    "$GOBIN" clean -cache -modcache
+    rm -rf "$work_dir"
+}
+
+trap cleanup INT QUIT 0
 
 export GOPATH="$work_dir/.gopath"
 export GOCACHE="$work_dir/.gocache"
@@ -28,13 +34,12 @@ export GOCACHE="$work_dir/.gocache"
 printf "Unpacking tarball '$orig_tar' to '$work_dir'"
 
 tar xf "$orig_tar" -C "$work_dir"
-source_dir_name="$(ls -1 "$work_dir")"
+source_dir_name=$(ls -1 "$work_dir")
 cd "$work_dir/$source_dir_name"
-$GOBIN mod vendor
+"$GOBIN" mod vendor
 cd ..
 tar cJf "$orig_tar" "$source_dir_name"
 
-$GOBIN clean -cache -modcache
-rm -rf "$work_dir"
+cleanup
 
 exit 0
diff --git a/docker-compose.yml b/docker-compose.yml
index 092a7b9..1da9d2a 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -40,6 +40,9 @@ services:
       - MYSQL_ALLOW_EMPTY_PASSWORD=yes
     ports:
       - "3306:3306"
+    # removes warning "mbind operation not permitted" enables you to see the docker logs 
+    cap_add:
+    - SYS_NICE  # CAP_SYS_NICE
   memcached:
     image: memcached
     ports:
diff --git a/docs/DATA_FORMATS_INPUT.md b/docs/DATA_FORMATS_INPUT.md
index dbcb283..3e7dd10 100644
--- a/docs/DATA_FORMATS_INPUT.md
+++ b/docs/DATA_FORMATS_INPUT.md
@@ -17,6 +17,7 @@ Protocol or in JSON format.
 - [Prometheus](/plugins/parsers/prometheus)
 - [Value](/plugins/parsers/value), ie: 45 or "booyah"
 - [Wavefront](/plugins/parsers/wavefront)
+- [XML](/plugins/parsers/xml)
 
 Any input plugin containing the `data_format` option can use it to select the
 desired parser:
diff --git a/docs/DATA_FORMATS_OUTPUT.md b/docs/DATA_FORMATS_OUTPUT.md
index 0d0bdff..720c922 100644
--- a/docs/DATA_FORMATS_OUTPUT.md
+++ b/docs/DATA_FORMATS_OUTPUT.md
@@ -8,6 +8,7 @@ plugins.
 1. [Carbon2](/plugins/serializers/carbon2)
 1. [Graphite](/plugins/serializers/graphite)
 1. [JSON](/plugins/serializers/json)
+1. [MessagePack](/plugins/serializers/msgpack)
 1. [Prometheus](/plugins/serializers/prometheus)
 1. [Prometheus Remote Write](/plugins/serializers/prometheusremotewrite)
 1. [ServiceNow Metrics](/plugins/serializers/nowmetric)
diff --git a/docs/EXTERNAL_PLUGINS.md b/docs/EXTERNAL_PLUGINS.md
index abef068..83759ed 100644
--- a/docs/EXTERNAL_PLUGINS.md
+++ b/docs/EXTERNAL_PLUGINS.md
@@ -8,6 +8,8 @@ more flexibility compared to internal Telegraf plugins.
 - External plugins can access to libraries not written in Go
 - Utilize licensed software that isn't available to the open source community
 - Can include large dependencies that would otherwise bloat Telegraf
+- You don't need to wait on the Telegraf team to publish your plugin and start working with it.
+- using the [shim](/plugins/common/shim) you can easily convert plugins between internal and external use
 
 ### External Plugin Guidelines
 The guidelines of writing external plugins would follow those for our general [input](/docs/INPUTS.md),
@@ -59,10 +61,9 @@ This is a guide to help you set up your plugin to use it with `execd`
   [openvpn](https://github.com/danielnelson/telegraf-execd-openvpn#usage) and [awsalarms](https://github.com/vipinvkmenon/awsalarms#installation) 
   for examples. Include the following steps:
      1. How to download the release package for your platform or how to clone the binary for your external plugin
-     1. The commands to unpack or build your binary
+     1. The commands to build your binary
      1. Location to edit your `telegraf.conf`
      1. Configuration to run your external plugin with [inputs.execd](/plugins/inputs/execd), 
      [processors.execd](/plugins/processors/execd) or [outputs.execd](/plugins/outputs/execd)
-     1. Note that restart or reload of Telegraf is required
   1. Submit your plugin by opening a PR to add your external plugin to the [/EXTERNAL_PLUGINS.md](/EXTERNAL_PLUGINS.md) 
   list. Please include the plugin name, link to the plugin repository and a short description of the plugin. 
diff --git a/docs/FAQ.md b/docs/FAQ.md
index 4fe28db..3667c10 100644
--- a/docs/FAQ.md
+++ b/docs/FAQ.md
@@ -50,8 +50,6 @@ You can use the following techniques to avoid cardinality issues:
 
 - Use [metric filtering][] options to exclude unneeded measurements and tags.
 - Write to a database with an appropriate [retention policy][].
-- Limit series cardinality in your database using the
-  [max-series-per-database][] and [max-values-per-tag][] settings.
 - Consider using the [Time Series Index][tsi].
 - Monitor your databases using the [show cardinality][] commands.
 - Consult the [InfluxDB documentation][influx docs] for the most up-to-date techniques.
@@ -59,8 +57,6 @@ You can use the following techniques to avoid cardinality issues:
 [series cardinality]: https://docs.influxdata.com/influxdb/v1.7/concepts/glossary/#series-cardinality
 [metric filtering]: https://github.com/influxdata/telegraf/blob/master/docs/CONFIGURATION.md#metric-filtering
 [retention policy]: https://docs.influxdata.com/influxdb/latest/guides/downsampling_and_retention/
-[max-series-per-database]: https://docs.influxdata.com/influxdb/latest/administration/config/#max-series-per-database-1000000
-[max-values-per-tag]: https://docs.influxdata.com/influxdb/latest/administration/config/#max-values-per-tag-100000
 [tsi]: https://docs.influxdata.com/influxdb/latest/concepts/time-series-index/
 [show cardinality]: https://docs.influxdata.com/influxdb/latest/query_language/spec/#show-cardinality
 [influx docs]: https://docs.influxdata.com/influxdb/latest/
diff --git a/docs/INTEGRATION_TESTS.md b/docs/INTEGRATION_TESTS.md
 new file mode 100644
index 0000000..b7af829
--- /dev/null
+++ b/docs/INTEGRATION_TESTS.md
@@ -0,0 +1,61 @@
+# Integration Tests
+
+To run our current integration test suite: 
+
+Running the integration tests requires several docker containers to be
+running.  You can start the containers with:
+```
+docker-compose up
+```
+
+To run only the integration tests use:
+
+```
+make test-integration
+```
+
+Use `make docker-kill` to stop the containers.
+
+Contributing integration tests: 
+
+- Add Integration to the end of the test name so it will be run with the above command.
+- Writes tests where no library is being used in the plugin
+- There is poor code coverage
+- It has dynamic code that only gets run at runtime eg: SQL
+
+Current areas we have integration tests: 
+
+| Area                               | What it does                              |
+|------------------------------------|-------------------------------------------|
+| Inputs: Aerospike                  |                                           |
+| Inputs: Disque                     |                                           |
+| Inputs: Dovecot                    |                                           |                         
+| Inputs: Mcrouter                   |                                           |                         
+| Inputs: Memcached                  |                                           |                         
+| Inputs: Mysql                      |                                           |                         
+| Inputs: Opcua                      |                                           |                         
+| Inputs: Openldap                   |                                           |                          
+| Inputs: Pgbouncer                  |                                           |                         
+| Inputs: Postgresql                 |                                           |                         
+| Inputs: Postgresql extensible      |                                           |                          
+| Inputs: Procstat / Native windows  |                                           |                           
+| Inputs: Prometheus                 |                                           |                          
+| Inputs: Redis                      |                                           |                          
+| Inputs: Sqlserver                  |                                           |                         
+| Inputs: Win perf counters          |                                           |                          
+| Inputs: Win services               |                                           |                          
+| Inputs: Zookeeper                  |                                           |                            
+| Outputs: Cratedb / Postgres        |                                           |                          
+| Outputs: Elasticsearch             |                                           |                          
+| Outputs: Kafka                     |                                           |                          
+| Outputs: MQTT                      |                                           |                          
+| Outputs: Nats                      |                                           |                          
+| Outputs: NSQ                       |                                           |                        
+
+Areas we would benefit most from new integration tests:
+
+| Area                               |
+|------------------------------------|
+|  SNMP                              |  
+|  MYSQL                             |  
+|  SQLSERVER                         |  
diff --git a/docs/LICENSE_OF_DEPENDENCIES.md b/docs/LICENSE_OF_DEPENDENCIES.md
index 14c4644..0aff4fb 100644
--- a/docs/LICENSE_OF_DEPENDENCIES.md
+++ b/docs/LICENSE_OF_DEPENDENCIES.md
@@ -21,12 +21,24 @@ following works:
 - github.com/aerospike/aerospike-client-go [Apache License 2.0](https://github.com/aerospike/aerospike-client-go/blob/master/LICENSE)
 - github.com/alecthomas/units [MIT License](https://github.com/alecthomas/units/blob/master/COPYING)
 - github.com/amir/raidman [The Unlicense](https://github.com/amir/raidman/blob/master/UNLICENSE)
+- github.com/antchfx/xmlquery [MIT License](https://github.com/antchfx/xmlquery/blob/master/LICENSE)
+- github.com/antchfx/xpath [MIT License](https://github.com/antchfx/xpath/blob/master/LICENSE)
 - github.com/apache/thrift [Apache License 2.0](https://github.com/apache/thrift/blob/master/LICENSE)
 - github.com/aristanetworks/glog [Apache License 2.0](https://github.com/aristanetworks/glog/blob/master/LICENSE)
 - github.com/aristanetworks/goarista [Apache License 2.0](https://github.com/aristanetworks/goarista/blob/master/COPYING)
 - github.com/aws/aws-sdk-go [Apache License 2.0](https://github.com/aws/aws-sdk-go/blob/master/LICENSE.txt)
+- github.com/aws/aws-sdk-go-v2 [Apache License 2.0](https://github.com/aws/aws-sdk-go-v2/blob/main/LICENSE.txt)
+- github.com/aws/aws-sdk-go-v2/config [Apache License 2.0](https://github.com/aws/aws-sdk-go-v2/blob/main/config/LICENSE.txt)
+- github.com/aws/aws-sdk-go-v2/credentials [Apache License 2.0](https://github.com/aws/aws-sdk-go-v2/blob/main/credentials/LICENSE.txt)
+- github.com/aws/aws-sdk-go-v2/feature/ec2/imds [Apache License 2.0](https://github.com/aws/aws-sdk-go-v2/blob/main/feature/ec2/imds/LICENSE.txt)
+- github.com/aws/aws-sdk-go-v2/service/ec2 [Apache License 2.0](https://github.com/aws/aws-sdk-go-v2/blob/main/service/ec2/LICENSE.txt)
+- github.com/aws/aws-sdk-go-v2/service/internal/presigned-url [Apache License 2.0](https://github.com/aws/aws-sdk-go-v2/blob/main/service/internal/presigned-url/LICENSE.txt)
+- github.com/aws/aws-sdk-go-v2/service/sso [Apache License 2.0](https://github.com/aws/aws-sdk-go-v2/blob/main/service/ec2/LICENSE.txt)
+- github.com/aws/aws-sdk-go-v2/service/sts [Apache License 2.0](https://github.com/aws/aws-sdk-go-v2/blob/main/service/sts/LICENSE.txt)
+- github.com/aws/smithy-go [Apache License 2.0](https://github.com/aws/smithy-go/blob/main/LICENSE)
 - github.com/benbjohnson/clock [MIT License](https://github.com/benbjohnson/clock/blob/master/LICENSE)
 - github.com/beorn7/perks [MIT License](https://github.com/beorn7/perks/blob/master/LICENSE)
+- github.com/bmatcuk/doublestar [MIT License](https://github.com/bmatcuk/doublestar/blob/master/LICENSE)
 - github.com/caio/go-tdigest [MIT License](https://github.com/caio/go-tdigest/blob/master/LICENSE)
 - github.com/cenkalti/backoff [MIT License](https://github.com/cenkalti/backoff/blob/master/LICENSE)
 - github.com/cespare/xxhash [MIT License](https://github.com/cespare/xxhash/blob/master/LICENSE.txt)
@@ -56,10 +68,12 @@ following works:
 - github.com/go-ping/ping [MIT License](https://github.com/go-ping/ping/blob/master/LICENSE)
 - github.com/go-redis/redis [BSD 2-Clause "Simplified" License](https://github.com/go-redis/redis/blob/master/LICENSE)
 - github.com/go-sql-driver/mysql [Mozilla Public License 2.0](https://github.com/go-sql-driver/mysql/blob/master/LICENSE)
+- github.com/go-stack/stack [MIT License](https://github.com/go-stack/stack/blob/master/LICENSE.md)
 - github.com/goburrow/modbus [BSD 3-Clause "New" or "Revised" License](https://github.com/goburrow/modbus/blob/master/LICENSE)
 - github.com/goburrow/serial [MIT License](https://github.com/goburrow/serial/LICENSE)
 - github.com/gobwas/glob [MIT License](https://github.com/gobwas/glob/blob/master/LICENSE)
 - github.com/gofrs/uuid [MIT License](https://github.com/gofrs/uuid/blob/master/LICENSE)
+- github.com/gogo/googleapis [Apache License 2.0](https://github.com/gogo/googleapis/blob/master/LICENSE)
 - github.com/gogo/protobuf [BSD 3-Clause Clear License](https://github.com/gogo/protobuf/blob/master/LICENSE)
 - github.com/golang/geo [Apache License 2.0](https://github.com/golang/geo/blob/master/LICENSE)
 - github.com/golang/groupcache [Apache License 2.0](https://github.com/golang/groupcache/blob/master/LICENSE)
@@ -71,6 +85,7 @@ following works:
 - github.com/googleapis/gax-go [BSD 3-Clause "New" or "Revised" License](https://github.com/googleapis/gax-go/blob/master/LICENSE)
 - github.com/gopcua/opcua [MIT License](https://github.com/gopcua/opcua/blob/master/LICENSE)
 - github.com/gorilla/mux [BSD 3-Clause "New" or "Revised" License](https://github.com/gorilla/mux/blob/master/LICENSE)
+- github.com/gorilla/websocket [BSD 2-Clause "Simplified" License](https://github.com/gorilla/websocket/blob/master/LICENSE)
 - github.com/gosnmp/gosnmp [BSD 2-Clause "Simplified" License](https://github.com/gosnmp/gosnmp/blob/master/LICENSE)
 - github.com/grpc-ecosystem/grpc-gateway [BSD 3-Clause "New" or "Revised" License](https://github.com/grpc-ecosystem/grpc-gateway/blob/master/LICENSE.txt)
 - github.com/hailocab/go-hostpool [MIT License](https://github.com/hailocab/go-hostpool/blob/master/LICENSE)
@@ -85,6 +100,8 @@ following works:
 - github.com/influxdata/toml [MIT License](https://github.com/influxdata/toml/blob/master/LICENSE)
 - github.com/influxdata/wlog [MIT License](https://github.com/influxdata/wlog/blob/master/LICENSE)
 - github.com/jackc/pgx [MIT License](https://github.com/jackc/pgx/blob/master/LICENSE)
+- github.com/jaegertracing/jaeger [Apache License 2.0](https://github.com/jaegertracing/jaeger/blob/master/LICENSE)
+- github.com/james4k/rcon [MIT License](https://github.com/james4k/rcon/blob/master/LICENSE)
 - github.com/jcmturner/gofork [BSD 3-Clause "New" or "Revised" License](https://github.com/jcmturner/gofork/blob/master/LICENSE)
 - github.com/jmespath/go-jmespath [Apache License 2.0](https://github.com/jmespath/go-jmespath/blob/master/LICENSE)
 - github.com/jpillora/backoff [MIT License](https://github.com/jpillora/backoff/blob/master/LICENSE)
@@ -116,7 +133,9 @@ following works:
 - github.com/openconfig/gnmi [Apache License 2.0](https://github.com/openconfig/gnmi/blob/master/LICENSE)
 - github.com/opencontainers/go-digest [Apache License 2.0](https://github.com/opencontainers/go-digest/blob/master/LICENSE)
 - github.com/opencontainers/image-spec [Apache License 2.0](https://github.com/opencontainers/image-spec/blob/master/LICENSE)
+- github.com/opentracing/opentracing-go [Apache License 2.0](https://github.com/opentracing/opentracing-go/blob/master/LICENSE)
 - github.com/openzipkin/zipkin-go-opentracing [MIT License](https://github.com/openzipkin/zipkin-go-opentracing/blob/master/LICENSE)
+- github.com/philhofer/fwd [MIT License](https://github.com/philhofer/fwd/blob/master/LICENSE.md)
 - github.com/pierrec/lz4 [BSD 3-Clause "New" or "Revised" License](https://github.com/pierrec/lz4/blob/master/LICENSE)
 - github.com/pkg/errors [BSD 2-Clause "Simplified" License](https://github.com/pkg/errors/blob/master/LICENSE)
 - github.com/pmezard/go-difflib [BSD 3-Clause Clear License](https://github.com/pmezard/go-difflib/blob/master/LICENSE)
@@ -130,6 +149,10 @@ following works:
 - github.com/safchain/ethtool [Apache License 2.0](https://github.com/safchain/ethtool/blob/master/LICENSE)
 - github.com/samuel/go-zookeeper [BSD 3-Clause Clear License](https://github.com/samuel/go-zookeeper/blob/master/LICENSE)
 - github.com/shirou/gopsutil [BSD 3-Clause Clear License](https://github.com/shirou/gopsutil/blob/master/LICENSE)
+- github.com/signalfx/com_signalfx_metrics_protobuf [Apache License 2.0](https://github.com/signalfx/com_signalfx_metrics_protobuf/blob/master/LICENSE)
+- github.com/signalfx/gohistogram [MIT License](https://github.com/signalfx/gohistogram/blob/master/LICENSE)
+- github.com/signalfx/golib [Apache License 2.0](https://github.com/signalfx/golib/blob/master/LICENSE)
+- github.com/signalfx/sapm-proto [Apache License 2.0](https://github.com/signalfx/sapm-proto/blob/master/LICENSE)
 - github.com/sirupsen/logrus [MIT License](https://github.com/sirupsen/logrus/blob/master/LICENSE)
 - github.com/soniah/gosnmp [BSD 2-Clause "Simplified" License](https://github.com/soniah/gosnmp/blob/master/LICENSE)
 - github.com/streadway/amqp [BSD 2-Clause "Simplified" License](https://github.com/streadway/amqp/blob/master/LICENSE)
@@ -138,6 +161,7 @@ following works:
 - github.com/tidwall/gjson [MIT License](https://github.com/tidwall/gjson/blob/master/LICENSE)
 - github.com/tidwall/match [MIT License](https://github.com/tidwall/match/blob/master/LICENSE)
 - github.com/tidwall/pretty [MIT License](https://github.com/tidwall/pretty/blob/master/LICENSE)
+- github.com/tinylib/msgp [MIT License](https://github.com/tinylib/msgp/blob/master/LICENSE)
 - github.com/vishvananda/netlink [Apache License 2.0](https://github.com/vishvananda/netlink/blob/master/LICENSE)
 - github.com/vishvananda/netns [Apache License 2.0](https://github.com/vishvananda/netns/blob/master/LICENSE)
 - github.com/vjeantet/grok [Apache License 2.0](https://github.com/vjeantet/grok/blob/master/LICENSE)
@@ -164,6 +188,7 @@ following works:
 - google.golang.org/genproto [Apache License 2.0](https://github.com/google/go-genproto/blob/master/LICENSE)
 - google.golang.org/grpc [Apache License 2.0](https://github.com/grpc/grpc-go/blob/master/LICENSE)
 - gopkg.in/asn1-ber.v1 [MIT License](https://github.com/go-asn1-ber/asn1-ber/blob/v1.3/LICENSE)
+- gopkg.in/djherbis/times.v1 [MIT License](https://github.com/djherbis/times/blob/master/LICENSE)
 - gopkg.in/fatih/pool.v2 [MIT License](https://github.com/fatih/pool/blob/v2.0.0/LICENSE)
 - gopkg.in/fsnotify.v1 [BSD 3-Clause "New" or "Revised" License](https://github.com/fsnotify/fsnotify/blob/v1.4.7/LICENSE)
 - gopkg.in/gorethink/gorethink.v3 [Apache License 2.0](https://github.com/rethinkdb/rethinkdb-go/blob/v3.0.5/LICENSE)
@@ -179,6 +204,8 @@ following works:
 - gopkg.in/tomb.v2 [BSD 3-Clause Clear License](https://github.com/go-tomb/tomb/blob/v2/LICENSE)
 - gopkg.in/yaml.v2 [Apache License 2.0](https://github.com/go-yaml/yaml/blob/v2.2.2/LICENSE)
 - gopkg.in/yaml.v3 [Apache License 2.0](https://github.com/go-yaml/yaml/blob/v3/LICENSE)
+- k8s.io/apimachinery [Apache License 2.0](https://github.com/kubernetes/apimachinery/blob/master/LICENSE)
+- k8s.io/klog [Apache License 2.0](https://github.com/kubernetes/klog/blob/master/LICENSE)
 - modernc.org/libc [BSD 3-Clause "New" or "Revised" License](https://gitlab.com/cznic/libc/-/blob/master/LICENSE)
 - modernc.org/memory [BSD 3-Clause "New" or "Revised" License](https://gitlab.com/cznic/memory/-/blob/master/LICENSE)
 - modernc.org/sqlite [BSD 3-Clause "New" or "Revised" License](https://gitlab.com/cznic/sqlite/-/blob/master/LICENSE)
diff --git a/etc/telegraf.conf b/etc/telegraf.conf
index 9d52d0a..a238afa 100644
--- a/etc/telegraf.conf
+++ b/etc/telegraf.conf
@@ -343,6 +343,20 @@
 #   # endpoint_url = "https://monitoring.core.usgovcloudapi.net"
 
 
+# [[outputs.bigquery]]
+#   ## GCP Project
+#   project = "erudite-bloom-151019"
+#
+#   ## The BigQuery dataset
+#   dataset = "telegraf"
+#
+#   ## Timeout for BigQuery operations.
+#   # timeout = "5s"
+#
+#   ## Character to replace hyphens on Metric name
+#   # replace_hyphen_to = "_"
+
+
 # # Publish Telegraf metrics to a Google Cloud PubSub topic
 # [[outputs.cloud_pubsub]]
 #   ## Required. Name of Google Cloud Platform (GCP) Project that owns
@@ -496,6 +510,9 @@
 #
 #   ## Connection timeout, defaults to "5s" if not set.
 #   timeout = "5s"
+#
+#   ## If you want to convert values represented as gauges to counters, add the metric names here
+#   additional_counters = [ ]
 
 
 # # Configuration for Elasticsearch to send metrics to.
@@ -1066,6 +1083,33 @@
 #   # url = "https://listener.logz.io:8071"
 
 
+# # Send logs to Loki
+# [[outputs.loki]]
+#   ## The domain of Loki
+#   domain = "https://loki.domain.tld"
+#
+#   ## Endpoint to write api
+#   # endpoint = "/loki/api/v1/push"
+#
+#   ## Connection timeout, defaults to "5s" if not set.
+#   # timeout = "5s"
+#
+#   ## Basic auth credential
+#   # username = "loki"
+#   # password = "pass"
+#
+#   ## Additional HTTP headers
+#   # http_headers = {"X-Scope-OrgID" = "1"}
+#
+#   ## If the request must be gzip encoded
+#   # gzip_request = false
+#
+#   ## Optional TLS Config
+#   # tls_ca = "/etc/telegraf/ca.pem"
+#   # tls_cert = "/etc/telegraf/cert.pem"
+#   # tls_key = "/etc/telegraf/key.pem"
+
+
 # # Configuration for MQTT server to send metrics to
 # [[outputs.mqtt]]
 #   servers = ["localhost:1883"] # required.
@@ -1158,6 +1202,10 @@
 #
 #   ## Timeout for writes to the New Relic API.
 #   # timeout = "15s"
+#
+#   ## HTTP Proxy override. If unset use values from the standard
+#   ## proxy environment variables to determine proxy, if any.
+#   # http_proxy = "http://corporate.proxy:3128"
 
 
 # # Send telegraf measurements to NSQD
@@ -1293,6 +1341,116 @@
 #   separator = " "
 
 
+# # Send aggregate metrics to Sensu Monitor
+# [[outputs.sensu]]
+#   ## BACKEND API URL is the Sensu Backend API root URL to send metrics to
+#   ## (protocol, host, and port only). The output plugin will automatically
+#   ## append the corresponding backend API path
+#   ## /api/core/v2/namespaces/:entity_namespace/events/:entity_name/:check_name).
+#   ##
+#   ## Backend Events API reference:
+#   ## https://docs.sensu.io/sensu-go/latest/api/events/
+#   ##
+#   ## AGENT API URL is the Sensu Agent API root URL to send metrics to
+#   ## (protocol, host, and port only). The output plugin will automatically
+#   ## append the correspeonding agent API path (/events).
+#   ##
+#   ## Agent API Events API reference:
+#   ## https://docs.sensu.io/sensu-go/latest/api/events/
+#   ##
+#   ## NOTE: if backend_api_url and agent_api_url and api_key are set, the output
+#   ## plugin will use backend_api_url. If backend_api_url and agent_api_url are
+#   ## not provided, the output plugin will default to use an agent_api_url of
+#   ## http://127.0.0.1:3031
+#   ##
+#   # backend_api_url = "http://127.0.0.1:8080"
+#   # agent_api_url = "http://127.0.0.1:3031"
+#
+#   ## API KEY is the Sensu Backend API token
+#   ## Generate a new API token via:
+#   ##
+#   ## $ sensuctl cluster-role create telegraf --verb create --resource events,entities
+#   ## $ sensuctl cluster-role-binding create telegraf --cluster-role telegraf --group telegraf
+#   ## $ sensuctl user create telegraf --group telegraf --password REDACTED
+#   ## $ sensuctl api-key grant telegraf
+#   ##
+#   ## For more information on Sensu RBAC profiles & API tokens, please visit:
+#   ## - https://docs.sensu.io/sensu-go/latest/reference/rbac/
+#   ## - https://docs.sensu.io/sensu-go/latest/reference/apikeys/
+#   ##
+#   # api_key = "${SENSU_API_KEY}"
+#
+#   ## 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
+#
+#   ## Timeout for HTTP message
+#   # timeout = "5s"
+#
+#   ## HTTP Content-Encoding for write request body, can be set to "gzip" to
+#   ## compress body or "identity" to apply no encoding.
+#   # content_encoding = "identity"
+#
+#   ## Sensu Event details
+#   ##
+#   ## Below are the event details to be sent to Sensu.  The main portions of the
+#   ## event are the check, entity, and metrics specifications. For more information
+#   ## on Sensu events and its components, please visit:
+#   ## - Events - https://docs.sensu.io/sensu-go/latest/reference/events
+#   ## - Checks -  https://docs.sensu.io/sensu-go/latest/reference/checks
+#   ## - Entities - https://docs.sensu.io/sensu-go/latest/reference/entities
+#   ## - Metrics - https://docs.sensu.io/sensu-go/latest/reference/events#metrics
+#   ##
+#   ## Check specification
+#   ## The check name is the name to give the Sensu check associated with the event
+#   ## created. This maps to check.metatadata.name in the event.
+#   [outputs.sensu.check]
+#   name = "telegraf"
+#
+#   ## Entity specification
+#   ## Configure the entity name and namespace, if necessary. This will be part of
+#   ## the entity.metadata in the event.
+#   ##
+#   ## NOTE: if the output plugin is configured to send events to a
+#   ## backend_api_url and entity_name is not set, the value returned by
+#   ## os.Hostname() will be used; if the output plugin is configured to send
+#   ## events to an agent_api_url, entity_name and entity_namespace are not used.
+#   # [outputs.sensu.entity]
+#   #   name = "server-01"
+#   #   namespace = "default"
+#
+#   ## Metrics specification
+#   ## Configure the tags for the metrics that are sent as part of the Sensu event
+#   # [outputs.sensu.tags]
+#   #   source = "telegraf"
+#
+#   ## Configure the handler(s) for processing the provided metrics
+#   # [outputs.sensu.metrics]
+#   #   handlers = ["influxdb","elasticsearch"]
+
+
+# # Send metrics and events to SignalFx
+# [[outputs.signalfx]]
+#     ## SignalFx Org Access Token
+#     access_token = "my-secret-token"
+#
+#     ## The SignalFx realm that your organization resides in
+#     signalfx_realm = "us9"  # Required if ingest_url is not set
+#
+#     ## You can optionally provide a custom ingest url instead of the
+#     ## signalfx_realm option above if you are using a gateway or proxy
+#     ## instance.  This option takes precident over signalfx_realm.
+#     ingest_url = "https://my-custom-ingest/"
+#
+#     ## Event typed metrics are omitted by default,
+#     ## If you require an event typed metric you must specify the
+#     ## metric name in the following list.
+#     included_event_names = ["plugin.metric_name"]
+
+
 # # Generic socket writer capable of handling multiple socket types.
 # [[outputs.socket_writer]]
 #   ## URL to connect to
@@ -1698,6 +1856,55 @@
 ###############################################################################
 
 
+# # Attach AWS EC2 metadata to metrics
+# [[processors.aws_ec2]]
+#   ## Instance identity document tags to attach to metrics.
+#   ## For more information see:
+#   ## https://docs.aws.amazon.com/AWSEC2/latest/UserGuide/instance-identity-documents.html
+#   ##
+#   ## Available tags:
+#   ## * accountId
+#   ## * architecture
+#   ## * availabilityZone
+#   ## * billingProducts
+#   ## * imageId
+#   ## * instanceId
+#   ## * instanceType
+#   ## * kernelId
+#   ## * pendingTime
+#   ## * privateIp
+#   ## * ramdiskId
+#   ## * region
+#   ## * version
+#   imds_tags = []
+#
+#   ## EC2 instance tags retrieved with DescribeTags action.
+#   ## In case tag is empty upon retrieval it's omitted when tagging metrics.
+#   ## Note that in order for this to work, role attached to EC2 instance or AWS
+#   ## credentials available from the environment must have a policy attached, that
+#   ## allows ec2:DescribeTags.
+#   ##
+#   ## For more information see:
+#   ## https://docs.aws.amazon.com/AWSEC2/latest/APIReference/API_DescribeTags.html
+#   ec2_tags = []
+#
+#   ## Timeout for http requests made by against aws ec2 metadata endpoint.
+#   timeout = "10s"
+#
+#   ## ordered controls whether or not the metrics need to stay in the same order
+#   ## this plugin received them in. If false, this plugin will change the order
+#   ## with requests hitting cached results moving through immediately and not
+#   ## waiting on slower lookups. This may cause issues for you if you are
+#   ## depending on the order of metrics staying the same. If so, set this to true.
+#   ## Keeping the metrics ordered may be slightly slower.
+#   ordered = false
+#
+#   ## max_parallel_calls is the maximum number of AWS API calls to be in flight
+#   ## at the same time.
+#   ## It's probably best to keep this number fairly low.
+#   max_parallel_calls = 10
+
+
 # # Clone metrics and apply modifications.
 # [[processors.clone]]
 #   ## All modifications on inputs and aggregators can be overridden:
@@ -2092,6 +2299,13 @@
 #
 #   ## File containing a Starlark script.
 #   # script = "/usr/local/bin/myscript.star"
+#
+#   ## The constants of the Starlark script.
+#   # [processors.starlark.constants]
+#   #   max_size = 10
+#   #   threshold = 0.75
+#   #   default_name = "Julia"
+#   #   debug_mode = true
 
 
 # # Perform string processing on tags, fields, and measurements
@@ -2245,6 +2459,49 @@
 #   # stats = ["count", "min", "max", "mean", "stdev", "s2", "sum"]
 
 
+# # Calculates a derivative for every field.
+# [[aggregators.derivative]]
+# 	## The period in which to flush 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
+# 	##
+# 	## This aggregator will estimate a derivative for each field, which is
+# 	## contained in both the first and last metric of the aggregation interval.
+# 	## Without further configuration the derivative will be calculated with
+# 	## respect to the time difference between these two measurements in seconds.
+# 	## The formula applied is for every field:
+# 	##
+# 	##               value_last - value_first
+# 	## derivative = --------------------------
+# 	##              time_difference_in_seconds
+# 	##
+# 	## The resulting derivative will be named *fieldname_rate*. The suffix
+# 	## "_rate" can be configured by the *suffix* parameter. When using a
+# 	## derivation variable you can include its name for more clarity.
+# 	# suffix = "_rate"
+# 	##
+# 	## As an abstraction the derivative can be calculated not only by the time
+# 	## difference but by the difference of a field, which is contained in the
+# 	## measurement. This field is assumed to be monotonously increasing. This
+# 	## feature is used by specifying a *variable*.
+# 	## Make sure the specified variable is not filtered and exists in the metrics
+# 	## passed to this aggregator!
+# 	# variable = ""
+# 	##
+# 	## When using a field as the derivation parameter the name of that field will
+# 	## be used for the resulting derivative, e.g. *fieldname_by_parameter*.
+# 	##
+# 	## Note, that the calculation is based on the actual timestamp of the
+# 	## measurements. When there is only one measurement during that period, the
+# 	## measurement will be rolled over to the next period. The maximum number of
+# 	## such roll-overs can be configured with a default of 10.
+# 	# max_roll_over = 10
+# 	##
+
+
 # # Report the final metric of a series
 # [[aggregators.final]]
 #   ## The period on which to flush & clear the aggregator.
@@ -2308,6 +2565,34 @@
 #   drop_original = false
 
 
+# # Keep the aggregate quantiles of each metric passing through.
+# [[aggregators.quantile]]
+#   ## General Aggregator Arguments:
+#   ## 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
+#
+#   ## Quantiles to output in the range [0,1]
+#   # quantiles = [0.25, 0.5, 0.75]
+#
+#   ## Type of aggregation algorithm
+#   ## Supported are:
+#   ##  "t-digest" -- approximation using centroids, can cope with large number of samples
+#   ##  "exact R7" -- exact computation also used by Excel or NumPy (Hyndman & Fan 1996 R7)
+#   ##  "exact R8" -- exact computation (Hyndman & Fan 1996 R8)
+#   ## NOTE: Do not use "exact" algorithms with large number of samples
+#   ##       to not impair performance or memory consumption!
+#   # algorithm = "t-digest"
+#
+#   ## Compression for approximation (t-digest). The value needs to be
+#   ## greater or equal to 1.0. Smaller values will result in more
+#   ## performance but less accuracy.
+#   # compression = 100.0
+
+
 # # Count the occurrence of values in fields.
 # [[aggregators.valuecounter]]
 #   ## General Aggregator Arguments:
@@ -2562,6 +2847,41 @@
 #   tubes = ["notifications"]
 
 
+# # Read metrics exposed by Beat
+# [[inputs.beat]]
+#   ## An URL from which to read Beat-formatted JSON
+#   ## Default is "http://127.0.0.1:5066".
+#   url = "http://127.0.0.1:5066"
+#
+#   ## Enable collection of the listed stats
+#   ## An empty list means collect all. Available options are currently
+#   ## "beat", "libbeat", "system" and "filebeat".
+#   # include = ["beat", "libbeat", "filebeat"]
+#
+#   ## HTTP method
+#   # method = "GET"
+#
+#   ## Optional HTTP headers
+#   # headers = {"X-Special-Header" = "Special-Value"}
+#
+#   ## Override HTTP "Host" header
+#   # host_header = "logstash.example.com"
+#
+#   ## Timeout for HTTP requests
+#   # timeout = "5s"
+#
+#   ## Optional HTTP Basic Auth credentials
+#   # username = "username"
+#   # password = "pa$$word"
+#
+#   ## 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
+
+
 # # Read BIND nameserver XML statistics
 # [[inputs.bind]]
 #   ## An array of BIND XML statistics URI to gather stats.
@@ -2713,6 +3033,9 @@
 #   ##   ex: endpoint_url = "http://localhost:8000"
 #   # endpoint_url = ""
 #
+#   ## Set http_proxy (telegraf uses the system wide proxy settings if it's is not set)
+#   # http_proxy_url = "http://localhost:8888"
+#
 #   # The minimum period for Cloudwatch metrics is 1 minute (60s). However not all
 #   # metrics are made available to the 1 minute period. Some are collected at
 #   # 3 minute, 5 minute, or larger intervals. See https://aws.amazon.com/cloudwatch/faqs/#monitoring.
@@ -2854,6 +3177,18 @@
 #   # basic_password = "p@ssw0rd"
 
 
+# # Fetch metrics from a CSGO SRCDS
+# [[inputs.csgo]]
+#   ## Specify servers using the following format:
+#   ##    servers = [
+#   ##      ["ip1:port1", "rcon_password1"],
+#   ##      ["ip2:port2", "rcon_password2"],
+#   ##    ]
+#   #
+#   ## If no servers are specified, no data will be collected
+#   servers = []
+
+
 # # Input plugin for DC/OS metrics
 # [[inputs.dcos]]
 #   ## The DC/OS cluster URL.
@@ -2966,13 +3301,30 @@
 #   ## Timeout for docker list, info, and stats commands
 #   timeout = "5s"
 #
-#   ## Whether to report for each container per-device blkio (8:0, 8:1...) and
-#   ## network (eth0, eth1, ...) stats or not
+#   ## Whether to report for each container per-device blkio (8:0, 8:1...),
+#   ## network (eth0, eth1, ...) and cpu (cpu0, cpu1, ...) stats or not.
+#   ## Usage of this setting is discouraged since it will be deprecated in favor of 'perdevice_include'.
+#   ## Default value is 'true' for backwards compatibility, please set it to 'false' so that 'perdevice_include' setting
+#   ## is honored.
 #   perdevice = true
 #
-#   ## Whether to report for each container total blkio and network stats or not
+#   ## Specifies for which classes a per-device metric should be issued
+#   ## Possible values are 'cpu' (cpu0, cpu1, ...), 'blkio' (8:0, 8:1, ...) and 'network' (eth0, eth1, ...)
+#   ## Please note that this setting has no effect if 'perdevice' is set to 'true'
+#   # perdevice_include = ["cpu"]
+#
+#   ## Whether to report for each container total blkio and network stats or not.
+#   ## Usage of this setting is discouraged since it will be deprecated in favor of 'total_include'.
+#   ## Default value is 'false' for backwards compatibility, please set it to 'true' so that 'total_include' setting
+#   ## is honored.
 #   total = false
 #
+#   ## Specifies for which classes a total metric should be issued. Total is an aggregated of the 'perdevice' values.
+#   ## Possible values are 'cpu', 'blkio' and 'network'
+#   ## Total 'cpu' is reported directly by Docker daemon, and 'network' and 'blkio' totals are aggregated by this plugin.
+#   ## Please note that this setting has no effect if 'total' is set to 'false'
+#   # total_include = ["cpu", "blkio", "network"]
+#
 #   ## Which environment variables should we use as a tag
 #   ##tag_env = ["JAVA_HOME", "HEAP_SIZE"]
 #
@@ -3065,6 +3417,7 @@
 #   cluster_stats_only_from_master = true
 #
 #   ## Indices to collect; can be one or more indices names or _all
+#   ## Use of wildcards is allowed. Use a wildcard at the end to retrieve index names that end with a changing value, like a date.
 #   indices_include = ["_all"]
 #
 #   ## One of "shards", "cluster", "indices"
@@ -3085,6 +3438,11 @@
 #   # tls_key = "/etc/telegraf/key.pem"
 #   ## Use TLS but skip chain & host verification
 #   # insecure_skip_verify = false
+#
+#   ## Sets the number of most recent indices to return for indices that are configured with a date-stamped suffix.
+#   ## Each 'indices_include' entry ending with a wildcard (*) or glob matching pattern will group together all indices that match it, and sort them
+#   ## by the date or number after the wildcard. Metrics then are gathered for only the 'num_most_recent_indices' amount of most recent indices.
+#   # num_most_recent_indices = 0
 
 
 # # Returns ethtool statistics for given interfaces
@@ -4478,6 +4836,35 @@
 #   # no configuration
 
 
+# # Read per-mount NFS client metrics from /proc/self/mountstats
+# [[inputs.nfsclient]]
+#   ## Read more low-level metrics (optional, defaults to false)
+#   # fullstat = false
+#
+#   ## List of mounts to explictly include or exclude (optional)
+#   ## The pattern (Go regexp) is matched against the mount point (not the
+#   ## device being mounted).  If include_mounts is set, all mounts are ignored
+#   ## unless present in the list. If a mount is listed in both include_mounts
+#   ## and exclude_mounts, it is excluded.  Go regexp patterns can be used.
+#   # include_mounts = []
+#   # exclude_mounts = []
+#
+#   ## List of operations to include or exclude from collecting.  This applies
+#   ## only when fullstat=true.  Symantics are similar to {include,exclude}_mounts:
+#   ## the default is to collect everything; when include_operations is set, only
+#   ## those OPs are collected; when exclude_operations is set, all are collected
+#   ## except those listed.  If include and exclude are set, the OP is excluded.
+#   ## See /proc/self/mountstats for a list of valid operations; note that
+#   ## NFSv3 and NFSv4 have different lists.  While it is not possible to
+#   ## have different include/exclude lists for NFSv3/4, unused elements
+#   ## in the list should be okay.  It is possible to have different lists
+#   ## for different mountpoints:  use mulitple [[input.nfsclient]] stanzas,
+#   ## with their own lists.  See "include_mounts" above, and be careful of
+#   ## duplicate metrics.
+#   # include_operations = []
+#   # exclude_operations = []
+
+
 # # Read Nginx's basic status information (ngx_http_stub_status_module)
 # [[inputs.nginx]]
 #   # An array of Nginx stub_status URI to gather stats.
@@ -5070,6 +5457,41 @@
 #   urls = ["http://localhost:8080/_raindrops"]
 
 
+# # Reads metrics from RavenDB servers via the Monitoring Endpoints
+# [[inputs.ravendb]]
+#   ## Node URL and port that RavenDB is listening on
+#   url = "https://localhost:8080"
+#
+#   ## RavenDB X509 client certificate setup
+#   # tls_cert = "/etc/telegraf/raven.crt"
+#   # tls_key = "/etc/telegraf/raven.key"
+#
+#   ## Optional request timeout
+#   ##
+#   ## Timeout, specifies the amount of time to wait
+#   ## for a server's response headers after fully writing the request and
+#   ## time limit for requests made by this client
+#   # timeout = "5s"
+#
+#   ## List of statistics which are collected
+#   # At least one is required
+#   # Allowed values: server, databases, indexes, collections
+#   #
+#   # stats_include = ["server", "databases", "indexes", "collections"]
+#
+#   ## List of db where database stats are collected
+#   ## If empty, all db are concerned
+#   # db_stats_dbs = []
+#
+#   ## List of db where index status are collected
+#   ## If empty, all indexes from all db are concerned
+#   # index_stats_dbs = []
+#
+#   ## List of db where collection status are collected
+#   ## If empty, all collections from all db are concerned
+#   # collection_stats_dbs = []
+
+
 # # Read CPU, Fans, Powersupply and Voltage metrics of hardware server through redfish APIs
 # [[inputs.redfish]]
 #   ## Server url
@@ -5223,8 +5645,13 @@
 # # Retrieves SNMP values from remote agents
 # [[inputs.snmp]]
 #   ## Agent addresses to retrieve values from.
+#   ##   format:  agents = ["<scheme://><hostname>:<port>"]
+#   ##   scheme:  optional, either udp, udp4, udp6, tcp, tcp4, tcp6.
+#   ##            default is udp
+#   ##   port:    optional
 #   ##   example: agents = ["udp://127.0.0.1:161"]
 #   ##            agents = ["tcp://127.0.0.1:161"]
+#   ##            agents = ["udp4://v4only-snmp-agent"]
 #   agents = ["udp://127.0.0.1:161"]
 #
 #   ## Timeout for each request.
@@ -5249,7 +5676,7 @@
 #   ##
 #   ## Security Name.
 #   # sec_name = "myuser"
-#   ## Authentication protocol; one of "MD5", "SHA", or "".
+#   ## Authentication protocol; one of "MD5", "SHA", "SHA224", "SHA256", "SHA384", "SHA512" or "".
 #   # auth_protocol = "MD5"
 #   ## Authentication password.
 #   # auth_password = "pass"
@@ -5804,6 +6231,32 @@
 ###############################################################################
 
 
+# # Intel Resource Director Technology plugin
+# [[inputs.IntelRDT]]
+# 	## Optionally set sampling interval to Nx100ms.
+# 	## 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"
+#
+# 	## 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"]
+# 	# processes = ["process"]
+
+
 # # AMQP consumer plugin
 # [[inputs.amqp_consumer]]
 #   ## Broker to consume from.
@@ -6124,6 +6577,46 @@
 #   data_format = "influx"
 
 
+# # Ingests files in a directory and then moves them to a target directory.
+# [[inputs.directory_monitor]]
+#   ## The directory to monitor and read files from.
+#   directory = ""
+#   #
+#   ## The directory to move finished files to.
+#   finished_directory = ""
+#   #
+#   ## The directory to move files to upon file error.
+#   ## If not provided, erroring files will stay in the monitored directory.
+#   # error_directory = ""
+#   #
+#   ## The amount of time a file is allowed to sit in the directory before it is picked up.
+#   ## This time can generally be low but if you choose to have a very large file written to the directory and it's potentially slow,
+#   ## set this higher so that the plugin will wait until the file is fully copied to the directory.
+#   # directory_duration_threshold = "50ms"
+#   #
+#   ## A list of the only file names to monitor, if necessary. Supports regex. If left blank, all files are ingested.
+#   # files_to_monitor = ["^.*\.csv"]
+#   #
+#   ## A list of files to ignore, if necessary. Supports regex.
+#   # files_to_ignore = [".DS_Store"]
+#   #
+#   ## Maximum lines of the file to process that have not yet be written by the
+#   ## output. For best throughput set to the size of the output's metric_buffer_limit.
+#   ## Warning: setting this number higher than the output's metric_buffer_limit can cause dropped metrics.
+#   # max_buffered_metrics = 10000
+#   #
+#   ## The maximum amount of file paths to queue up for processing at once, before waiting until files are processed to find more files.
+#   ## Lowering this value will result in *slightly* less memory use, with a potential sacrifice in speed efficiency, if absolutely necessary.
+#   #	file_queue_size = 100000
+#   #
+#   ## The dataformat to be read from the files.
+#   ## Each data format has its own unique set of configuration options, read
+#   ## more about them here:
+#   ## https://github.com/influxdata/telegraf/blob/master/docs/DATA_FORMATS_INPUT.md
+#   ## NOTE: We currently only support parsing newline-delimited JSON. See the format here: https://github.com/ndjson/ndjson-spec
+#   data_format = "influx"
+
+
 # # Read logging output from the Docker engine
 # [[inputs.docker_log]]
 #   ## Docker Endpoint
@@ -6486,7 +6979,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"
@@ -6494,12 +6987,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"]
@@ -7099,6 +7592,16 @@
 #   ## - prometheus.io/path: If the metrics path is not /metrics, define it with this annotation.
 #   ## - prometheus.io/port: If port is not 9102 use this annotation
 #   # monitor_kubernetes_pods = true
+#   ## Get the list of pods to scrape with either the scope of
+#   ## - cluster: the kubernetes watch api (default, no need to specify)
+#   ## - node: the local cadvisor api; for scalability. Note that the config node_ip or the environment variable NODE_IP must be set to the host IP.
+#   # pod_scrape_scope = "cluster"
+#   ## Only for node scrape scope: node IP of the node that telegraf is running on.
+#   ## Either this config or the environment variable NODE_IP must be set.
+#   # node_ip = "10.180.1.1"
+# 	## Only for node scrape scope: interval in seconds for how often to get updated pod list for scraping.
+# 	## Default is 60 seconds.
+# 	# pod_scrape_interval = 60
 #   ## Restricts Kubernetes monitoring to a single namespace
 #   ##   ex: monitor_kubernetes_pods_namespace = "default"
 #   # monitor_kubernetes_pods_namespace = ""
@@ -7313,6 +7816,10 @@
 #   ## Parses datadog extensions to the statsd format
 #   datadog_extensions = false
 #
+#   ## Parses distributions metric as specified in the datadog statsd format
+#   ## https://docs.datadoghq.com/developers/metrics/types/?tab=distribution#definition
+#   datadog_distributions = false
+#
 #   ## Statsd data translation templates, more info can be read here:
 #   ## https://github.com/influxdata/telegraf/blob/master/docs/TEMPLATE_PATTERN.md
 #   # templates = [
@@ -7402,7 +7909,8 @@
 #   ##   "/var/log/**.log"  -> recursively find all .log files in /var/log
 #   ##   "/var/log/*/*.log" -> find all .log files with a parent dir in /var/log
 #   ##   "/var/log/apache.log" -> just tail the apache log file
-#   ##
+#   ##   "/var/log/log[!1-2]*  -> tail files without 1-2
+#   ##   "/var/log/log[^1-2]*  -> identical behavior as above
 #   ## See https://github.com/gobwas/glob for more examples
 #   ##
 #   files = ["/var/mymetrics.out"]
@@ -7436,6 +7944,9 @@
 #   ## https://github.com/influxdata/telegraf/blob/master/docs/DATA_FORMATS_INPUT.md
 #   data_format = "influx"
 #
+#   ## Set the tag that will contain the path of the tailed file. If you don't want this tag, set it to an empty string.
+#   # path_tag = "path"
+#
 #   ## multiline parser/codec
 #   ## https://www.elastic.co/guide/en/logstash/2.4/plugins-filters-multiline.html
 #   #[inputs.tail.multiline]
@@ -7681,3 +8192,4 @@
 # [[inputs.zipkin]]
 #   # path = "/api/v1/spans" # URL path for span data
 #   # port = 9411            # Port on which Telegraf listens
+
diff --git a/go.mod b/go.mod
index 912eb3f..f90bf65 100644
--- a/go.mod
+++ b/go.mod
@@ -1,11 +1,11 @@
 module github.com/influxdata/telegraf
 
-go 1.15
+go 1.16
 
 require (
 	cloud.google.com/go v0.53.0