Skip to content

Commit

Permalink
Merge branch 'master' into adjust-the-azure-monitor
Browse files Browse the repository at this point in the history
  • Loading branch information
ZPascal authored Aug 7, 2024
2 parents 6ad4f7f + 66a042f commit fe92f82
Show file tree
Hide file tree
Showing 20 changed files with 807 additions and 112 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/linter.yml
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@ jobs:
# Run Linter against code base #
################################
- name: Lint Code Base
uses: super-linter/super-linter@v6.7.0
uses: super-linter/super-linter@v6.8.0
env:
VALIDATE_ALL_CODEBASE: false
DEFAULT_BRANCH: master
Expand Down
3 changes: 3 additions & 0 deletions docs/INPUTS.md
Original file line number Diff line number Diff line change
Expand Up @@ -87,6 +87,9 @@ Metric Tracking provides a system to be notified when metrics have been
successfully written to their outputs or otherwise discarded. This allows
inputs to be created that function as reliable queue consumers.

Please note that this process applies only to internal plugins. For external
plugins, the metrics are acknowledged regardless of the actual output.

To get started with metric tracking begin by calling `WithTracking` on the
[telegraf.Accumulator][]. Add metrics using the `AddTrackingMetricGroup`
function on the returned [telegraf.TrackingAccumulator][] and store the
Expand Down
3 changes: 3 additions & 0 deletions docs/METRICS.md
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,9 @@ before telling the metric source that the message was read. If Telegraf were to
stop or the system running Telegraf to crash, this allows the messages that
were not completely delivered to an output to get re-read at a later date.

Please note that this process applies only to internal plugins. For external
plugins, the metrics are acknowledged regardless of the actual output.

### Undelivered Messages

