Skip to content

Commit

Permalink
Merge branch 'master' into InputPlugin_2673_Traefik
Browse files Browse the repository at this point in the history
* master: (329 commits)
  Fix panic with unicode counter names in win_perf_counters  (influxdata#4255)
  Update go-syslog version
  Update changelog
  Update tengine docs
  Restore tengine input plugin (influxdata#4160)
  Fix TLS and SSL config option parsing (influxdata#4247)
  Update changelog
  Use same flags for all bsd family ping varients (influxdata#4241)
  Ignore more boring filesystems from disk plugin (influxdata#4244)
  Update changelog
  Add SSL/TLS support to Redis input (influxdata#4236)
  Don't skip metrics during startup in aggregate phase (influxdata#4230)
  Set 1.6.4 release date
  Update master version to 1.8
  Update sample config
  Add go-syslog to dependencies licenses list
  Update changelog
  Revert "Update aerospike-client-go version to latest release (influxdata#4128)"
  Update changelog
  Fix misnamed option in varnish sample config
  ...
  • Loading branch information
mkboudreau committed Jun 11, 2018
2 parents 97d015c + 87f711a commit 9bf2980
Show file tree
Hide file tree
Showing 360 changed files with 54,626 additions and 10,469 deletions.
89 changes: 73 additions & 16 deletions .circleci/config.yml
Original file line number Diff line number Diff line change
@@ -1,48 +1,105 @@
---
defaults: &defaults
docker:
- image: 'circleci/golang:1.9.2'
working_directory: '/go/src/github.com/influxdata/telegraf'
defaults:
defaults: &defaults
working_directory: '/go/src/github.com/influxdata/telegraf'
go-1_8: &go-1_8
docker:
- image: 'circleci/golang:1.8.7'
go-1_9: &go-1_9
docker:
- image: 'circleci/golang:1.9.5'
go-1_10: &go-1_10
docker:
- image: 'circleci/golang:1.10.1'

version: 2
jobs:
build:
<<: *defaults
deps:
<<: [ *defaults, *go-1_10 ]
steps:
- checkout
- run: 'make ci-test'
- run: 'make deps'
- persist_to_workspace:
root: '/go/src'
paths:
- '*'
test-go-1.8:
<<: [ *defaults, *go-1_8 ]
steps:
- attach_workspace:
at: '/go/src'
- run: 'make test-ci'
test-go-1.9:
<<: [ *defaults, *go-1_9 ]
steps:
- attach_workspace:
at: '/go/src'
- run: 'make test-ci'
test-go-1.10:
<<: [ *defaults, *go-1_10 ]
steps:
- attach_workspace:
at: '/go/src'
- run: 'make test-ci'
- run: 'GOARCH=386 make test-ci'
release:
<<: *defaults
<<: [ *defaults, *go-1_10 ]
steps:
- checkout
- attach_workspace:
at: '/go/src'
- run: './scripts/release.sh'
- store_artifacts:
path: './artifacts'
destination: '.'
nightly:
<<: *defaults
<<: [ *defaults, *go-1_10 ]
steps:
- checkout
- attach_workspace:
at: '/go/src'
- run: './scripts/release.sh'
- store_artifacts:
path: './artifacts'
destination: '.'

workflows:
version: 2
build_and_release:
jobs:
- 'build'
- 'deps'
- 'test-go-1.8':
requires:
- 'deps'
- 'test-go-1.9':
requires:
- 'deps'
- 'test-go-1.10':
requires:
- 'deps'
- 'release':
requires:
- 'build'
- 'test-go-1.8'
- 'test-go-1.9'
- 'test-go-1.10'
nightly:
jobs:
- 'build'
- 'deps'
- 'test-go-1.8':
requires:
- 'deps'
- 'test-go-1.9':
requires:
- 'deps'
- 'test-go-1.10':
requires:
- 'deps'
- 'nightly':
requires:
- 'build'
- 'test-go-1.8'
- 'test-go-1.9'
- 'test-go-1.10'
triggers:
- schedule:
cron: "0 18 * * *"
cron: "0 7 * * *"
filters:
branches:
only:
Expand Down
44 changes: 0 additions & 44 deletions .github/ISSUE_TEMPLATE.md

This file was deleted.

24 changes: 24 additions & 0 deletions .github/ISSUE_TEMPLATE/Bug_report.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,24 @@
---
name: Bug report
about: Create a report to help us improve

---

### Relevant telegraf.conf:

### System info:

[Include Telegraf version, operating system name, and other relevant details]

### Steps to reproduce:

1. ...
2. ...

### Expected behavior:

### Actual behavior:

### Additional info:

[Include gist of relevant config, logs, etc.]
17 changes: 17 additions & 0 deletions .github/ISSUE_TEMPLATE/Feature_request.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
---
name: Feature request
about: Suggest an idea for this project

---

## Feature Request

Opening a feature request kicks off a discussion.

### Proposal:

### Current behavior:

### Desired behavior:

### Use case: [Why is this important (helps with prioritizing requests)]
5 changes: 2 additions & 3 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
build
/build
/telegraf
/telegraf.exe
/telegraf.gz
*~
*#
Loading

0 comments on commit 9bf2980

Please sign in to comment.