Postgres

.circleci/config.yml

@@ -8,7 +8,7 @@ executors:
     working_directory: '/go/src/github.com/influxdata/telegraf'
     resource_class: large
     docker:
-      - image: 'quay.io/influxdb/telegraf-ci:1.18.3'
+      - image: 'quay.io/influxdb/telegraf-ci:1.18.4'
     environment:
       GOFLAGS: -p=4
   mac:
@@ -37,14 +37,6 @@ commands:
   check-changed-files-or-halt:
     steps:
       - run: ./scripts/check-file-changes.sh
-  rebase-on-master:
-    steps:
-      - run: |
-          git config --global user.email "[email protected]"
-          git config --global user.name "telegraf"
-          git remote add upstream https://github.com/influxdata/telegraf
-          git fetch upstream
-          git rebase upstream/master
   test-go:
     parameters:
       os:
@@ -62,7 +54,6 @@ commands:
     steps:
       - checkout
       - check-changed-files-or-halt
-      - rebase-on-master
       - when:
           condition:
             equal: [ linux, << parameters.os >> ]
@@ -87,17 +78,30 @@ commands:
                 key: windows-go-<< parameters.cache_version >>-{{ checksum "go.sum" }}
             - run: 'sh ./scripts/installgo_windows.sh'
             - run: choco install mingw
-      - run: mkdir -p test-results
       - run: ./scripts/install_gotestsum.sh << parameters.os >> << parameters.gotestsum >>
       - unless:
           condition:
             equal: [ "386", << parameters.arch >> ]
           steps:
             - run: echo 'export RACE="-race"' >> $BASH_ENV
       - run: |
-          GOARCH=<< parameters.arch >> ./<< parameters.gotestsum >> --junitfile test-results/gotestsum-report.xml -- ${RACE} -short ./...
-      - store_test_results:
-          path: test-results
+          GOARCH=<< parameters.arch >> ./<< parameters.gotestsum >> -- ${RACE} -short -cover -coverprofile=coverage.out ./...
+      - when:
+          condition:
+            and:
+              - equal: [ "master", << pipeline.git.branch >> ]
+              - equal: [ "linux", << parameters.os >> ]
+              - equal: [ "amd64", << parameters.arch >> ]
+          steps:
+            - run:
+                name: "Installing goveralls"
+                command: go install github.com/mattn/goveralls@latest
+            - run:
+                name: "Remove plugins/parsers/influx/machine.go from coverage"
+                command: sed -i '/github.com\/influxdata\/telegraf\/plugins\/parsers\/influx\/machine.go/d' coverage.out
+            - run:
+                name: "Create report"
+                command: /go/bin/goveralls -coverprofile=coverage.out -service=circle-ci -repotoken=${COVERALLS_TOKEN}
       - when:
           condition:
             equal: [ linux, << parameters.os >> ]
@@ -140,7 +144,6 @@ commands:
     steps:
       - checkout
       - check-changed-files-or-halt
-      - rebase-on-master
       - attach_workspace:
           at: '/go'
       - when:
@@ -177,6 +180,7 @@ jobs:
       - restore_cache:
           key: go-mod-v1-{{ checksum "go.sum" }}
       - check-changed-files-or-halt
+      - run: ./scripts/make_docs.sh
       - run: 'make deps'
       - run: 'make tidy'
       - run: 'make check'
@@ -209,9 +213,8 @@ jobs:
     resource_class: large
     steps:
       - checkout
-      - restore_cache:
-          key: go-mod-v1-{{ checksum "go.sum" }}
       - check-changed-files-or-halt
+      - run: 'sh ./scripts/installgo_linux.sh'
       - run: 'make deps'
       - run: 'make test-integration'
   test-go-mac:
@@ -229,6 +232,21 @@ jobs:
           os: windows
           gotestsum: "gotestsum.exe"
 
+  test-licenses:
+    executor: telegraf-ci
+    steps:
+      - checkout
+      - restore_cache:
+          key: go-mod-v1-{{ checksum "go.sum" }}
+      - check-changed-files-or-halt
+      - run: 'make build_tools'
+      - run: './tools/license_checker/license_checker -whitelist ./tools/license_checker/data/whitelist'
+      - save_cache:
+          name: 'go module cache'
+          key: go-mod-v1-{{ checksum "go.sum" }}
+          paths:
+            - '/go/pkg/mod'
+
   windows-package:
     parameters:
       nightly:
@@ -409,6 +427,20 @@ jobs:
             docker tag telegraf-alpine quay.io/influxdb/telegraf-nightly:alpine
             docker image ls
             docker push quay.io/influxdb/telegraf-nightly:alpine
+  amd64-package-test-nightly:
+    machine:
+      image: ubuntu-2004:current
+    steps:
+      - checkout
+      - attach_workspace:
+          at: '.'
+      - run: sudo apt update && sudo apt install -y snapd
+      - run: sudo snap install lxd
+      - run: sudo lxd init --auto
+      - run: sudo usermod -a -G lxd $(whoami)
+      - run: cd tools/package_lxd_test && go build
+      - run: ./tools/package_lxd_test/package_lxd_test --package $(find ./dist -name "*_amd64.deb")
+      - run: ./tools/package_lxd_test/package_lxd_test --package $(find ./dist -name "*.x86_64.rpm")
   package-sign-windows:
     executor:
         name: win/default
