Merge branch 'master' into filecount-plugin

influxdata · Jul 27, 2018 · d1aad8d · d1aad8d
2 parents 040ac3a + 4e1a253
commit d1aad8d
Show file tree

Hide file tree

Showing 131 changed files with 2,548 additions and 907 deletions.
diff --git a/.circleci/config.yml b/.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:
@@ -16,64 +16,109 @@ jobs:
     steps:
       - checkout
       - restore_cache:
-          key: vendor-{{ .Branch }}-{{ checksum "Gopkg.lock" }}
+          key: vendor-{{ checksum "Gopkg.lock" }}
       - run: 'make deps'
       - save_cache:
           name: 'vendored deps'
-          key: vendor-{{ .Branch }}-{{ checksum "Gopkg.lock" }}
+          key: vendor-{{ checksum "Gopkg.lock" }}
           paths:
             - './vendor'
       - persist_to_workspace:
           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 * * *"

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -2,10 +2,19 @@
 
 ### Release Notes
 
+- With the addition of the standalone `grok` input data format, the
+  `logparser` input plugin has been deprecated in favor of using the `tail`
+  input plugin combined with `data_format="grok"` .
+
 ### New Inputs
 
+- [file](./plugins/inputs/file/README.md) - Contributed by @maxunt
 - [tengine](./plugins/inputs/tengine/README.md) - Contributed by @ertaoxu
 
+### New Processors
+
+- [enum](./plugins/processors/enum/README.md) - Contributed by @KarstenSchnitter
+
 ### New Aggregators
 
 - [valuecounter](./plugins/aggregators/valuecounter/README.md) - Contributed by @piotr1212
@@ -24,8 +33,30 @@
 - [#4292](https://github.com/influxdata/telegraf/pull/4292): Add path tag to tail input plugin.
 - [#4322](https://github.com/influxdata/telegraf/pull/4322): Add log message when tail is added or removed from a file.
 - [#4267](https://github.com/influxdata/telegraf/pull/4267): Add option to use of counter time in win perf counters.
+- [#4343](https://github.com/influxdata/telegraf/pull/4343): Add energy and power field and device id tag to fibaro input.
+- [#4347](https://github.com/influxdata/telegraf/pull/4347): Add http path configuration for OpenTSDB output.
+- [#4352](https://github.com/influxdata/telegraf/pull/4352): Gather IPMI metrics concurrently.
+- [#4362](https://github.com/influxdata/telegraf/pull/4362): Add mongo document and connection metrics.
+- [#3772](https://github.com/influxdata/telegraf/pull/3772): Add Enum Processor.
+- [#4386](https://github.com/influxdata/telegraf/pull/4386): Add user tag to procstat input.
+- [#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]
+
+### Bugfixes
+
+- [#4381](https://github.com/influxdata/telegraf/issues/4381): Use localhost as default server tag in zookeeper input.
+- [#4374](https://github.com/influxdata/telegraf/issues/4374): Don't set values when pattern doesn't match in regex processor.
+- [#4416](https://github.com/influxdata/telegraf/issues/4416): Fix output format of printer processor.
+- [#4422](https://github.com/influxdata/telegraf/issues/4422): Fix metric can have duplicate field.
+- [#4389](https://github.com/influxdata/telegraf/issues/4389): Return error if NewRequest fails in http output.
+- [#4335](https://github.com/influxdata/telegraf/issues/4335): Reset read deadline for syslog input.
+- [#4375](https://github.com/influxdata/telegraf/issues/4375): Exclude cached memory on docker input plugin.
 
-## v1.7.1 [unreleased]
+## v1.7.1 [2018-07-03]
 
 ### Bugfixes
 
@@ -35,6 +66,8 @@
 - [#4334](https://github.com/influxdata/telegraf/pull/4334): Fix syslog timestamp parsing with single digit day of month.
 - [#2910](https://github.com/influxdata/telegraf/issues/2910): Handle mysql input variations in the user_statistics collecting.
 - [#4293](https://github.com/influxdata/telegraf/issues/4293): Fix minmax and basicstats aggregators to use uint64.
+- [#4290](https://github.com/influxdata/telegraf/issues/4290): Document swap input plugin.
+- [#4316](https://github.com/influxdata/telegraf/issues/4316): Fix incorrect precision being applied to metric in http_listener.
 
 ## v1.7 [2018-06-12]
 

diff --git a/CONTRIBUTING.md b/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`
-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
@@ -100,6 +101,13 @@ func init() {
 }
 ```
 
+### Input Plugin Development
+
+* Run `make static` followed by `make plugin-[pluginName]` to spin up a docker dev environment
+using docker-compose.
+* ***[Optional]*** When developing a plugin, add a `dev` directory with a `docker-compose.yml` and `telegraf.conf`
+as well as any other supporting files, where sensible.
+
 ## Adding Typed Metrics
 
 In addition the the `AddFields` function, the accumulator also supports an
@@ -186,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