Merge branch 'master' into feature/2108

.circleci/config.yml

@@ -4,10 +4,10 @@ defaults:
     working_directory: '/go/src/github.com/influxdata/telegraf'
   go-1_9: &go-1_9
     docker:
-      - image: 'circleci/golang:1.9.7'
+      - image: 'quay.io/influxdb/telegraf-ci:1.9.7'
   go-1_10: &go-1_10
     docker:
-      - image: 'circleci/golang:1.10.3'
+      - image: 'quay.io/influxdb/telegraf-ci:1.10.3'
 
 version: 2
 jobs:
@@ -27,53 +27,98 @@ jobs:
           root: '/go/src'
           paths:
             - '*'
+
   test-go-1.9:
     <<: [ *defaults, *go-1_9 ]
     steps:
       - attach_workspace:
           at: '/go/src'
-      - run: 'make test-ci'
+      - run: 'make check'
+      - run: 'make test'
   test-go-1.10:
     <<: [ *defaults, *go-1_10 ]
     steps:
       - attach_workspace:
           at: '/go/src'
-      - run: 'make test-ci'
-      - run: 'GOARCH=386 make test-ci'
+      - run: 'make check'
+      - run: 'make test'
+  test-go-1.10-386:
+    <<: [ *defaults, *go-1_10 ]
+    steps:
+      - attach_workspace:
+          at: '/go/src'
+      - run: 'GOARCH=386 make check'
+      - run: 'GOARCH=386 make test'
+
+  package:
+    <<: [ *defaults, *go-1_10 ]
+    steps:
+      - attach_workspace:
+          at: '/go/src'
+      - run: 'make package'
+      - store_artifacts:
+          path: './build'
+          destination: 'build'
   release:
     <<: [ *defaults, *go-1_10 ]
     steps:
       - attach_workspace:
           at: '/go/src'
-      - run: './scripts/release.sh'
+      - run: 'make package-release'
       - store_artifacts:
-          path: './artifacts'
-          destination: '.'
+          path: './build'
+          destination: 'build'
   nightly:
     <<: [ *defaults, *go-1_10 ]
     steps:
       - attach_workspace:
           at: '/go/src'
-      - run: './scripts/release.sh'
+      - run: 'make package-nightly'
       - store_artifacts:
-          path: './artifacts'
-          destination: '.'
+          path: './build'
+          destination: 'build'
 
 workflows:
   version: 2
-  build_and_release:
+  check:
     jobs:
-      - 'deps'
+      - 'deps':
+          filters:
+            tags:
+              only: /.*/
       - 'test-go-1.9':
           requires:
             - 'deps'
+          filters:
+            tags:
+              only: /.*/
       - 'test-go-1.10':
           requires:
             - 'deps'
+          filters:
+            tags:
+              only: /.*/
+      - 'test-go-1.10-386':
+          requires:
+            - 'deps'
+          filters:
+            tags:
+              only: /.*/
+      - 'package':
+          requires:
+            - 'test-go-1.9'
+            - 'test-go-1.10'
+            - 'test-go-1.10-386'
       - 'release':
           requires:
             - 'test-go-1.9'
             - 'test-go-1.10'
+            - 'test-go-1.10-386'
+          filters:
+            tags:
+              only: /.*/
+            branches:
+              ignore: /.*/
   nightly:
     jobs:
       - 'deps'
@@ -83,10 +128,14 @@ workflows:
       - 'test-go-1.10':
           requires:
             - 'deps'
+      - 'test-go-1.10-386':
+          requires:
+            - 'deps'
       - 'nightly':
           requires:
             - 'test-go-1.9'
             - 'test-go-1.10'
+            - 'test-go-1.10-386'
     triggers:
       - schedule:
           cron: "0 7 * * *"

CHANGELOG.md

@@ -42,6 +42,7 @@
 - [#4403](https://github.com/influxdata/telegraf/pull/4403): Add support for multivalue metrics to collectd parser.
 - [#4418](https://github.com/influxdata/telegraf/pull/4418): Add support for setting kafka client id.
 - [#4332](https://github.com/influxdata/telegraf/pull/4332): Add file input plugin and grok parser.
+- [#4320](https://github.com/influxdata/telegraf/pull/4320): Improve cloudwatch output performance.
 
 ## v1.7.2 [2018-07-18]
 

CONTRIBUTING.md

@@ -30,9 +30,8 @@ which can be found [on our website](http://influxdb.com/community/cla.html)
 
 Assuming you can already build the project, run these in the telegraf directory:
 
-1. `go get -u github.com/golang/dep/cmd/dep`
-2. `dep ensure -vendor-only`
-3. `dep ensure -add github.com/[dependency]/[new-package]`
+1. `dep ensure -vendor-only`
+2. `dep ensure -add github.com/[dependency]/[new-package]`
 
 ## Input Plugins
 
@@ -52,7 +51,9 @@ See below for a quick example.
 * Input Plugins must be added to the
 `github.com/influxdata/telegraf/plugins/inputs/all/all.go` file.
 * The `SampleConfig` function should return valid toml that describes how the
-plugin can be configured. This is include in `telegraf config`.
+plugin can be configured. This is included in `telegraf config`.  Please
+consult the [SampleConfig](https://github.com/influxdata/telegraf/wiki/SampleConfig)
+page for the latest style guidelines.
 * The `Description` function should say in one line what this plugin does.
 
 Let's say you've written a plugin that emits metrics about processes on the
@@ -193,7 +194,9 @@ See below for a quick example.
 * To be available within Telegraf itself, plugins must add themselves to the
 `github.com/influxdata/telegraf/plugins/outputs/all/all.go` file.
 * The `SampleConfig` function should return valid toml that describes how the
-output can be configured. This is include in `telegraf config`.
+plugin can be configured. This is included in `telegraf config`.  Please
+consult the [SampleConfig](https://github.com/influxdata/telegraf/wiki/SampleConfig)
+page for the latest style guidelines.
 * The `Description` function should say in one line what this output does.
 
 ### Output Example