@@ -523,72 +555,108 @@ workflows:
           requires:
             - 'test-go-mac'
           filters:
+            branches:
+              ignore:
+                - master
             tags:
               only: /.*/
       - 'i386-package':
           requires:
             - 'test-go-linux-386'
           filters:
+            branches:
+              ignore:
+                - master
             tags:
               only: /.*/
       - 'ppc64le-package':
           requires:
             - 'test-go-linux'
           filters:
+            branches:
+              ignore:
+                - master
             tags:
               only: /.*/
       - 'riscv64-package':
           requires:
             - 'test-go-linux'
           filters:
+            branches:
+              ignore:
+                - master
             tags:
               only: /.*/
       - 's390x-package':
           requires:
             - 'test-go-linux'
           filters:
+            branches:
+              ignore:
+                - master
             tags:
               only: /.*/
       - 'armel-package':
           requires:
             - 'test-go-linux'
           filters:
+            branches:
+              ignore:
+                - master
             tags:
               only: /.*/
       - 'amd64-package':
           requires:
             - 'test-go-linux'
           filters:
+            branches:
+              ignore:
+                - master
             tags:
               only: /.*/
       - 'arm64-package':
           requires:
             - 'test-go-linux'
           filters:
+            branches:
+              ignore:
+                - master
             tags:
               only: /.*/
       - 'armhf-package':
           requires:
             - 'test-go-linux'
           filters:
+            branches:
+              ignore:
+                - master
             tags:
               only: /.*/
       - 'static-package':
           requires:
             - 'test-go-linux'
           filters:
+            branches:
+              ignore:
+                - master
             tags:
               only: /.*/
       - 'mipsel-package':
           requires:
             - 'test-go-linux'
           filters:
+            branches:
+              ignore:
+                - master
             tags:
               only: /.*/
       - 'mips-package':
           requires:
             - 'test-go-linux'
           filters:
+            branches:
+              ignore:
+                - master
             tags:
               only: /.*/
       - 'generate-config':
@@ -672,6 +740,7 @@ workflows:
       - 'test-go-linux-386'
       - 'test-go-mac'
       - 'test-go-windows'
+      - 'test-licenses'
       - 'windows-package':
           name: 'windows-package-nightly'
           nightly: true
@@ -742,25 +811,35 @@ workflows:
           nightly: true
           requires:
             - 'test-go-linux'
+      - 'package-sign-windows':
+          requires:
+            - 'windows-package-nightly'
+      - 'package-sign-mac':
+           requires:
+            - 'darwin-amd64-package-nightly'
+            - 'darwin-arm64-package-nightly'
       - nightly:
           requires:
+            - 'amd64-package-test-nightly'
+            - 'arm64-package-nightly'
+            - 'armel-package-nightly'
+            - 'armhf-package-nightly'
+            - 'darwin-amd64-package-nightly'
+            - 'darwin-arm64-package-nightly'
             - 'i386-package-nightly'
+            - 'mips-package-nightly'
+            - 'mipsel-package-nightly'
             - 'ppc64le-package-nightly'
             - 'riscv64-package-nightly'
             - 's390x-package-nightly'
-            - 'armel-package-nightly'
-            - 'amd64-package-nightly'
-            - 'mipsel-package-nightly'
-            - 'mips-package-nightly'
-            - 'darwin-amd64-package-nightly'
-            - 'darwin-arm64-package-nightly'
-            - 'windows-package-nightly'
             - 'static-package-nightly'
-            - 'arm64-package-nightly'
-            - 'armhf-package-nightly'
+            - 'windows-package-nightly'
       - docker-nightly:
           requires:
             - 'nightly'
+      - amd64-package-test-nightly:
+          requires:
+            - 'amd64-package-nightly'
     triggers:
       - schedule:
           cron: "0 7 * * *"

.github/PULL_REQUEST_TEMPLATE.md

@@ -1,4 +1,13 @@
-### Required for all PRs:
+# Required for all PRs
+
+<!-- Before opening a pull request you should run the following checks to make sure the CI will pass.
+
+make check
+make check-deps
+make test
+make docs
+
+-->
 
 <!-- Complete the tasks in the following list. Change [ ] to [x] to
 show completion. -->

.github/dependabot.yml

@@ -7,5 +7,3 @@ updates:
     ignore:
       # Dependabot isn't able to update this packages that do not match the source, so anything with a version
       - dependency-name: "*.v*"
-    commit-message:
-      prefix: "fix:"

.gitignore

@@ -3,6 +3,8 @@
 /telegraf
 /telegraf.exe
 /telegraf.gz
+/tools/package_lxd_test/package_lxd_test
+/tools/license_checker/license_checker
 /tools/readme_config_includer/generator
 /vendor
 .DS_Store

.golangci.yml

@@ -126,7 +126,7 @@ issues:
     - path: _test\.go
       text: "parameter.*seems to be a control flag, avoid control coupling"
 
-    - path: (^agent/|^cmd/|^config/|^filter/|^internal/|^logger/|^metric/|^models/|^selfstat/|^testutil/|^plugins/serializers/)
+    - path: (^agent/|^cmd/|^config/|^filter/|^internal/|^logger/|^metric/|^models/|^selfstat/|^testutil/|^plugins/serializers/|^plugins/inputs/zipkin/cmd)
       text: "imports-blacklist: should not use the following blacklisted import: \"log\""
       linters:
         - revive