Skip to content

Commit 9bf2980

Browse files
committed
Merge branch 'master' into InputPlugin_2673_Traefik
* 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 ...
2 parents 97d015c + 87f711a commit 9bf2980

File tree

360 files changed

+54626
-10469
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

360 files changed

+54626
-10469
lines changed

.circleci/config.yml

Lines changed: 73 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -1,48 +1,105 @@
11
---
2-
defaults: &defaults
3-
docker:
4-
- image: 'circleci/golang:1.9.2'
5-
working_directory: '/go/src/github.com/influxdata/telegraf'
2+
defaults:
3+
defaults: &defaults
4+
working_directory: '/go/src/github.com/influxdata/telegraf'
5+
go-1_8: &go-1_8
6+
docker:
7+
- image: 'circleci/golang:1.8.7'
8+
go-1_9: &go-1_9
9+
docker:
10+
- image: 'circleci/golang:1.9.5'
11+
go-1_10: &go-1_10
12+
docker:
13+
- image: 'circleci/golang:1.10.1'
14+
615
version: 2
716
jobs:
8-
build:
9-
<<: *defaults
17+
deps:
18+
<<: [ *defaults, *go-1_10 ]
1019
steps:
1120
- checkout
12-
- run: 'make ci-test'
21+
- run: 'make deps'
22+
- persist_to_workspace:
23+
root: '/go/src'
24+
paths:
25+
- '*'
26+
test-go-1.8:
27+
<<: [ *defaults, *go-1_8 ]
28+
steps:
29+
- attach_workspace:
30+
at: '/go/src'
31+
- run: 'make test-ci'
32+
test-go-1.9:
33+
<<: [ *defaults, *go-1_9 ]
34+
steps:
35+
- attach_workspace:
36+
at: '/go/src'
37+
- run: 'make test-ci'
38+
test-go-1.10:
39+
<<: [ *defaults, *go-1_10 ]
40+
steps:
41+
- attach_workspace:
42+
at: '/go/src'
43+
- run: 'make test-ci'
44+
- run: 'GOARCH=386 make test-ci'
1345
release:
14-
<<: *defaults
46+
<<: [ *defaults, *go-1_10 ]
1547
steps:
16-
- checkout
48+
- attach_workspace:
49+
at: '/go/src'
1750
- run: './scripts/release.sh'
1851
- store_artifacts:
1952
path: './artifacts'
2053
destination: '.'
2154
nightly:
22-
<<: *defaults
55+
<<: [ *defaults, *go-1_10 ]
2356
steps:
24-
- checkout
57+
- attach_workspace:
58+
at: '/go/src'
2559
- run: './scripts/release.sh'
2660
- store_artifacts:
2761
path: './artifacts'
2862
destination: '.'
63+
2964
workflows:
3065
version: 2
3166
build_and_release:
3267
jobs:
33-
- 'build'
68+
- 'deps'
69+
- 'test-go-1.8':
70+
requires:
71+
- 'deps'
72+
- 'test-go-1.9':
73+
requires:
74+
- 'deps'
75+
- 'test-go-1.10':
76+
requires:
77+
- 'deps'
3478
- 'release':
3579
requires:
36-
- 'build'
80+
- 'test-go-1.8'
81+
- 'test-go-1.9'
82+
- 'test-go-1.10'
3783
nightly:
3884
jobs:
39-
- 'build'
85+
- 'deps'
86+
- 'test-go-1.8':
87+
requires:
88+
- 'deps'
89+
- 'test-go-1.9':
90+
requires:
91+
- 'deps'
92+
- 'test-go-1.10':
93+
requires:
94+
- 'deps'
4095
- 'nightly':
4196
requires:
42-
- 'build'
97+
- 'test-go-1.8'
98+
- 'test-go-1.9'
99+
- 'test-go-1.10'
43100
triggers:
44101
- schedule:
45-
cron: "0 18 * * *"
102+
cron: "0 7 * * *"
46103
filters:
47104
branches:
48105
only:

.github/ISSUE_TEMPLATE.md

Lines changed: 0 additions & 44 deletions
This file was deleted.
Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,24 @@
1+
---
2+
name: Bug report
3+
about: Create a report to help us improve
4+
5+
---
6+
7+
### Relevant telegraf.conf:
8+
9+
### System info:
10+
11+
[Include Telegraf version, operating system name, and other relevant details]
12+
13+
### Steps to reproduce:
14+
15+
1. ...
16+
2. ...
17+
18+
### Expected behavior:
19+
20+
### Actual behavior:
21+
22+
### Additional info:
23+
24+
[Include gist of relevant config, logs, etc.]
Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,17 @@
1+
---
2+
name: Feature request
3+
about: Suggest an idea for this project
4+
5+
---
6+
7+
## Feature Request
8+
9+
Opening a feature request kicks off a discussion.
10+
11+
### Proposal:
12+
13+
### Current behavior:
14+
15+
### Desired behavior:
16+
17+
### Use case: [Why is this important (helps with prioritizing requests)]

.gitignore

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
1-
build
1+
/build
22
/telegraf
3+
/telegraf.exe
34
/telegraf.gz
4-
*~
5-
*#

0 commit comments

Comments
 (0)