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: (133 commits)
  chore: restart service if it is already running and upgraded via RPM (influxdata#9970)
  feat: update etc/telegraf.conf and etc/telegraf_windows.conf (influxdata#10237)
  fix: Handle duplicate registration of protocol-buffer files gracefully. (influxdata#10188)
  fix(http_listener_v2): fix panic on close (influxdata#10132)
  feat: add Vault input plugin (influxdata#10198)
  feat: support aws managed service for prometheus (influxdata#10202)
  fix: Make telegraf compile on Windows with golang 1.16.2 (influxdata#10246)
  Update changelog
  feat: Modbus add per-request tags (influxdata#10231)
  fix: Implement NaN and inf handling for elasticsearch output (influxdata#10196)
  feat: add nomad input plugin (influxdata#10106)
  fix: Print loaded plugins and deprecations for once and test (influxdata#10205)
  fix: eliminate MIB dependency for ifname processor (influxdata#10214)
  feat: Optimize locking for SNMP MIBs loading. (influxdata#10206)
  feat: Add SMART plugin concurrency configuration option, nvme-cli v1.14+ support and lint fixes. (influxdata#10150)
  feat: update configs (influxdata#10236)
  fix(inputs/kube_inventory): set TLS server name config properly (influxdata#9975)
  fix: Sudden close of Telegraf caused by OPC UA input plugin (influxdata#10230)
  fix: bump github.com/eclipse/paho.mqtt.golang from 1.3.0 to 1.3.5 (influxdata#9913)
  fix: json_v2 parser timestamp setting (influxdata#10221)
  fix: ensure graylog spec fields not prefixed with '_' (influxdata#10209)
  docs: remove duplicate links in CONTRIBUTING.md (influxdata#10218)
  fix: pool detection and metrics gathering for ZFS >= 2.1.x (influxdata#10099)
  fix: parallelism fix for ifname processor (influxdata#10007)
  chore: Forbids "log" package only for aggregators, inputs, outputs, parsers and processors (influxdata#10191)
  docs: address documentation gap when running telegraf in k8s (influxdata#10215)
  feat: update etc/telegraf.conf and etc/telegraf_windows.conf (influxdata#10211)
  fix: mqtt topic extracting no longer requires all three fields (influxdata#10208)
  fix: windows service - graceful shutdown of telegraf (influxdata#9616)
  feat: update etc/telegraf.conf and etc/telegraf_windows.conf (influxdata#10201)
  feat: Modbus support multiple slaves (gateway feature) (influxdata#9279)
  fix: Revert unintented corruption of the Makefile from influxdata#10200. (influxdata#10203)
  chore: remove triggering update-config bot in CI (influxdata#10195)
  Update changelog
  feat: Implement deprecation infrastructure (influxdata#10200)
  fix: extra lock on init for safety (influxdata#10199)
  fix: resolve influxdata#10027 (influxdata#10112)
  fix: register bigquery to output plugins influxdata#10177 (influxdata#10178)
  fix: sysstat use unique temp file vs hard-coded (influxdata#10165)
  refactor: snmp to use gosmi (influxdata#9518)
  ...
  • Loading branch information
phemmer committed Feb 18, 2022
2 parents 0665544 + 5cb9939 commit ddb5575
Show file tree
Hide file tree
Showing 865 changed files with 38,215 additions and 14,033 deletions.
26 changes: 6 additions & 20 deletions .circleci/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ executors:
go-1_17:
working_directory: '/go/src/github.com/influxdata/telegraf'
docker:
- image: 'quay.io/influxdb/telegraf-ci:1.17.2'
- image: 'quay.io/influxdb/telegraf-ci:1.17.3'
environment:
GOFLAGS: -p=8
mac:
Expand All @@ -32,10 +32,6 @@ commands:
- store_artifacts:
path: './new-config'
destination: 'new-config'
- persist_to_workspace:
root: './new-config'
paths:
- '*'
check-changed-files-or-halt:
steps:
- run: ./scripts/check-file-changes.sh
Expand Down Expand Up @@ -399,6 +395,8 @@ jobs:
share-artifacts:
executor: aws-cli/default
steps:
- checkout
- check-changed-files-or-halt
- run:
command: |
PR=${CIRCLE_PULL_REQUEST##*/}
Expand All @@ -415,13 +413,6 @@ jobs:
steps:
- generate-config:
os: windows
update-config:
executor: go-1_17
steps:
- checkout
- attach_workspace:
at: '/new-config'
- run: ./scripts/update_config.sh ${UPDATE_CONFIG_TOKEN}

commonjobs:
- &test-awaiter
Expand Down Expand Up @@ -509,14 +500,6 @@ workflows:
branches:
only:
- master
- 'update-config':
requires:
- 'generate-config-win'
- 'generate-config'
filters:
branches:
only:
- master
- 'share-artifacts':
requires:
- 'i386-package'
Expand All @@ -535,6 +518,9 @@ workflows:
branches:
ignore:
- master
- release.*
tags:
ignore: /.*/
- 'release':
requires:
- 'test-go-windows'
Expand Down
3 changes: 1 addition & 2 deletions .github/ISSUE_TEMPLATE/BUG_REPORT.yml
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
name: Bug Report
description: File a bug report
title: "[Bug]: "
description: Create a bug report to help us improve
labels: ["bug"]
body:
- type: markdown
Expand Down
46 changes: 0 additions & 46 deletions .github/ISSUE_TEMPLATE/Bug_report.md

This file was deleted.

58 changes: 58 additions & 0 deletions .github/workflows/linter.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,58 @@
---
#################################
#################################
## Super Linter GitHub Actions ##
#################################
#################################
name: Lint Code Base

#
# Documentation:
# https://help.github.com/en/articles/workflow-syntax-for-github-actions
#

#############################
# Start the job on all push #
#############################
on:
push:
branches-ignore: [master, main]
# Remove the line above to run when pushing to master
pull_request:
branches: [master, main]

###############
# Set the Job #
###############
jobs:
build:
# Name the Job
name: Lint Code Base
# Set the agent to run on
runs-on: ubuntu-latest

##################
# Load all steps #
##################
steps:
##########################
# Checkout the code base #
##########################
- name: Checkout Code
uses: actions/checkout@v2
with:
# Full git history is needed to get a proper list of changed files within `super-linter`
fetch-depth: 0

################################
# Run Linter against code base #
################################
- name: Lint Code Base
uses: github/super-linter@v4.8.1
env:
VALIDATE_ALL_CODEBASE: false
DEFAULT_BRANCH: master
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
LINTER_RULES_PATH: '.'
MARKDOWN_CONFIG_FILE: .markdownlint.yml
VALIDATE_MARKDOWN: true
9 changes: 5 additions & 4 deletions .golangci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -21,10 +21,6 @@ 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 Down Expand Up @@ -130,5 +126,10 @@ issues:
- path: _test\.go
text: "parameter.*seems to be a control flag, avoid control coupling"

- path: (^agent/|^cmd/|^config/|^filter/|^internal/|^logger/|^metric/|^models/|^selfstat/|^testutil/|^plugins/serializers/)
text: "imports-blacklist: should not use the following blacklisted import: \"log\""
linters:
- revive

output:
format: tab
6 changes: 6 additions & 0 deletions .markdownlint.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
{
"MD013": false,
"MD033": {
"allowed_elements": ["br"]
}
}
Loading

0 comments on commit ddb5575

Please sign in to comment.