Merge branch 'master' of https://github.com/influxdata/telegraf

influxdata · Jun 20, 2020 · 415e3cd · 415e3cd
2 parents 3fc716c + b4bfecc
commit 415e3cd
Show file tree

Hide file tree

Showing 533 changed files with 44,963 additions and 19,637 deletions.
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -4,19 +4,24 @@ defaults:
     working_directory: '/go/src/github.com/influxdata/telegraf'
     environment:
       GOFLAGS: -p=8
-  go-1_12: &go-1_12
-    docker:
-      - image: 'quay.io/influxdb/telegraf-ci:1.12.14'
-        environment:
-          GO111MODULE: 'on'
   go-1_13: &go-1_13
     docker:
-      - image: 'quay.io/influxdb/telegraf-ci:1.13.5'
+      - image: 'quay.io/influxdb/telegraf-ci:1.13.11'
+  go-1_14: &go-1_14
+    docker:
+      - image: 'quay.io/influxdb/telegraf-ci:1.14.3'
+  mac: &mac
+    macos:
+      xcode: 11.3.1
+    working_directory: '~/go/src/github.com/influxdata/telegraf'
+    environment:
+      HOMEBREW_NO_AUTO_UPDATE: 1
+      GOFLAGS: -p=8
 
 version: 2
 jobs:
   deps:
-    <<: [ *defaults, *go-1_13 ]
+    <<: [ *defaults, *go-1_14 ]
     steps:
       - checkout
       - restore_cache:
@@ -32,42 +37,73 @@ jobs:
           root: '/go'
           paths:
             - '*'
+  macdeps:
+    <<: [ *mac ]
+    steps:
+      - checkout
+      - restore_cache:
+          key: mac-go-mod-v1-{{ checksum "go.sum" }}
+      - run: 'brew install go@1.13'
+      - run: 'make deps'
+      - run: 'make tidy'
+      - save_cache:
+          name: 'go module cache'
+          key: mac-go-mod-v1-{{ 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.12:
-    <<: [ *defaults, *go-1_12 ]
+  test-go-1.13:
+    <<: [ *defaults, *go-1_13 ]
     steps:
       - attach_workspace:
           at: '/go'
       - run: 'make'
-      - run: 'make check'
       - run: 'make test'
-  test-go-1.12-386:
-    <<: [ *defaults, *go-1_12 ]
+  test-go-1.13-386:
+    <<: [ *defaults, *go-1_13 ]
     steps:
       - attach_workspace:
           at: '/go'
       - run: 'GOARCH=386 make'
-      - run: 'GOARCH=386 make check'
       - run: 'GOARCH=386 make test'
-  test-go-1.13:
-    <<: [ *defaults, *go-1_13 ]
+  test-go-1.14:
+    <<: [ *defaults, *go-1_14 ]
     steps:
       - attach_workspace:
           at: '/go'
       - run: 'make'
       - run: 'make check'
+      - run: 'make check-deps'
       - run: 'make test'
-  test-go-1.13-386:
-    <<: [ *defaults, *go-1_13 ]
+  test-go-1.14-386:
+    <<: [ *defaults, *go-1_14 ]
     steps:
       - attach_workspace:
           at: '/go'
       - run: 'GOARCH=386 make'
       - run: 'GOARCH=386 make check'
       - run: 'GOARCH=386 make test'
+  test-go-1.13-darwin:
+    <<: [ *mac ]
+    steps:
+      - attach_workspace:
+          at: '/'
+      - run: 'make'
+      - run: 'make check'
+      - run: 'make test'
 
   package:
-    <<: [ *defaults, *go-1_13 ]
+    <<: [ *defaults, *go-1_14 ]
     steps:
       - attach_workspace:
           at: '/go'
@@ -76,7 +112,7 @@ jobs:
           path: './build'
           destination: 'build'
   release:
-    <<: [ *defaults, *go-1_13 ]
+    <<: [ *defaults, *go-1_14 ]
     steps:
       - attach_workspace:
           at: '/go'
@@ -85,7 +121,7 @@ jobs:
           path: './build'
           destination: 'build'
   nightly:
-    <<: [ *defaults, *go-1_13 ]
+    <<: [ *defaults, *go-1_14 ]
     steps:
       - attach_workspace:
           at: '/go'
@@ -98,46 +134,56 @@ workflows:
   version: 2
   check:
     jobs:
+      - 'macdeps':
+          filters:
+            tags:
+              only: /.*/
       - 'deps':
           filters:
             tags:
               only: /.*/
-      - 'test-go-1.12':
+      - 'test-go-1.13':
           requires:
             - 'deps'
           filters:
             tags:
               only: /.*/
-      - 'test-go-1.12-386':
+      - 'test-go-1.13-386':
           requires:
             - 'deps'
           filters:
             tags:
               only: /.*/
-      - 'test-go-1.13':
+      - 'test-go-1.14':
           requires:
             - 'deps'
           filters:
             tags:
               only: /.*/
-      - 'test-go-1.13-386':
+      - 'test-go-1.14-386':
           requires:
             - 'deps'
           filters:
             tags:
               only: /.*/
+      - 'test-go-1.13-darwin':
+          requires:
+            - 'macdeps'
+          filters:
+            tags: # only runs on tags if you specify this filter
+              only: /.*/
       - 'package':
           requires:
-            - 'test-go-1.12'
-            - 'test-go-1.12-386'
             - 'test-go-1.13'
             - 'test-go-1.13-386'
+            - 'test-go-1.14'
+            - 'test-go-1.14-386'
       - 'release':
           requires:
-            - 'test-go-1.12'
-            - 'test-go-1.12-386'
             - 'test-go-1.13'
             - 'test-go-1.13-386'
+            - 'test-go-1.14'
+            - 'test-go-1.14-386'
           filters:
             tags:
               only: /.*/
@@ -146,24 +192,24 @@ workflows:
   nightly:
     jobs:
       - 'deps'
-      - 'test-go-1.12':
+      - 'test-go-1.13':
           requires:
             - 'deps'
-      - 'test-go-1.12-386':
+      - 'test-go-1.13-386':
           requires:
             - 'deps'
-      - 'test-go-1.13':
+      - 'test-go-1.14':
           requires:
             - 'deps'
-      - 'test-go-1.13-386':
+      - 'test-go-1.14-386':
           requires:
             - 'deps'
       - 'nightly':
           requires:
-            - 'test-go-1.12'
-            - 'test-go-1.12-386'
             - 'test-go-1.13'
             - 'test-go-1.13-386'
+            - 'test-go-1.14'
+            - 'test-go-1.14-386'
     triggers:
       - schedule:
           cron: "0 7 * * *"

diff --git a/.gitattributes b/.gitattributes
@@ -1,4 +1,5 @@
 CHANGELOG.md merge=union
 README.md merge=union
+go.sum merge=union
 plugins/inputs/all/all.go merge=union
 plugins/outputs/all/all.go merge=union
diff --git a/.github/ISSUE_TEMPLATE/Bug_report.md b/.github/ISSUE_TEMPLATE/Bug_report.md
@@ -21,6 +21,10 @@ section if available.
 
 <!-- Include Telegraf version, operating system, and other relevant details -->
 
+### Docker
+
+<!-- If your bug involves third party dependencies or services, it can be very helpful to provide a Dockerfile or docker-compose.yml that reproduces the environment you're testing against -->
+
 ### Steps to reproduce:
 
 <!-- Describe the steps to reproduce the bug. -->