When an input uses tracking metrics, an additional setting,
Expand Down
29 changes: 14 additions & 15 deletions go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -31,15 +31,15 @@ require (
github.com/PaesslerAG/gval v1.2.2
github.com/SAP/go-hdb v1.9.10
github.com/aerospike/aerospike-client-go/v5 v5.11.0
github.com/alecthomas/units v0.0.0-20211218093645-b94a6e3cc137
github.com/alecthomas/units v0.0.0-20231202071711-9a357b53e9c9
github.com/alitto/pond v1.9.0
github.com/aliyun/alibaba-cloud-sdk-go v1.62.721
github.com/amir/raidman v0.0.0-20170415203553-1ccc43bfb9c9
github.com/antchfx/jsonquery v1.3.3
github.com/antchfx/xmlquery v1.4.1
github.com/antchfx/xpath v1.3.1
github.com/apache/arrow/go/v18 v18.0.0-20240716144821-cf5d7c7ec3cf
github.com/apache/iotdb-client-go v1.2.0-tsbs
github.com/apache/iotdb-client-go v1.3.2
github.com/apache/thrift v0.20.0
github.com/aristanetworks/goarista v0.0.0-20190325233358-a123909ec740
github.com/armon/go-socks5 v0.0.0-20160902184237-e75332964ef5
Expand Down Expand Up @@ -105,7 +105,7 @@ require (
github.com/gophercloud/gophercloud/v2 v2.0.0-rc.3
github.com/gorcon/rcon v1.3.5
github.com/gorilla/mux v1.8.1
github.com/gorilla/websocket v1.5.1
github.com/gorilla/websocket v1.5.3
github.com/gosnmp/gosnmp v1.37.0
github.com/grid-x/modbus v0.0.0-20240503115206-582f2ab60a18
github.com/gwos/tcg/sdk v0.0.0-20231124052037-1e832b843240
Expand Down Expand Up @@ -143,7 +143,7 @@ require (
github.com/microsoft/go-mssqldb v1.7.2
github.com/miekg/dns v1.1.59
github.com/moby/ipvs v1.1.0
github.com/multiplay/go-ts3 v1.1.0
github.com/multiplay/go-ts3 v1.2.0
github.com/nats-io/nats-server/v2 v2.10.17
github.com/nats-io/nats.go v1.36.0
github.com/netsampler/goflow2/v2 v2.1.5
Expand All @@ -161,12 +161,12 @@ require (
github.com/pborman/ansi v1.0.0
github.com/peterbourgon/unixtransport v0.0.4
github.com/pion/dtls/v2 v2.2.11
github.com/prometheus-community/pro-bing v0.4.0
github.com/prometheus-community/pro-bing v0.4.1
github.com/prometheus/client_golang v1.19.1
github.com/prometheus/client_model v0.6.1
github.com/prometheus/common v0.55.0
github.com/prometheus/procfs v0.15.1
github.com/prometheus/prometheus v0.48.1
github.com/prometheus/prometheus v0.53.1
github.com/rabbitmq/amqp091-go v1.10.0
github.com/rclone/rclone v1.67.0
github.com/redis/go-redis/v9 v9.5.1
Expand Down Expand Up @@ -275,7 +275,7 @@ require (
github.com/aristanetworks/glog v0.0.0-20191112221043-67e8567f59f3 // indirect
github.com/armon/go-metrics v0.4.1 // indirect
github.com/awnumar/memcall v0.2.0 // indirect
github.com/aws/aws-sdk-go v1.53.7 // indirect
github.com/aws/aws-sdk-go v1.53.16 // indirect
github.com/aws/aws-sdk-go-v2/aws/protocol/eventstream v1.6.3 // indirect
github.com/aws/aws-sdk-go-v2/feature/dynamodb/attributevalue v1.13.7 // indirect
github.com/aws/aws-sdk-go-v2/feature/s3/manager v1.16.7 // indirect
Expand Down Expand Up @@ -332,9 +332,9 @@ require (
github.com/go-kit/log v0.2.1 // indirect
github.com/go-logr/logr v1.4.2 // indirect
github.com/go-logr/stdr v1.2.2 // indirect
github.com/go-openapi/jsonpointer v0.20.0 // indirect
github.com/go-openapi/jsonreference v0.20.2 // indirect
github.com/go-openapi/swag v0.22.4 // indirect
github.com/go-openapi/jsonpointer v0.20.2 // indirect
github.com/go-openapi/jsonreference v0.20.4 // indirect
github.com/go-openapi/swag v0.22.9 // indirect
github.com/go-stack/stack v1.8.1 // indirect
github.com/goburrow/modbus v0.1.0 // indirect
github.com/goburrow/serial v0.1.1-0.20211022031912-bfb69110f8dd // indirect
Expand All @@ -354,11 +354,10 @@ require (
github.com/google/s2a-go v0.1.7 // indirect
github.com/googleapis/enterprise-certificate-proxy v0.3.2 // indirect
github.com/googleapis/gax-go/v2 v2.13.0 // indirect
github.com/gophercloud/gophercloud v1.12.0 // indirect
github.com/gorilla/securecookie v1.1.2 // indirect
github.com/grafana/regexp v0.0.0-20221122212121-6b5c0a4cb7fd // indirect
github.com/grafana/regexp v0.0.0-20240518133315-a468a5bfb3bc // indirect
github.com/grid-x/serial v0.0.0-20211107191517-583c7356b3aa // indirect
github.com/grpc-ecosystem/grpc-gateway/v2 v2.16.0 // indirect
github.com/grpc-ecosystem/grpc-gateway/v2 v2.20.0 // indirect
github.com/gsterjov/go-libsecret v0.0.0-20161001094733-a6f4afe4910c // indirect
github.com/hailocab/go-hostpool v0.0.0-20160125115350-e80d13ce29ed // indirect
github.com/hashicorp/errwrap v1.1.0 // indirect
Expand Down Expand Up @@ -488,12 +487,12 @@ require (
go.opentelemetry.io/collector/consumer v0.101.0 // indirect
go.opentelemetry.io/collector/semconv v0.101.0 // indirect
go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.49.0 // indirect
go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.49.0 // indirect
go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.52.0 // indirect
go.opentelemetry.io/otel v1.27.0 // indirect
go.opentelemetry.io/otel/metric v1.27.0 // indirect
go.opentelemetry.io/otel/sdk v1.27.0 // indirect
go.opentelemetry.io/otel/trace v1.27.0 // indirect
go.opentelemetry.io/proto/otlp v1.0.0 // indirect
go.opentelemetry.io/proto/otlp v1.2.0 // indirect
go.uber.org/atomic v1.11.0 // indirect
go.uber.org/multierr v1.11.0 // indirect
go.uber.org/zap v1.24.0 // indirect
Expand Down
Loading

0 comments on commit fe92f82

Please sign in to comment.