Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/master' into postgres
Browse files Browse the repository at this point in the history
* origin/master: (183 commits)
  fix: CrateDB replace dots in tag keys with underscores (influxdata#9566)
  feat: Pull metrics from multiple AWS CloudWatch namespaces (influxdata#9386)
  fix: improve Clickhouse corner cases for empty recordset in aggregation queries, fix dictionaries behavior (influxdata#9401)
  fix(opcua): clean client on disconnect so that connect works cleanly (influxdata#9583)
  fix: Refactor ec2 init for config-api (influxdata#9576)
  fix: sort logs by timestamp before writing to Loki (influxdata#9571)
  fix: muting tests for udp_listener (influxdata#9578)
  fix: Do not return on disconnect to avoid breaking reconnect (influxdata#9524)
  fix: Fixing k8s nodes and pods parsing error (influxdata#9581)
  feat: OpenTelemetry output plugin (influxdata#9228)
  feat: Support AWS Web Identity Provider (influxdata#9411)
  fix: upgraded sensu/go to v2.9.0 (influxdata#9577)
  fix: Normalize unix socket path (influxdata#9554)
  docs: fix aws ec2 readme inconsistency (influxdata#9567)
  feat: Modbus Rtu over tcp enhancement (influxdata#9570)
  docs: information on new conventional commit format (influxdata#9573)
  docs: Add logo (influxdata#9574)
  docs: Adding links to net_irtt and dht_sensor external plugins (influxdata#9569)
  Upgrade hashicorp/consul/api to 1.9.1 (influxdata#9565)
  Update vmware/govmomi to v0.26.0 (influxdata#9552)
  Do not skip good quality nodes after a bad quality node is encountered (influxdata#9550)
  fix test so it hits a fake service (influxdata#9564)
  Update changelog
  Fix procstat plugin README to match sample config (influxdata#9553)
  Fix metrics reported as written but not actually written  (influxdata#9526)
  Prevent segfault in persistent volume claims (influxdata#9549)
  Update procstat to support cgroup globs & include systemd unit children (Copy of influxdata#7890) (influxdata#9488)
  Fix attempt to connect to an empty list of servers. (influxdata#9503)
  Fix handling bool in sql input plugin (influxdata#9540)
  Suricata alerts (influxdata#9322)
  Linter fixes for plugins/inputs/[fg]* (influxdata#9387)
  For Prometheus Input add ability to query Consul Service catalog (influxdata#5464)
  Support Landing page on Prometheus landing page (influxdata#8641)
  [Docs] Clarify tagging behavior (influxdata#9461)
  Change the timeout from all queries to per query (influxdata#9471)
  Attach the pod labels to the `kubernetes_pod_volume` & `kubernetes_pod_network` metrics. (influxdata#9438)
  feat(http_listener_v2): allows multiple paths and add path_tag (influxdata#9529)
  Bug Fix Snmp empty metric name (influxdata#9519)
  Worktable workfile stats (influxdata#8587)
  Update Go to v1.16.6 (influxdata#9542)
  ...
  • Loading branch information
phemmer committed Aug 13, 2021
2 parents ff644a9 + eb41218 commit fa5f937
Show file tree
Hide file tree
Showing 480 changed files with 25,590 additions and 5,320 deletions.
161 changes: 147 additions & 14 deletions .circleci/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ executors:
go-1_16:
working_directory: '/go/src/github.com/influxdata/telegraf'
docker:
- image: 'quay.io/influxdb/telegraf-ci:1.16.2'
- image: 'quay.io/influxdb/telegraf-ci:1.16.6'
environment:
GOFLAGS: -p=8
mac:
Expand Down Expand Up @@ -47,25 +47,38 @@ commands:
- run: 'GOARCH=<< parameters.goarch >> make check'
- run: 'GOARCH=<< parameters.goarch >> make check-deps'
- run: 'GOARCH=<< parameters.goarch >> make test'
package:
package-build:
parameters:
release:
type: boolean
default: false
nightly:
type: boolean
default: false
type:
type: string
default: ""
steps:
- checkout
- check-changed-files-or-halt
- attach_workspace:
at: '/go'
- when:
condition: << parameters.release >>
steps:
- run: 'mips=1 mipsel=1 arm64=1 amd64=1 static=1 armel=1 armhf=1 s390x=1 ppc641e=1 i386=1 windows=1 darwin=1 make package'
- when:
condition: << parameters.nightly >>
steps:
- run: 'NIGHTLY=1 make package'
- run: 'mips=1 mipsel=1 arm64=1 amd64=1 static=1 armel=1 armhf=1 s390x=1 ppc641e=1 i386=1 windows=1 darwin=1 NIGHTLY=1 make package'
- run: 'make upload-nightly'
- unless:
condition: << parameters.nightly >>
condition:
or:
- << parameters.nightly >>
- << parameters.release >>
steps:
- run: 'make package'
- run: '<< parameters.type >>=1 make package'
- store_artifacts:
path: './build/dist'
destination: 'build/dist'
Expand Down Expand Up @@ -137,24 +150,92 @@ jobs:
steps:
- checkout
- check-changed-files-or-halt-windows
- run: choco upgrade golang --version=1.16.2
- run: choco upgrade golang --version=1.16.6
- run: choco install make
- run: git config --system core.longpaths true
- run: make test-windows

package:
windows-package:
executor: go-1_16
steps:
- package-build:
type: windows
darwin-package:
executor: go-1_16
steps:
- package-build:
type: darwin
i386-package:
executor: go-1_16
steps:
- package-build:
type: i386
ppc641e-package:
executor: go-1_16
steps:
- package-build:
type: ppc641e
s390x-package:
executor: go-1_16
steps:
- package-build:
type: s390x
armel-package:
executor: go-1_16
steps:
- package-build:
type: armel
amd64-package:
executor: go-1_16
steps:
- package-build:
type: amd64
arm64-package:
executor: go-1_16
steps:
- package-build:
type: arm64
mipsel-package:
executor: go-1_16
steps:
- package-build:
type: mipsel
mips-package:
executor: go-1_16
steps:
- package
- package-build:
type: mips
static-package:
executor: go-1_16
steps:
- package-build:
type: static
armhf-package:
executor: go-1_16
steps:
- package-build:
type: armhf

release:
executor: go-1_16
steps:
- package
- package-build:
release: true
nightly:
executor: go-1_16
steps:
- package:
- package-build:
nightly: true
package-consolidate:
executor:
name: win/default
shell: powershell.exe
steps:
- attach_workspace:
at: '/build'
- store_artifacts:
path: './build/dist'
destination: 'build/dist'
package-sign-windows:
executor:
name: win/default
Expand Down Expand Up @@ -195,6 +276,12 @@ jobs:
- store_artifacts:
path: './dist'
destination: 'build/dist'
test-awaiter:
executor: go-1_16
steps:
- run:
command: |
echo "Go tests complete."
share-artifacts:
executor: aws-cli/default
steps:
Expand Down Expand Up @@ -244,17 +331,62 @@ workflows:
filters:
tags:
only: /.*/
- 'package':
- 'test-awaiter':
requires:
- 'test-go-windows'
- 'test-go-mac'
- 'test-go-1_15'
- 'test-go-1_15-386'
- 'test-go-1_16'
- 'test-go-1_16-386'
- 'windows-package':
requires:
- 'test-go-windows'
- 'darwin-package':
requires:
- 'test-go-mac'
- 'i386-package':
requires:
- 'test-awaiter'
- 'ppc641e-package':
requires:
- 'test-awaiter'
- 's390x-package':
requires:
- 'test-awaiter'
- 'armel-package':
requires:
- 'test-awaiter'
- 'amd64-package':
requires:
- 'test-awaiter'
- 'arm64-package':
requires:
- 'test-awaiter'
- 'armhf-package':
requires:
- 'test-awaiter'
- 'static-package':
requires:
- 'test-awaiter'
- 'mipsel-package':
requires:
- 'test-awaiter'
- 'mips-package':
requires:
- 'test-awaiter'
- 'share-artifacts':
requires:
- 'package'
- 'i386-package'
- 'ppc641e-package'
- 's390x-package'
- 'armel-package'
- 'amd64-package'
- 'mipsel-package'
- 'mips-package'
- 'darwin-package'
- 'windows-package'
- 'static-package'
- 'arm64-package'
- 'armhf-package'
filters:
branches:
ignore:
Expand Down Expand Up @@ -284,6 +416,7 @@ workflows:
filters:
tags:
only: /.*/

nightly:
jobs:
- 'deps'
Expand Down
1 change: 1 addition & 0 deletions .github/PULL_REQUEST_TEMPLATE.md
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@ show completion. -->

- [ ] Updated associated README.md.
- [ ] Wrote appropriate unit tests.
- [ ] Pull request title or commits are in [conventional commit format](https://www.conventionalcommits.org/en/v1.0.0/#summary) (e.g. feat: or fix:)

<!-- Link to issues that describe the need for the change. Issues
should include context that will help reviewers understand why the
Expand Down
3 changes: 3 additions & 0 deletions .github/dependabot.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,3 +4,6 @@ updates:
directory: "/"
schedule:
interval: "weekly"
ignore:
# Dependabot isn't able to update this packages that do not match the source, so anything with a version
- dependency-name: "*.v*"
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -6,3 +6,4 @@
/vendor
.DS_Store
process.yml
/.vscode
7 changes: 6 additions & 1 deletion .golangci.yml
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
linters:
disable-all: true
enable:
# - telegraflinter
- bodyclose
- dogsled
- errcheck
Expand All @@ -20,6 +21,10 @@ linters:
- varcheck

linters-settings:
# custom:
# telegraflinter:
# path: telegraflinter.so
# description: "Find Telegraf specific review criteria, more info: https://github.com/influxdata/telegraf/wiki/Review"
revive:
rules:
- name: argument-limit
Expand All @@ -45,7 +50,7 @@ linters-settings:
- name: error-return
- name: error-strings
- name: errorf
- name: flag-parameter
# - name: flag-parameter #disable for now
- name: function-result-limit
arguments: [ 3 ]
- name: identical-branches
Expand Down

0 comments on commit fa5f937

Please sign in to comment.