Merge branch 'master' into extract-prometheus-parser

.circleci/config.yml

@@ -4,12 +4,12 @@ defaults:
     working_directory: '/go/src/github.com/influxdata/telegraf'
     environment:
       GOFLAGS: -p=8
-  go-1_13: &go-1_13
-    docker:
-      - 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'
+      - image: 'quay.io/influxdb/telegraf-ci:1.14.9'
+  go-1_15: &go-1_15
+    docker:
+      - image: 'quay.io/influxdb/telegraf-ci:1.15.2'
   mac: &mac
     macos:
       xcode: 11.3.1
@@ -21,7 +21,7 @@ defaults:
 version: 2
 jobs:
   deps:
-    <<: [ *defaults, *go-1_14 ]
+    <<: [ *defaults, *go-1_15 ]
     steps:
       - checkout
       - restore_cache:
@@ -43,7 +43,7 @@ jobs:
       - checkout
       - restore_cache:
           key: mac-go-mod-v1-{{ checksum "go.sum" }}
-      - run: 'brew install go@1.13'
+      - run: 'brew install go' # latest
       - run: 'make deps'
       - run: 'make tidy'
       - save_cache:
@@ -62,38 +62,38 @@ jobs:
             - 'usr/local/bin/gofmt'
             - 'Users/distiller/go'
 
-  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 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 test'
-  test-go-1.14:
-    <<: [ *defaults, *go-1_14 ]
+  test-go-1.15:
+    <<: [ *defaults, *go-1_15 ]
     steps:
       - attach_workspace:
           at: '/go'
       - run: 'make'
       - run: 'make check'
       - run: 'make check-deps'
       - run: 'make test'
-  test-go-1.14-386:
-    <<: [ *defaults, *go-1_14 ]
+  test-go-1.15-386:
+    <<: [ *defaults, *go-1_15 ]
     steps:
       - attach_workspace:
           at: '/go'
       - run: 'GOARCH=386 make'
       - run: 'GOARCH=386 make check'
       - run: 'GOARCH=386 make test'
-  test-go-1.13-darwin:
+  test-go-darwin:
     <<: [ *mac ]
     steps:
       - attach_workspace:
@@ -103,32 +103,34 @@ jobs:
       - run: 'make test'
 
   package:
-    <<: [ *defaults, *go-1_14 ]
+    <<: [ *defaults, *go-1_15 ]
     steps:
       - attach_workspace:
           at: '/go'
       - run: 'make package'
       - store_artifacts:
-          path: './build'
-          destination: 'build'
+          path: './build/dist'
+          destination: 'build/dist'
+
   release:
-    <<: [ *defaults, *go-1_14 ]
+    <<: [ *defaults, *go-1_15 ]
     steps:
       - attach_workspace:
           at: '/go'
-      - run: 'make package-release'
+      - run: 'make package'
       - store_artifacts:
-          path: './build'
-          destination: 'build'
+          path: './build/dist'
+          destination: 'build/dist'
   nightly:
-    <<: [ *defaults, *go-1_14 ]
+    <<: [ *defaults, *go-1_15 ]
     steps:
       - attach_workspace:
           at: '/go'
-      - run: 'make package-nightly'
+      - run: 'NIGHTLY=1 make package'
+      - run: 'make upload-nightly'
       - store_artifacts:
-          path: './build'
-          destination: 'build'
+          path: './build/dist'
+          destination: 'build/dist'
 
 workflows:
   version: 2
@@ -142,48 +144,50 @@ workflows:
           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.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.13-darwin':
+      - 'test-go-darwin':
           requires:
             - 'macdeps'
           filters:
             tags: # only runs on tags if you specify this filter
               only: /.*/
       - 'package':
           requires:
-            - 'test-go-1.13'
-            - 'test-go-1.13-386'
+            - 'test-go-darwin'
             - 'test-go-1.14'
             - 'test-go-1.14-386'
+            - 'test-go-1.15'
+            - 'test-go-1.15-386'
       - 'release':
           requires:
-            - 'test-go-1.13'
-            - 'test-go-1.13-386'
+            - 'test-go-darwin'
             - 'test-go-1.14'
             - 'test-go-1.14-386'
+            - 'test-go-1.15'
+            - 'test-go-1.15-386'
           filters:
             tags:
               only: /.*/
@@ -192,24 +196,29 @@ workflows:
   nightly:
     jobs:
       - 'deps'
-      - 'test-go-1.13':
+      - 'macdeps'
+      - 'test-go-1.14':
           requires:
             - 'deps'
-      - 'test-go-1.13-386':
+      - 'test-go-1.14-386':
           requires:
             - 'deps'
-      - 'test-go-1.14':
+      - 'test-go-1.15':
           requires:
             - 'deps'
-      - 'test-go-1.14-386':
+      - 'test-go-1.15-386':
           requires:
             - 'deps'
+      - 'test-go-darwin':
+          requires:
+            - 'macdeps'
       - 'nightly':
           requires:
-            - 'test-go-1.13'
-            - 'test-go-1.13-386'
+            - 'test-go-darwin'
             - 'test-go-1.14'
             - 'test-go-1.14-386'
+            - 'test-go-1.15'
+            - 'test-go-1.15-386'
     triggers:
       - schedule:
           cron: "0 7 * * *"

.github/ISSUE_TEMPLATE/Bug_report.md

@@ -1,5 +1,6 @@
 ---
 name: Bug report
+labels: bug
 about: Create a report to help us improve
 
 ---

.github/ISSUE_TEMPLATE/Feature_request.md

@@ -1,5 +1,6 @@
 ---
 name: Feature request
+labels: feature request
 about: Suggest an idea for this project
 
 ---

.github/ISSUE_TEMPLATE/Support.md

@@ -0,0 +1,22 @@
+---
+name: Support request
+labels: support
+about: Open a support request
+
+---
+
+<!--
+WOAHH, hold up. This isn't this best place for support questions. 
+  You can get a faster response on slack or forums:
+
+Please redirect any QUESTIONS about Telegraf usage to 
+- InfluxData Slack Channel: https://www.influxdata.com/slack 
+- InfluxData Community Site: https://community.influxdata.com
+
+Check the documentation for the related plugin including the troubleshooting
+section if available.
+
+https://docs.influxdata.com/telegraf
+https://github.com/influxdata/telegraf/tree/master/docs
+
+-->

.gitignore

@@ -1,5 +1,7 @@
+/.idea
 /build
 /telegraf
 /telegraf.exe
 /telegraf.gz
 /vendor
+.DS_Store