Script 'mail_helper' called by obssrc
Hello community,
here is the log from the commit of package telegraf for openSUSE:Factory
checked in at 2023-12-15 21:47:33
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/telegraf (Old)
and /work/SRC/openSUSE:Factory/.telegraf.new.25432 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "telegraf"
Fri Dec 15 21:47:33 2023 rev:28 rq:1132935 version:1.29.1
Changes:
--------
--- /work/SRC/openSUSE:Factory/telegraf/telegraf.changes 2023-12-12
19:32:18.952651005 +0100
+++ /work/SRC/openSUSE:Factory/.telegraf.new.25432/telegraf.changes
2023-12-15 21:47:43.367122830 +0100
@@ -1,0 +2,18 @@
+Wed Dec 13 17:40:08 UTC 2023 - Jeff Kowalczyk <jkowalc...@suse.com>
+
+- Update to version 1.29.1:
+ * Telegraf v1.29.1
+ * Update changelog for v1.29.1
+ * Update build_version.txt for v1.29.1
+ * fix(inputs.clickhouse): Omit zookeeper metrics on clickhouse cloud (#14443)
+ * docs(inputs.memcached): Correct typo in README.md (#14448)
+ * fix(inputs.php-fpm): Parse JSON output (#14430)
+ * docs(inputs.ldap): Correct plugin name in sample config (#14446)
+ * chore(deps): Update all github.com/aws/aws-sdk-go-v2 dependencies (#14441)
+ * fix(inputs.procstat): Revert unintended renaming of 'systemd_unit' option
(#14440)
+ * chore(deps): Bump github.com/go-ldap/ldap/v3 from 3.4.5 to 3.4.6 (#14435)
+ * chore(deps): Bump github.com/klauspost/compress from 1.17.3 to 1.17.4
(#14433)
+ * chore(deps): Bump github.com/openzipkin/zipkin-go from 0.4.1 to 0.4.2
(#14432)
+ * chore(deps): Bump github.com/tidwall/gjson from 1.14.4 to 1.17.0 (#14431)
+
+-------------------------------------------------------------------
Old:
----
telegraf-1.29.0.tar.xz
New:
----
telegraf-1.29.1.tar.xz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ telegraf.spec ++++++
--- /var/tmp/diff_new_pack.giFSWj/_old 2023-12-15 21:47:45.479200031 +0100
+++ /var/tmp/diff_new_pack.giFSWj/_new 2023-12-15 21:47:45.483200177 +0100
@@ -18,7 +18,7 @@
%define _config_dir %{_sysconfdir}/%{name}
Name: telegraf
-Version: 1.29.0
+Version: 1.29.1
Release: 0
Summary: The plugin-driven server agent for collecting & reporting
metrics
License: MIT
++++++ _service ++++++
--- /var/tmp/diff_new_pack.giFSWj/_old 2023-12-15 21:47:45.531201931 +0100
+++ /var/tmp/diff_new_pack.giFSWj/_new 2023-12-15 21:47:45.535202078 +0100
@@ -3,7 +3,7 @@
<param name="url">https://github.com/influxdata/telegraf</param>
<param name="scm">git</param>
<param name="exclude">.git</param>
- <param name="revision">v1.29.0</param>
+ <param name="revision">v1.29.1</param>
<param name="versionformat">@PARENT_TAG@</param>
<param name="changesgenerate">enable</param>
<param name="versionrewrite-pattern">v(.*)</param>
++++++ _servicedata ++++++
--- /var/tmp/diff_new_pack.giFSWj/_old 2023-12-15 21:47:45.555202809 +0100
+++ /var/tmp/diff_new_pack.giFSWj/_new 2023-12-15 21:47:45.579203686 +0100
@@ -1,6 +1,6 @@
<servicedata>
<service name="tar_scm">
<param
name="url">https://github.com/influxdata/telegraf</param>
- <param
name="changesrevision">f7f976ec37fc3d9f96aec30cd96cee965f232568</param></service></servicedata>
+ <param
name="changesrevision">9a469977dd46c73a91dfaf73dd306d6a7dd1ec7a</param></service></servicedata>
(No newline at EOF)
++++++ telegraf-1.29.0.tar.xz -> telegraf-1.29.1.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/telegraf-1.29.0/CHANGELOG.md
new/telegraf-1.29.1/CHANGELOG.md
--- old/telegraf-1.29.0/CHANGELOG.md 2023-12-11 16:04:29.000000000 +0100
+++ new/telegraf-1.29.1/CHANGELOG.md 2023-12-13 17:34:29.000000000 +0100
@@ -1,6 +1,22 @@
<!-- markdownlint-disable MD024 -->
# Changelog
+## v1.29.1 [2023-12-13]
+
+### Bugfixes
+
+- [#14443](https://github.com/influxdata/telegraf/pull/14443)
`inputs.clickhouse` Omit zookeeper metrics on clickhouse cloud
+- [#14430](https://github.com/influxdata/telegraf/pull/14430) `inputs.php-fpm`
Parse JSON output
+- [#14440](https://github.com/influxdata/telegraf/pull/14440)
`inputs.procstat` Revert unintended renaming of systemd_unit option
+
+### Dependency Updates
+
+- [#14435](https://github.com/influxdata/telegraf/pull/14435) `deps` Bump
github.com/go-ldap/ldap/v3 from 3.4.5 to 3.4.6
+- [#14433](https://github.com/influxdata/telegraf/pull/14433) `deps` Bump
github.com/klauspost/compress from 1.17.3 to 1.17.4
+- [#14432](https://github.com/influxdata/telegraf/pull/14432) `deps` Bump
github.com/openzipkin/zipkin-go from 0.4.1 to 0.4.2
+- [#14431](https://github.com/influxdata/telegraf/pull/14431) `deps` Bump
github.com/tidwall/gjson from 1.14.4 to 1.17.0
+- [#14441](https://github.com/influxdata/telegraf/pull/14441) `deps` Update
all github.com/aws/aws-sdk-go-v2 dependencies
+
## v1.29.0 [2023-12-11]
### Important Changes
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/telegraf-1.29.0/build_version.txt
new/telegraf-1.29.1/build_version.txt
--- old/telegraf-1.29.0/build_version.txt 2023-12-11 16:04:29.000000000
+0100
+++ new/telegraf-1.29.1/build_version.txt 2023-12-13 17:34:29.000000000
+0100
@@ -1 +1 @@
-1.29.0
\ No newline at end of file
+1.29.1
\ No newline at end of file
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/telegraf-1.29.0/go.mod new/telegraf-1.29.1/go.mod
--- old/telegraf-1.29.0/go.mod 2023-12-11 16:04:29.000000000 +0100
+++ new/telegraf-1.29.1/go.mod 2023-12-13 17:34:29.000000000 +0100
@@ -40,18 +40,18 @@
github.com/aristanetworks/goarista v0.0.0-20190325233358-a123909ec740
github.com/armon/go-socks5 v0.0.0-20160902184237-e75332964ef5
github.com/awnumar/memguard v0.22.4-0.20231204102859-fce56aae03b8
- github.com/aws/aws-sdk-go-v2 v1.23.1
- github.com/aws/aws-sdk-go-v2/config v1.19.1
- github.com/aws/aws-sdk-go-v2/credentials v1.13.43
- github.com/aws/aws-sdk-go-v2/feature/ec2/imds v1.13.13
- github.com/aws/aws-sdk-go-v2/service/cloudwatch v1.26.2
- github.com/aws/aws-sdk-go-v2/service/cloudwatchlogs v1.27.2
- github.com/aws/aws-sdk-go-v2/service/dynamodb v1.20.0
- github.com/aws/aws-sdk-go-v2/service/ec2 v1.120.0
- github.com/aws/aws-sdk-go-v2/service/kinesis v1.18.5
- github.com/aws/aws-sdk-go-v2/service/sts v1.23.2
- github.com/aws/aws-sdk-go-v2/service/timestreamwrite v1.17.2
- github.com/aws/smithy-go v1.17.0
+ github.com/aws/aws-sdk-go-v2 v1.24.0
+ github.com/aws/aws-sdk-go-v2/config v1.26.1
+ github.com/aws/aws-sdk-go-v2/credentials v1.16.12
+ github.com/aws/aws-sdk-go-v2/feature/ec2/imds v1.14.10
+ github.com/aws/aws-sdk-go-v2/service/cloudwatch v1.32.0
+ github.com/aws/aws-sdk-go-v2/service/cloudwatchlogs v1.29.5
+ github.com/aws/aws-sdk-go-v2/service/dynamodb v1.26.6
+ github.com/aws/aws-sdk-go-v2/service/ec2 v1.141.0
+ github.com/aws/aws-sdk-go-v2/service/kinesis v1.24.5
+ github.com/aws/aws-sdk-go-v2/service/sts v1.26.5
+ github.com/aws/aws-sdk-go-v2/service/timestreamwrite v1.23.6
+ github.com/aws/smithy-go v1.19.0
github.com/benbjohnson/clock v1.3.5
github.com/blues/jsonata-go v1.5.4
github.com/bmatcuk/doublestar/v3 v3.0.0
@@ -74,7 +74,7 @@
github.com/eclipse/paho.golang v0.11.0
github.com/eclipse/paho.mqtt.golang v1.4.3
github.com/fatih/color v1.15.0
- github.com/go-ldap/ldap/v3 v3.4.5
+ github.com/go-ldap/ldap/v3 v3.4.6
github.com/go-logfmt/logfmt v0.6.0
github.com/go-ole/go-ole v1.2.6
github.com/go-redis/redis/v7 v7.4.1
@@ -124,7 +124,7 @@
github.com/kardianos/service v1.2.2
github.com/karrick/godirwalk v1.16.2
github.com/kballard/go-shellquote v0.0.0-20180428030007-95032a82bc51
- github.com/klauspost/compress v1.17.3
+ github.com/klauspost/compress v1.17.4
github.com/klauspost/pgzip v1.2.6
github.com/kolo/xmlrpc v0.0.0-20220921171641-a4b6fa1dd06b
github.com/linkedin/goavro/v2 v2.12.0
@@ -149,7 +149,7 @@
github.com/opensearch-project/opensearch-go/v2 v2.3.0
github.com/opentracing/opentracing-go
v1.2.1-0.20220228012449-10b1cf09e00b
github.com/openzipkin-contrib/zipkin-go-opentracing v0.5.0
- github.com/openzipkin/zipkin-go v0.4.1
+ github.com/openzipkin/zipkin-go v0.4.2
github.com/p4lang/p4runtime v1.3.0
github.com/pborman/ansi v1.0.0
github.com/peterbourgon/unixtransport v0.0.3
@@ -181,7 +181,7 @@
github.com/testcontainers/testcontainers-go v0.26.0
github.com/testcontainers/testcontainers-go/modules/kafka
v0.26.1-0.20231116140448-68d5f8983d09
github.com/thomasklein94/packer-plugin-libvirt v0.5.0
- github.com/tidwall/gjson v1.14.4
+ github.com/tidwall/gjson v1.17.0
github.com/tinylib/msgp v1.1.8
github.com/urfave/cli/v2 v2.25.7
github.com/vapourismo/knx-go v0.0.0-20220829185957-fb5458a5389d
@@ -261,22 +261,22 @@
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-v2/aws/protocol/eventstream v1.4.13 //
indirect
+ github.com/aws/aws-sdk-go-v2/aws/protocol/eventstream v1.5.4 // indirect
github.com/aws/aws-sdk-go-v2/feature/dynamodb/attributevalue v1.2.0 //
indirect
github.com/aws/aws-sdk-go-v2/feature/s3/manager v1.11.70 // indirect
- github.com/aws/aws-sdk-go-v2/internal/configsources v1.2.4 // indirect
- github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.5.4 // indirect
- github.com/aws/aws-sdk-go-v2/internal/ini v1.3.45 // indirect
+ github.com/aws/aws-sdk-go-v2/internal/configsources v1.2.9 // indirect
+ github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.5.9 // indirect
+ github.com/aws/aws-sdk-go-v2/internal/ini v1.7.2 // indirect
github.com/aws/aws-sdk-go-v2/internal/v4a v1.0.26 // indirect
github.com/aws/aws-sdk-go-v2/service/dynamodbstreams v1.4.0 // indirect
- github.com/aws/aws-sdk-go-v2/service/internal/accept-encoding v1.9.11
// indirect
+ github.com/aws/aws-sdk-go-v2/service/internal/accept-encoding v1.10.4
// indirect
github.com/aws/aws-sdk-go-v2/service/internal/checksum v1.1.29 //
indirect
- github.com/aws/aws-sdk-go-v2/service/internal/endpoint-discovery
v1.7.28 // indirect
- github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.9.37 //
indirect
+ github.com/aws/aws-sdk-go-v2/service/internal/endpoint-discovery
v1.8.10 // indirect
+ github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.10.9 //
indirect
github.com/aws/aws-sdk-go-v2/service/internal/s3shared v1.14.3 //
indirect
github.com/aws/aws-sdk-go-v2/service/s3 v1.35.0 // indirect
- github.com/aws/aws-sdk-go-v2/service/sso v1.15.2 // indirect
- github.com/aws/aws-sdk-go-v2/service/ssooidc v1.17.3 // indirect
+ github.com/aws/aws-sdk-go-v2/service/sso v1.18.5 // indirect
+ github.com/aws/aws-sdk-go-v2/service/ssooidc v1.21.5 // indirect
github.com/awslabs/kinesis-aggregation/go
v0.0.0-20210630091500-54e17340d32f // indirect
github.com/beorn7/perks v1.0.1 // indirect
github.com/bitly/go-hostpool v0.1.0 // indirect
@@ -311,7 +311,7 @@
github.com/form3tech-oss/jwt-go v3.2.5+incompatible // indirect
github.com/fxamacker/cbor v1.5.1 // indirect
github.com/gabriel-vasile/mimetype v1.4.2 // indirect
- github.com/go-asn1-ber/asn1-ber v1.5.4 // indirect
+ github.com/go-asn1-ber/asn1-ber v1.5.5 // indirect
github.com/go-logr/logr v1.3.0 // indirect
github.com/go-logr/stdr v1.2.2 // indirect
github.com/go-macaroon-bakery/macaroonpb v1.0.0 // indirect
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/telegraf-1.29.0/go.sum new/telegraf-1.29.1/go.sum
--- old/telegraf-1.29.0/go.sum 2023-12-11 16:04:29.000000000 +0100
+++ new/telegraf-1.29.1/go.sum 2023-12-13 17:34:29.000000000 +0100
@@ -828,108 +828,100 @@
github.com/aws/aws-sdk-go-v2 v1.11.2/go.mod
h1:SQfA+m2ltnu1cA0soUkj4dRSsmITiVQUJvBIZjzfPyQ=
github.com/aws/aws-sdk-go-v2 v1.18.0/go.mod
h1:uzbQtefpm44goOPmdKyAlXSNcwlRgF3ePWVW6EtJvvw=
github.com/aws/aws-sdk-go-v2 v1.18.1/go.mod
h1:uzbQtefpm44goOPmdKyAlXSNcwlRgF3ePWVW6EtJvvw=
-github.com/aws/aws-sdk-go-v2 v1.21.0/go.mod
h1:/RfNgGmRxI+iFOB1OeJUyxiU+9s88k3pfHvDagGEp0M=
-github.com/aws/aws-sdk-go-v2 v1.21.2/go.mod
h1:ErQhvNuEMhJjweavOYhxVkn2RUx7kQXVATHrjKtxIpM=
-github.com/aws/aws-sdk-go-v2 v1.23.1
h1:qXaFsOOMA+HsZtX8WoCa+gJnbyW7qyFFBlPqvTSzbaI=
-github.com/aws/aws-sdk-go-v2 v1.23.1/go.mod
h1:i1XDttT4rnf6vxc9AuskLc6s7XBee8rlLilKlc03uAA=
+github.com/aws/aws-sdk-go-v2 v1.24.0
h1:890+mqQ+hTpNuw0gGP6/4akolQkSToDJgHfQE7AwGuk=
+github.com/aws/aws-sdk-go-v2 v1.24.0/go.mod
h1:LNh45Br1YAkEKaAqvmE1m8FUx6a5b/V0oAKV7of29b4=
github.com/aws/aws-sdk-go-v2/aws/protocol/eventstream v1.4.10/go.mod
h1:VeTZetY5KRJLuD/7fkQXMU6Mw7H5m/KP2J5Iy9osMno=
-github.com/aws/aws-sdk-go-v2/aws/protocol/eventstream v1.4.13
h1:OPLEkmhXf6xFPiz0bLeDArZIDx1NNS4oJyG4nv3Gct0=
-github.com/aws/aws-sdk-go-v2/aws/protocol/eventstream v1.4.13/go.mod
h1:gpAbvyDGQFozTEmlTFO8XcQKHzubdq0LzRyJpG6MiXM=
+github.com/aws/aws-sdk-go-v2/aws/protocol/eventstream v1.5.4
h1:OCs21ST2LrepDfD3lwlQiOqIGp6JiEUqG84GzTDoyJs=
+github.com/aws/aws-sdk-go-v2/aws/protocol/eventstream v1.5.4/go.mod
h1:usURWEKSNNAcAZuzRn/9ZYPT8aZQkR7xcCtunK/LkJo=
github.com/aws/aws-sdk-go-v2/config v1.6.1/go.mod
h1:t/y3UPu0XEDy0cEw6mvygaBQaPzWiYAxfP2SzgtvclA=
github.com/aws/aws-sdk-go-v2/config v1.18.25/go.mod
h1:dZnYpD5wTW/dQF0rRNLVypB396zWCcPiBIvdvSWHEg4=
github.com/aws/aws-sdk-go-v2/config v1.18.27/go.mod
h1:0My+YgmkGxeqjXZb5BYme5pc4drjTnM+x1GJ3zv42Nw=
-github.com/aws/aws-sdk-go-v2/config v1.19.1
h1:oe3vqcGftyk40icfLymhhhNysAwk0NfiwkDi2GTPMXs=
-github.com/aws/aws-sdk-go-v2/config v1.19.1/go.mod
h1:ZwDUgFnQgsazQTnWfeLWk5GjeqTQTL8lMkoE1UXzxdE=
+github.com/aws/aws-sdk-go-v2/config v1.26.1
h1:z6DqMxclFGL3Zfo+4Q0rLnAZ6yVkzCRxhRMsiRQnD1o=
+github.com/aws/aws-sdk-go-v2/config v1.26.1/go.mod
h1:ZB+CuKHRbb5v5F0oJtGdhFTelmrxd4iWO1lf0rQwSAg=
github.com/aws/aws-sdk-go-v2/credentials v1.3.3/go.mod
h1:oVieKMT3m9BSfqhOfuQ+E0j/yN84ZAJ7Qv8Sfume/ak=
github.com/aws/aws-sdk-go-v2/credentials v1.13.24/go.mod
h1:jYPYi99wUOPIFi0rhiOvXeSEReVOzBqFNOX5bXYoG2o=
github.com/aws/aws-sdk-go-v2/credentials v1.13.26/go.mod
h1:GoXt2YC8jHUBbA4jr+W3JiemnIbkXOfxSXcisUsZ3os=
-github.com/aws/aws-sdk-go-v2/credentials v1.13.43
h1:LU8vo40zBlo3R7bAvBVy/ku4nxGEyZe9N8MqAeFTzF8=
-github.com/aws/aws-sdk-go-v2/credentials v1.13.43/go.mod
h1:zWJBz1Yf1ZtX5NGax9ZdNjhhI4rgjfgsyk6vTY1yfVg=
+github.com/aws/aws-sdk-go-v2/credentials v1.16.12
h1:v/WgB8NxprNvr5inKIiVVrXPuuTegM+K8nncFkr1usU=
+github.com/aws/aws-sdk-go-v2/credentials v1.16.12/go.mod
h1:X21k0FjEJe+/pauud82HYiQbEr9jRKY3kXEIQ4hXeTQ=
github.com/aws/aws-sdk-go-v2/feature/dynamodb/attributevalue v1.2.0
h1:8kvinmbIDObqsWegKP0JjeanYPiA4GUVpAtciNWE+jw=
github.com/aws/aws-sdk-go-v2/feature/dynamodb/attributevalue v1.2.0/go.mod
h1:UVFtSYSWCHj2+brBLDHUdlJXmz8LxUpZhA+Ewypc+xQ=
github.com/aws/aws-sdk-go-v2/feature/ec2/imds v1.4.1/go.mod
h1:+GTydg3uHmVlQdkRoetz6VHKbOMEYof70m19IpMLifc=
github.com/aws/aws-sdk-go-v2/feature/ec2/imds v1.13.3/go.mod
h1:4Q0UFP0YJf0NrsEuEYHpM9fTSEVnD16Z3uyEF7J9JGM=
github.com/aws/aws-sdk-go-v2/feature/ec2/imds v1.13.4/go.mod
h1:E1hLXN/BL2e6YizK1zFlYd8vsfi2GTjbjBazinMmeaM=
-github.com/aws/aws-sdk-go-v2/feature/ec2/imds v1.13.13
h1:PIktER+hwIG286DqXyvVENjgLTAwGgoeriLDD5C+YlQ=
-github.com/aws/aws-sdk-go-v2/feature/ec2/imds v1.13.13/go.mod
h1:f/Ib/qYjhV2/qdsf79H3QP/eRE4AkVyEf6sk7XfZ1tg=
+github.com/aws/aws-sdk-go-v2/feature/ec2/imds v1.14.10
h1:w98BT5w+ao1/r5sUuiH6JkVzjowOKeOJRHERyy1vh58=
+github.com/aws/aws-sdk-go-v2/feature/ec2/imds v1.14.10/go.mod
h1:K2WGI7vUvkIv1HoNbfBA1bvIZ+9kL3YVmWxeKuLQsiw=
github.com/aws/aws-sdk-go-v2/feature/s3/manager v1.11.70
h1:4bh28MeeXoBFTjb0JjQ5sVatzlf5xA1DziV8mZed9v4=
github.com/aws/aws-sdk-go-v2/feature/s3/manager v1.11.70/go.mod
h1:9yI5NXzqy2yOiMytv6QLZHvlyHLwYxO9iIq+bZIbrFg=
github.com/aws/aws-sdk-go-v2/internal/configsources v1.0.4/go.mod
h1:W5gGbtNXFpF9/ssYZTaItzG/B+j0bjTnwStiCP2AtWU=
github.com/aws/aws-sdk-go-v2/internal/configsources v1.1.33/go.mod
h1:7i0PF1ME/2eUPFcjkVIwq+DOygHEoK92t5cDqNgYbIw=
github.com/aws/aws-sdk-go-v2/internal/configsources v1.1.34/go.mod
h1:wZpTEecJe0Btj3IYnDx/VlUzor9wm3fJHyvLpQF0VwY=
-github.com/aws/aws-sdk-go-v2/internal/configsources v1.1.41/go.mod
h1:CrObHAuPneJBlfEJ5T3szXOUkLEThaGfvnhTf33buas=
-github.com/aws/aws-sdk-go-v2/internal/configsources v1.1.43/go.mod
h1:auo+PiyLl0n1l8A0e8RIeR8tOzYPfZZH/JNlrJ8igTQ=
-github.com/aws/aws-sdk-go-v2/internal/configsources v1.2.4
h1:LAm3Ycm9HJfbSCd5I+wqC2S9Ej7FPrgr5CQoOljJZcE=
-github.com/aws/aws-sdk-go-v2/internal/configsources v1.2.4/go.mod
h1:xEhvbJcyUf/31yfGSQBe01fukXwXJ0gxDp7rLfymWE0=
+github.com/aws/aws-sdk-go-v2/internal/configsources v1.2.9
h1:v+HbZaCGmOwnTTVS86Fleq0vPzOd7tnJGbFhP0stNLs=
+github.com/aws/aws-sdk-go-v2/internal/configsources v1.2.9/go.mod
h1:Xjqy+Nyj7VDLBtCMkQYOw1QYfAEZCVLrfI0ezve8wd4=
github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.4.27/go.mod
h1:UrHnn3QV/d0pBZ6QBAEQcqFLf8FAzLmoUfPVIueOvoM=
github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.4.28/go.mod
h1:7VRpKQQedkfIEXb4k52I7swUnZP0wohVajJMRn3vsUw=
-github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.4.35/go.mod
h1:SJC1nEVVva1g3pHAIdCp7QsRIkMmLAgoDquQ9Rr8kYw=
-github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.4.37/go.mod
h1:Qe+2KtKml+FEsQF/DHmDV+xjtche/hwoF75EG4UlHW8=
-github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.5.4
h1:4GV0kKZzUxiWxSVpn/9gwR0g21NF1Jsyduzo9rHgC/Q=
-github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.5.4/go.mod
h1:dYvTNAggxDZy6y1AF7YDwXsPuHFy/VNEpEI/2dWK9IU=
+github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.5.9
h1:N94sVhRACtXyVcjXxrwK1SKFIJrA9pOJ5yu2eSHnmls=
+github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.5.9/go.mod
h1:hqamLz7g1/4EJP+GH5NBhcUMLjW+gKLQabgyz6/7WAU=
github.com/aws/aws-sdk-go-v2/internal/ini v1.2.1/go.mod
h1:Pv3WenDjI0v2Jl7UaMFIIbPOBbhn33RmmAmGgkXDoqY=
github.com/aws/aws-sdk-go-v2/internal/ini v1.3.34/go.mod
h1:Etz2dj6UHYuw+Xw830KfzCfWGMzqvUTCjUj5b76GVDc=
github.com/aws/aws-sdk-go-v2/internal/ini v1.3.35/go.mod
h1:0Eg1YjxE0Bhn56lx+SHJwCzhW+2JGtizsrx+lCqrfm0=
-github.com/aws/aws-sdk-go-v2/internal/ini v1.3.45
h1:hze8YsjSh8Wl1rYa1CJpRmXP21BvOBuc76YhW0HsuQ4=
-github.com/aws/aws-sdk-go-v2/internal/ini v1.3.45/go.mod
h1:lD5M20o09/LCuQ2mE62Mb/iSdSlCNuj6H5ci7tW7OsE=
+github.com/aws/aws-sdk-go-v2/internal/ini v1.7.2
h1:GrSw8s0Gs/5zZ0SX+gX4zQjRnRsMJDJ2sLur1gRBhEM=
+github.com/aws/aws-sdk-go-v2/internal/ini v1.7.2/go.mod
h1:6fQQgfuGmw8Al/3M2IgIllycxV7ZW7WCdVSqfBeUiCY=
github.com/aws/aws-sdk-go-v2/internal/v4a v1.0.26
h1:wscW+pnn3J1OYnanMnza5ZVYXLX4cKk5rAvUAl4Qu+c=
github.com/aws/aws-sdk-go-v2/internal/v4a v1.0.26/go.mod
h1:MtYiox5gvyB+OyP0Mr0Sm/yzbEAIPL9eijj/ouHAPw0=
-github.com/aws/aws-sdk-go-v2/service/cloudwatch v1.26.2
h1:PWGu2JhCb/XJlJ7SSFJq76pxk4xWsN76nZxh7TzMHx0=
-github.com/aws/aws-sdk-go-v2/service/cloudwatch v1.26.2/go.mod
h1:2KOZkkzMDZCo/aLzPhys06mHNkiU74u85aMJA3PLRvg=
-github.com/aws/aws-sdk-go-v2/service/cloudwatchlogs v1.27.2
h1:zl57IYAWKaRzQiy2WzOeBt/ckXlGlvD9S2cjJh43uAo=
-github.com/aws/aws-sdk-go-v2/service/cloudwatchlogs v1.27.2/go.mod
h1:NRP65i31tm0UhGwc9j6TGwk7dMs1ZDprZPIHfr+gHCU=
+github.com/aws/aws-sdk-go-v2/service/cloudwatch v1.32.0
h1:f426fLs4hcrLuczLBqWf1Ob6FKJhISaR4e9Iw3Scr5A=
+github.com/aws/aws-sdk-go-v2/service/cloudwatch v1.32.0/go.mod
h1:G63GKqSBLpBmO3tN1/PwM2NC65XvSd00zJWTZk202bc=
+github.com/aws/aws-sdk-go-v2/service/cloudwatchlogs v1.29.5
h1:0yGqcpfnCyG4La+uIi3ziT/VzjxP4C7pGs39RxcGUEM=
+github.com/aws/aws-sdk-go-v2/service/cloudwatchlogs v1.29.5/go.mod
h1:RDU4fPO0Yb1nRUjQouqJj/bF+Ppz2XdXpWsWvxDXFS4=
github.com/aws/aws-sdk-go-v2/service/dynamodb v1.5.0/go.mod
h1:XY5YhCS9SLul3JSQ08XG/nfxXxrkh6RR21XPq/J//NY=
-github.com/aws/aws-sdk-go-v2/service/dynamodb v1.20.0
h1:ov790XKhwAziEXcl6WrjsbyWkGpboK7Cmikpe5gAzMw=
-github.com/aws/aws-sdk-go-v2/service/dynamodb v1.20.0/go.mod
h1:W1oiFegjVosgjIwb2Vv45jiCQT1ee8x85u8EyZRYLes=
+github.com/aws/aws-sdk-go-v2/service/dynamodb v1.26.6
h1:kSdpnPOZL9NG5QHoKL5rTsdY+J+77hr+vqVMsPeyNe0=
+github.com/aws/aws-sdk-go-v2/service/dynamodb v1.26.6/go.mod
h1:o7TD9sjdgrl8l/g2a2IkYjuhxjPy9DMP2sWo7piaRBQ=
github.com/aws/aws-sdk-go-v2/service/dynamodbstreams v1.4.0
h1:QbFWJr2SAyVYvyoOHvJU6sCGLnqNT94ZbWElJMEI1JY=
github.com/aws/aws-sdk-go-v2/service/dynamodbstreams v1.4.0/go.mod
h1:bYsEP8w5YnbYyrx/Zi5hy4hTwRRQISSJS3RWrsGRijg=
-github.com/aws/aws-sdk-go-v2/service/ec2 v1.120.0
h1:ksT76SStTSqusv5PekSW/WqnbPMzwJIZXH+rDMhazpQ=
-github.com/aws/aws-sdk-go-v2/service/ec2 v1.120.0/go.mod
h1:0FhI2Rzcv5BNM3dNnbcCx2qa2naFZoAidJi11cQgzL0=
+github.com/aws/aws-sdk-go-v2/service/ec2 v1.141.0
h1:cP43vFYAQyREOp972C+6d4+dzpxo3HolNvWfeBvr2Yg=
+github.com/aws/aws-sdk-go-v2/service/ec2 v1.141.0/go.mod
h1:qjhtI9zjpUHRc6khtrIM9fb48+ii6+UikL3/b+MKYn0=
github.com/aws/aws-sdk-go-v2/service/internal/accept-encoding v1.3.0/go.mod
h1:v8ygadNyATSm6elwJ/4gzJwcFhri9RqS8skgHKiwXPU=
-github.com/aws/aws-sdk-go-v2/service/internal/accept-encoding v1.9.11
h1:y2+VQzC6Zh2ojtV2LoC0MNwHWc6qXv/j2vrQtlftkdA=
github.com/aws/aws-sdk-go-v2/service/internal/accept-encoding v1.9.11/go.mod
h1:iV4q2hsqtNECrfmlXyord9u4zyuFEJX9eLgLpSPzWA8=
+github.com/aws/aws-sdk-go-v2/service/internal/accept-encoding v1.10.4
h1:/b31bi3YVNlkzkBrm9LfpaKoaYZUxIAj4sHfOTmLfqw=
+github.com/aws/aws-sdk-go-v2/service/internal/accept-encoding v1.10.4/go.mod
h1:2aGXHFmbInwgP9ZfpmdIfOELL79zhdNYNmReK8qDfdQ=
github.com/aws/aws-sdk-go-v2/service/internal/checksum v1.1.29
h1:zZSLP3v3riMOP14H7b4XP0uyfREDQOYv2cqIrvTXDNQ=
github.com/aws/aws-sdk-go-v2/service/internal/checksum v1.1.29/go.mod
h1:z7EjRjVwZ6pWcWdI2H64dKttvzaP99jRIj5hphW0M5U=
github.com/aws/aws-sdk-go-v2/service/internal/endpoint-discovery v1.1.0/go.mod
h1:enkU5tq2HoXY+ZMiQprgF3Q83T3PbO77E83yXXzRZWE=
-github.com/aws/aws-sdk-go-v2/service/internal/endpoint-discovery v1.7.28
h1:/D994rtMQd1jQ2OY+7tvUlMlrv1L1c7Xtma/FhkbVtY=
-github.com/aws/aws-sdk-go-v2/service/internal/endpoint-discovery
v1.7.28/go.mod h1:3bJI2pLY3ilrqO5EclusI1GbjFJh1iXYrhOItf2sjKw=
+github.com/aws/aws-sdk-go-v2/service/internal/endpoint-discovery v1.8.10
h1:h8uweImUHGgyNKrxIUwpPs6XiH0a6DJ17hSJvFLgPAo=
+github.com/aws/aws-sdk-go-v2/service/internal/endpoint-discovery
v1.8.10/go.mod h1:LZKVtMBiZfdvUWgwg61Qo6kyAmE5rn9Dw36AqnycvG8=
github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.2.3/go.mod
h1:7gcsONBmFoCcKrAqrm95trrMd2+C/ReYKP7Vfu8yHHA=
github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.9.27/go.mod
h1:EOwBD4J4S5qYszS5/3DpkejfuK+Z5/1uzICfPaZLtqw=
github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.9.28/go.mod
h1:jj7znCIg05jXlaGBlFMGP8+7UN3VtCkRBG2spnmRQkU=
-github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.9.35/go.mod
h1:QGF2Rs33W5MaN9gYdEQOBBFPLwTZkEhRwI33f7KIG0o=
-github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.9.37
h1:WWZA/I2K4ptBS1kg0kV1JbBtG/umed0vwHRrmcr9z7k=
-github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.9.37/go.mod
h1:vBmDnwWXWxNPFRMmG2m/3MKOe+xEcMDo1tanpaWCcck=
+github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.10.9
h1:Nf2sHxjMJR8CSImIVCONRi4g0Su3J+TSTbS7G0pUeMU=
+github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.10.9/go.mod
h1:idky4TER38YIjr2cADF1/ugFMKvZV7p//pVeV5LZbF0=
github.com/aws/aws-sdk-go-v2/service/internal/s3shared v1.14.3
h1:dBL3StFxHtpBzJJ/mNEsjXVgfO+7jR0dAIEwLqMapEA=
github.com/aws/aws-sdk-go-v2/service/internal/s3shared v1.14.3/go.mod
h1:f1QyiAsvIv4B49DmCqrhlXqyaR+0IxMmyX+1P+AnzOM=
github.com/aws/aws-sdk-go-v2/service/kinesis v1.6.0/go.mod
h1:9O7UG2pELnP0hq35+Gd7XDjOLBkg7tmgRQ0y14ZjoJI=
-github.com/aws/aws-sdk-go-v2/service/kinesis v1.18.5
h1:naSZmQiFjoTLxNjfDy/KgEnWdG3odkR6gIEgTx21YOM=
-github.com/aws/aws-sdk-go-v2/service/kinesis v1.18.5/go.mod
h1:0h3hOcyFXyjvI3wGt8C8vk2+II9XxHwFM7zH2KvLHmA=
+github.com/aws/aws-sdk-go-v2/service/kinesis v1.24.5
h1:UdJjiGHU0YzHKEMJ377Ufv7YLxlxlR5uKJ4JWQKElk4=
+github.com/aws/aws-sdk-go-v2/service/kinesis v1.24.5/go.mod
h1:Sj7qc+P/GOGOPMDn8+B7Cs+WPq1Gk+R6CXRXVhZtWcA=
github.com/aws/aws-sdk-go-v2/service/s3 v1.35.0
h1:ya7fmrN2fE7s1P2gaPbNg5MTkERVWfsH8ToP1YC4Z9o=
github.com/aws/aws-sdk-go-v2/service/s3 v1.35.0/go.mod
h1:aVbf0sko/TsLWHx30c/uVu7c62+0EAJ3vbxaJga0xCw=
github.com/aws/aws-sdk-go-v2/service/sso v1.3.3/go.mod
h1:Jgw5O+SK7MZ2Yi9Yvzb4PggAPYaFSliiQuWR0hNjexk=
github.com/aws/aws-sdk-go-v2/service/sso v1.12.10/go.mod
h1:ouy2P4z6sJN70fR3ka3wD3Ro3KezSxU6eKGQI2+2fjI=
github.com/aws/aws-sdk-go-v2/service/sso v1.12.12/go.mod
h1:HuCOxYsF21eKrerARYO6HapNeh9GBNq7fius2AcwodY=
-github.com/aws/aws-sdk-go-v2/service/sso v1.15.2
h1:JuPGc7IkOP4AaqcZSIcyqLpFSqBWK32rM9+a1g6u73k=
-github.com/aws/aws-sdk-go-v2/service/sso v1.15.2/go.mod
h1:gsL4keucRCgW+xA85ALBpRFfdSLH4kHOVSnLMSuBECo=
+github.com/aws/aws-sdk-go-v2/service/sso v1.18.5
h1:ldSFWz9tEHAwHNmjx2Cvy1MjP5/L9kNoR0skc6wyOOM=
+github.com/aws/aws-sdk-go-v2/service/sso v1.18.5/go.mod
h1:CaFfXLYL376jgbP7VKC96uFcU8Rlavak0UlAwk1Dlhc=
github.com/aws/aws-sdk-go-v2/service/ssooidc v1.14.10/go.mod
h1:AFvkxc8xfBe8XA+5St5XIHHrQQtkxqrRincx4hmMHOk=
github.com/aws/aws-sdk-go-v2/service/ssooidc v1.14.12/go.mod
h1:E4VrHCPzmVB/KFXtqBGKb3c8zpbNBgKe3fisDNLAW5w=
-github.com/aws/aws-sdk-go-v2/service/ssooidc v1.17.3
h1:HFiiRkf1SdaAmV3/BHOFZ9DjFynPHj8G/UIO1lQS+fk=
-github.com/aws/aws-sdk-go-v2/service/ssooidc v1.17.3/go.mod
h1:a7bHA82fyUXOm+ZSWKU6PIoBxrjSprdLoM8xPYvzYVg=
+github.com/aws/aws-sdk-go-v2/service/ssooidc v1.21.5
h1:2k9KmFawS63euAkY4/ixVNsYYwrwnd5fIvgEKkfZFNM=
+github.com/aws/aws-sdk-go-v2/service/ssooidc v1.21.5/go.mod
h1:W+nd4wWDVkSUIox9bacmkBP5NMFQeTJ/xqNabpzSR38=
github.com/aws/aws-sdk-go-v2/service/sts v1.6.2/go.mod
h1:RBhoMJB8yFToaCnbe0jNq5Dcdy0jp6LhHqg55rjClkM=
github.com/aws/aws-sdk-go-v2/service/sts v1.19.0/go.mod
h1:BgQOMsg8av8jset59jelyPW7NoZcZXLVpDsXunGDrk8=
github.com/aws/aws-sdk-go-v2/service/sts v1.19.2/go.mod
h1:dp0yLPsLBOi++WTxzCjA/oZqi6NPIhoR+uF7GeMU9eg=
-github.com/aws/aws-sdk-go-v2/service/sts v1.23.2
h1:0BkLfgeDjfZnZ+MhB3ONb01u9pwFYTCZVhlsSSBvlbU=
-github.com/aws/aws-sdk-go-v2/service/sts v1.23.2/go.mod
h1:Eows6e1uQEsc4ZaHANmsPRzAKcVDrcmjjWiih2+HUUQ=
-github.com/aws/aws-sdk-go-v2/service/timestreamwrite v1.17.2
h1:PlsApCYTMqiDmaCDikifXGYqQ53QWQ5UAOEZIevfcL8=
-github.com/aws/aws-sdk-go-v2/service/timestreamwrite v1.17.2/go.mod
h1:xes7zyfBSJ6kgfmaIvTFbEfPc3CfU1HLx46qcEc6n2s=
+github.com/aws/aws-sdk-go-v2/service/sts v1.26.5
h1:5UYvv8JUvllZsRnfrcMQ+hJ9jNICmcgKPAO1CER25Wg=
+github.com/aws/aws-sdk-go-v2/service/sts v1.26.5/go.mod
h1:XX5gh4CB7wAs4KhcF46G6C8a2i7eupU19dcAAE+EydU=
+github.com/aws/aws-sdk-go-v2/service/timestreamwrite v1.23.6
h1:+7xZRneTlcraXL4+oN2kUlQX9ULh4aIxmcpUoR/faGA=
+github.com/aws/aws-sdk-go-v2/service/timestreamwrite v1.23.6/go.mod
h1:igyhq0ZP1mXLKnSAGrGneVjs2aELNYQkskoF/WxR3+w=
github.com/aws/smithy-go v1.7.0/go.mod
h1:SObp3lf9smib00L/v3U2eAKG8FyQ7iLrJnQiAmR5n+E=
github.com/aws/smithy-go v1.8.0/go.mod
h1:SObp3lf9smib00L/v3U2eAKG8FyQ7iLrJnQiAmR5n+E=
github.com/aws/smithy-go v1.9.0/go.mod
h1:SObp3lf9smib00L/v3U2eAKG8FyQ7iLrJnQiAmR5n+E=
github.com/aws/smithy-go v1.13.5/go.mod
h1:Tg+OJXh4MB2R/uN61Ko2f6hTZwB/ZYGOtib8J3gBHzA=
-github.com/aws/smithy-go v1.14.2/go.mod
h1:Tg+OJXh4MB2R/uN61Ko2f6hTZwB/ZYGOtib8J3gBHzA=
-github.com/aws/smithy-go v1.15.0/go.mod
h1:Tg+OJXh4MB2R/uN61Ko2f6hTZwB/ZYGOtib8J3gBHzA=
-github.com/aws/smithy-go v1.17.0
h1:wWJD7LX6PBV6etBUwO0zElG0nWN9rUhp0WdYeHSHAaI=
-github.com/aws/smithy-go v1.17.0/go.mod
h1:NukqUGpCZIILqqiV0NIjeFh24kd/FAa4beRb6nbIUPE=
+github.com/aws/smithy-go v1.19.0
h1:KWFKQV80DpP3vJrrA9sVAHQ5gc2z8i4EzrLhLlWXcBM=
+github.com/aws/smithy-go v1.19.0/go.mod
h1:NukqUGpCZIILqqiV0NIjeFh24kd/FAa4beRb6nbIUPE=
github.com/awslabs/kinesis-aggregation/go v0.0.0-20210630091500-54e17340d32f
h1:Pf0BjJDga7C98f0vhw+Ip5EaiE07S3lTKpIYPNS0nMo=
github.com/awslabs/kinesis-aggregation/go
v0.0.0-20210630091500-54e17340d32f/go.mod
h1:SghidfnxvX7ribW6nHI7T+IBbc9puZ9kk5Tx/88h8P4=
github.com/aybabtme/rgbterm v0.0.0-20170906152045-cc83f3b3ce59/go.mod
h1:q/89r3U2H7sSsE2t6Kca0lfwTK8JdoNGS/yzM/4iH5I=
@@ -1163,8 +1155,8 @@
github.com/gabriel-vasile/mimetype v1.4.2
h1:w5qFW6JKBz9Y393Y4q372O9A7cUSequkh1Q7OhCmWKU=
github.com/gabriel-vasile/mimetype v1.4.2/go.mod
h1:zApsH/mKG4w07erKIaJPFiX0Tsq9BFQgN3qGY5GnNgA=
github.com/ghodss/yaml v1.0.0/go.mod
h1:4dBDuWmgqj2HViK6kFavaiC9ZROes6MMH2rRYeMEF04=
-github.com/go-asn1-ber/asn1-ber v1.5.4
h1:vXT6d/FNDiELJnLb6hGNa309LMsrCoYFvpwHDF0+Y1A=
-github.com/go-asn1-ber/asn1-ber v1.5.4/go.mod
h1:hEBeB/ic+5LoWskz+yKT7vGhhPYkProFKoKdwZRWMe0=
+github.com/go-asn1-ber/asn1-ber v1.5.5
h1:MNHlNMBDgEKD4TcKr36vQN68BA00aDfjIt3/bD50WnA=
+github.com/go-asn1-ber/asn1-ber v1.5.5/go.mod
h1:hEBeB/ic+5LoWskz+yKT7vGhhPYkProFKoKdwZRWMe0=
github.com/go-fonts/dejavu v0.1.0/go.mod
h1:4Wt4I4OU2Nq9asgDCteaAaWZOV24E+0/Pwo0gppep4g=
github.com/go-fonts/latin-modern v0.2.0/go.mod
h1:rQVLdDMK+mK1xscDwsqM5J8U2jrRa3T0ecnM9pNujks=
github.com/go-fonts/liberation v0.1.1/go.mod
h1:K6qoJYypsmfVjWg8KOVDQhLc8UDgIK2HYqyqAO9z7GY=
@@ -1180,8 +1172,8 @@
github.com/go-kit/log v0.2.1/go.mod
h1:NwTd00d/i8cPZ3xOwwiv2PO5MOcx78fFErGNcVmBjv0=
github.com/go-latex/latex v0.0.0-20210118124228-b3d85cf34e07/go.mod
h1:CO1AlKB2CSIqUrmQPqA0gdRIlnLEY0gK5JGjh37zN5U=
github.com/go-latex/latex v0.0.0-20210823091927-c0d11ff05a81/go.mod
h1:SX0U8uGpxhq9o2S/CELCSUxEWWAuoCUcVCQWv7G2OCk=
-github.com/go-ldap/ldap/v3 v3.4.5
h1:ekEKmaDrpvR2yf5Nc/DClsGG9lAmdDixe44mLzlW5r8=
-github.com/go-ldap/ldap/v3 v3.4.5/go.mod
h1:bMGIq3AGbytbaMwf8wdv5Phdxz0FWHTIYMSzyrYgnQs=
+github.com/go-ldap/ldap/v3 v3.4.6
h1:ert95MdbiG7aWo/oPYp9btL3KJlMPKnP58r09rI8T+A=
+github.com/go-ldap/ldap/v3 v3.4.6/go.mod
h1:IGMQANNtxpsOzj7uUAMjpGBaOVTC4DYyIy8VsTdxmtc=
github.com/go-logfmt/logfmt v0.3.0/go.mod
h1:Qt1PoO58o5twSAckw1HlFXLmHsOX5/0LbT9GBnD5lWE=
github.com/go-logfmt/logfmt v0.4.0/go.mod
h1:3RMwSq7FuexP4Kalkev3ejPJsZTpXXBr9+V4qmtdjCk=
github.com/go-logfmt/logfmt v0.5.0/go.mod
h1:wCYkCAKZfumFQihp8CzCvQ3paCTfi41vtzG1KdI/P7A=
@@ -1384,6 +1376,7 @@
github.com/google/uuid v1.1.1/go.mod
h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=
github.com/google/uuid v1.1.2/go.mod
h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=
github.com/google/uuid v1.3.0/go.mod
h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=
+github.com/google/uuid v1.3.1/go.mod
h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=
github.com/google/uuid v1.4.0 h1:MtMxsa51/r9yyhkyLsVeVt0B+BGQZzpQiTQ4eHZ8bc4=
github.com/google/uuid v1.4.0/go.mod
h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=
github.com/googleapis/enterprise-certificate-proxy
v0.0.0-20220520183353-fd19c99a87aa/go.mod
h1:17drOmN3MwGY7t0e+Ei9b45FFGA3fBs3x36SsCg1hq8=
@@ -1675,8 +1668,8 @@
github.com/klauspost/compress v1.10.10/go.mod
h1:aoV0uJVorq1K+umq18yTdKaF57EivdYsUV+/s2qKfXs=
github.com/klauspost/compress v1.13.6/go.mod
h1:/3/Vjq9QcHkK5uEr5lBEmyoZ1iFhe47etQ6QUkpK6sk=
github.com/klauspost/compress v1.15.9/go.mod
h1:PhcZ0MbTNciWF3rruxRgKxI5NkcHHrHUDtV4Yw2GlzU=
-github.com/klauspost/compress v1.17.3
h1:qkRjuerhUU1EmXLYGkSH6EZL+vPSxIrYjLNAK4slzwA=
-github.com/klauspost/compress v1.17.3/go.mod
h1:/dCuZOvVtNoHsyb+cuJD3itjs3NbnF6KH9zAO4BDxPM=
+github.com/klauspost/compress v1.17.4
h1:Ej5ixsIri7BrIjBkRZLTo6ghwrEtHFk7ijlczPW4fZ4=
+github.com/klauspost/compress v1.17.4/go.mod
h1:/dCuZOvVtNoHsyb+cuJD3itjs3NbnF6KH9zAO4BDxPM=
github.com/klauspost/cpuid v1.2.0/go.mod
h1:Pj4uuM528wm8OyEC2QMXAi2YiTZ96dNQPGgoMS4s3ek=
github.com/klauspost/cpuid/v2 v2.0.9/go.mod
h1:FInQzS24/EEf25PyTYn52gqo7WaD8xa0213Md/qVLRg=
github.com/klauspost/cpuid/v2 v2.2.5
h1:0E5MSMDEoAulmXNFquVs//DdoomxaoTY1kUhbc/qbZg=
@@ -1906,15 +1899,15 @@
github.com/onsi/ginkgo v1.16.4/go.mod
h1:dX+/inL/fNMqNlz0e9LfyB9TswhZpCVdJM/Z6Vvnwo0=
github.com/onsi/ginkgo v1.16.5 h1:8xi0RTUf59SOSfEtZMvwTvXYMzG4gV23XVHOZiXNtnE=
github.com/onsi/ginkgo v1.16.5/go.mod
h1:+E8gABHa3K6zRBolWtd+ROzc/U5bkGt0FwiG042wbpU=
-github.com/onsi/ginkgo/v2 v2.9.4
h1:xR7vG4IXt5RWx6FfIjyAtsoMAtnc3C/rFXBBd2AjZwE=
-github.com/onsi/ginkgo/v2 v2.9.4/go.mod
h1:gCQYp2Q+kSoIj7ykSVb9nskRSsR6PUj4AiLywzIhbKM=
+github.com/onsi/ginkgo/v2 v2.11.0
h1:WgqUCUt/lT6yXoQ8Wef0fsNn5cAuMK7+KT9UFRz2tcU=
+github.com/onsi/ginkgo/v2 v2.11.0/go.mod
h1:ZhrRA5XmEE3x3rhlzamx/JJvujdZoJ2uvgI7kR0iZvM=
github.com/onsi/gomega v1.5.0/go.mod
h1:ex+gbHU/CVuBBDIJjb2X0qEXbFg53c61hWP/1CpauHY=
github.com/onsi/gomega v1.7.0/go.mod
h1:ex+gbHU/CVuBBDIJjb2X0qEXbFg53c61hWP/1CpauHY=
github.com/onsi/gomega v1.7.1/go.mod
h1:XdKZgCCFLUoM/7CFJVPcG8C1xQ1AJ0vpAezJrB7JYyY=
github.com/onsi/gomega v1.10.1/go.mod
h1:iN09h71vgCQne3DLsj+A5owkum+a2tYe+TOCB1ybHNo=
github.com/onsi/gomega v1.15.0/go.mod
h1:cIuvLEne0aoVhAgh/O6ac0Op8WWw9H6eYCriF+tEHG0=
-github.com/onsi/gomega v1.27.6 h1:ENqfyGeS5AX/rlXDd/ETokDz93u0YufY1Pgxuy/PvWE=
-github.com/onsi/gomega v1.27.6/go.mod
h1:PIQNjfQwkP3aQAH7lf7j87O/5FiNr+ZR8+ipb+qQlhg=
+github.com/onsi/gomega v1.27.10 h1:naR28SdDFlqrG6kScpT8VWpu1xWY5nJRCF3XaYyBjhI=
+github.com/onsi/gomega v1.27.10/go.mod
h1:RsS8tutOdbdgzbPtzzATp12yT7kM5I5aElG3evPbQ0M=
github.com/open-telemetry/opentelemetry-collector-contrib/pkg/pdatatest
v0.84.0 h1:NXzx/YViPbapdfI0RZ2RJk4XgKU099Ci9rGBsZ/div8=
github.com/open-telemetry/opentelemetry-collector-contrib/pkg/pdatatest
v0.84.0/go.mod h1:t7+PIcvZwI9599uzwRVpJbJBUbOLBmvs0cIVse8djaA=
github.com/open-telemetry/opentelemetry-collector-contrib/pkg/pdatautil
v0.84.0 h1:Zuk1i/92HvV5cI6dtsG/VWSKwaLGh17q9a26qP9DBbo=
@@ -1951,8 +1944,8 @@
github.com/opentracing/opentracing-go
v1.2.1-0.20220228012449-10b1cf09e00b/go.mod
h1:AC62GU6hc0BrNm+9RK9VSiwa/EUe1bkIeFORAMcHvJU=
github.com/openzipkin-contrib/zipkin-go-opentracing v0.5.0
h1:uhcF5Jd7rP9DVEL10Siffyepr6SvlKbUsjH5JpNCRi8=
github.com/openzipkin-contrib/zipkin-go-opentracing v0.5.0/go.mod
h1:+oCZ5GXXr7KPI/DNOQORPTq5AWHfALJj9c72b0+YsEY=
-github.com/openzipkin/zipkin-go v0.4.1
h1:kNd/ST2yLLWhaWrkgchya40TJabe8Hioj9udfPcEO5A=
-github.com/openzipkin/zipkin-go v0.4.1/go.mod
h1:qY0VqDSN1pOBN94dBc6w2GJlWLiovAyg7Qt6/I9HecM=
+github.com/openzipkin/zipkin-go v0.4.2
h1:zjqfqHjUpPmB3c1GlCvvgsM1G4LkvqQbBDueDOCg/jA=
+github.com/openzipkin/zipkin-go v0.4.2/go.mod
h1:ZeVkFjuuBiSy13y8vpSDCjMi9GoI3hPpCJSBx/EYFhY=
github.com/p4lang/p4runtime v1.3.0
h1:3fUhHj0JtsGcL2Bh0uxpACdBJBDqpZyLgj93tqKzoJY=
github.com/p4lang/p4runtime v1.3.0/go.mod
h1:voPsRsgz/TDEhcaFvBxfMbI++hSKR/QGJusJveEs9Jg=
github.com/pascaldekloe/goe v0.0.0-20180627143212-57f6aae5913c/go.mod
h1:lzWF7FIEvWOWxwDKqyGYQf6ZUaNfKdP144TG7ZOy1lc=
@@ -2190,8 +2183,8 @@
github.com/testcontainers/testcontainers-go/modules/kafka
v0.26.1-0.20231116140448-68d5f8983d09/go.mod
h1:MBqGe6sHltLHRmjk1K1axtIboCjjATh3+oZObcWYFMg=
github.com/thomasklein94/packer-plugin-libvirt v0.5.0
h1:aj2HLHZZM/ClGLIwVp9rrgh+2TOU/w4EiaZHAwCpOgs=
github.com/thomasklein94/packer-plugin-libvirt v0.5.0/go.mod
h1:GwN82FQ6KxCNKtS8LNUgLbwTZs90GGhBzCmTNkrTCrY=
-github.com/tidwall/gjson v1.14.4
h1:uo0p8EbA09J7RQaflQ1aBRffTR7xedD2bcIVSYxLnkM=
-github.com/tidwall/gjson v1.14.4/go.mod
h1:/wbyibRr2FHMks5tjHJ5F8dMZh3AcwJEMf5vlfC0lxk=
+github.com/tidwall/gjson v1.17.0
h1:/Jocvlh98kcTfpN2+JzGQWQcqrPQwDrVEMApx/M5ZwM=
+github.com/tidwall/gjson v1.17.0/go.mod
h1:/wbyibRr2FHMks5tjHJ5F8dMZh3AcwJEMf5vlfC0lxk=
github.com/tidwall/match v1.1.1 h1:+Ho715JplO36QYgwN9PGYNhgZvoUSc9X2c80KVTi+GA=
github.com/tidwall/match v1.1.1/go.mod
h1:eRSPERbgtNPcGhD8UCthc6PmLEQXEWd3PRB5JTxsfmM=
github.com/tidwall/pretty v1.2.0
h1:RWIZEg2iJ8/g6fDDYzMpobmaoGh5OLl4AXtGUGPcqCs=
@@ -2377,6 +2370,7 @@
golang.org/x/crypto v0.7.0/go.mod
h1:pYwdfH91IfpZVANVyUOhSIPZaFoJGxTFbZhFTx+dXZU=
golang.org/x/crypto v0.8.0/go.mod
h1:mRqEX+O9/h5TFCrQhkgjo2yKi0yYA+9ecGkdQoHrywE=
golang.org/x/crypto v0.9.0/go.mod
h1:yrmDGqONDYtNj3tH8X9dzUun2m2lzPa9ngI6/RUPGR0=
+golang.org/x/crypto v0.13.0/go.mod
h1:y6Z2r+Rw4iayiXXAIxJIDAJ1zMW4yaTpebo8fPOliYc=
golang.org/x/crypto v0.14.0/go.mod
h1:MVFd36DqK4CsrnJYDkBA3VC4m2GkXAM0PvzMCn4JQf4=
golang.org/x/crypto v0.16.0 h1:mMMrFzRSCF0GvB7Ne27XVtVAaXLrPmgPC7/v0tkwHaY=
golang.org/x/crypto v0.16.0/go.mod
h1:gCAAfMLgwOJRpTjQ2zCCt2OcSfYMTeZVSRtQlPC7Nq4=
@@ -2716,6 +2710,7 @@
golang.org/x/sys v0.7.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
golang.org/x/sys v0.8.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
golang.org/x/sys v0.11.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
+golang.org/x/sys v0.12.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
golang.org/x/sys v0.13.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
golang.org/x/sys v0.15.0 h1:h48lPFYpsTvQJZF4EKyI4aLHaev3CxivZmv7yZig9pc=
golang.org/x/sys v0.15.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
@@ -2730,6 +2725,7 @@
golang.org/x/term v0.6.0/go.mod h1:m6U89DPEgQRMq3DNkDClhWw02AUbt2daBVO4cn4Hv9U=
golang.org/x/term v0.7.0/go.mod h1:P32HKFT3hSsZrRxla30E9HqToFYAQPCMs/zFMBUFqPY=
golang.org/x/term v0.8.0/go.mod h1:xPskH00ivmX89bAKVGSKKtLOWNx2+17Eiy94tnKShWo=
+golang.org/x/term v0.12.0/go.mod
h1:owVbMEjm3cBLCHdkQu9b1opXd4ETQWc3BhuQGKgXgvU=
golang.org/x/term v0.13.0/go.mod
h1:LTmsnFJwVN6bCy1rVCoS+qHT1HhALEFxKncY3WNNh4U=
golang.org/x/term v0.15.0 h1:y/Oo/a/q3IXu26lQgl04j/gjuBDOBlx7X6Om1j2CPW4=
golang.org/x/term v0.15.0/go.mod
h1:BDl952bC7+uMoWR75FIrCDx79TPU9oHkTZ9yRbYOrX0=
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/telegraf-1.29.0/plugins/inputs/clickhouse/README.md
new/telegraf-1.29.1/plugins/inputs/clickhouse/README.md
--- old/telegraf-1.29.0/plugins/inputs/clickhouse/README.md 2023-12-11
16:04:29.000000000 +0100
+++ new/telegraf-1.29.1/plugins/inputs/clickhouse/README.md 2023-12-13
17:34:29.000000000 +0100
@@ -3,6 +3,9 @@
This plugin gathers the statistic data from
[ClickHouse](https://github.com/ClickHouse/ClickHouse) server.
+User's on Clickhouse Cloud will not see the Zookeeper metrics as they may not
+have permissions to query those tables.
+
## Global configuration options <!-- @/docs/includes/plugin_config.md -->
In addition to the plugin-specific configuration settings, plugins support
@@ -33,6 +36,12 @@
## https://clickhouse.tech/docs/en/interfaces/http/
servers = ["http://127.0.0.1:8123";]
+ ## Server Variant
+ ## When set to "managed", some queries are excluded from being run. This is
+ ## useful for instances hosted in ClickHouse Cloud where certain tables are
+ ## not available.
+ # variant = "self-hosted"
+
## If "auto_discovery"" is "true" plugin tries to connect to all servers
## available in the cluster with using same "user:password" described in
## "user" and "password" parameters and get this server hostname list from
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/telegraf-1.29.0/plugins/inputs/clickhouse/clickhouse.go
new/telegraf-1.29.1/plugins/inputs/clickhouse/clickhouse.go
--- old/telegraf-1.29.0/plugins/inputs/clickhouse/clickhouse.go 2023-12-11
16:04:29.000000000 +0100
+++ new/telegraf-1.29.1/plugins/inputs/clickhouse/clickhouse.go 2023-12-13
17:34:29.000000000 +0100
@@ -54,7 +54,9 @@
ClusterInclude []string `toml:"cluster_include"`
ClusterExclude []string `toml:"cluster_exclude"`
Timeout config.Duration `toml:"timeout"`
- HTTPClient http.Client
+ Variant string `toml:"variant"`
+
+ HTTPClient http.Client
tls.ClientConfig
}
@@ -62,6 +64,19 @@
return sampleConfig
}
+func (ch *ClickHouse) Init() error {
+ switch ch.Variant {
+ case "":
+ ch.Variant = "self-hosted"
+ case "self-hosted", "managed":
+ // valid options
+ default:
+ return fmt.Errorf("unknown variant %q", ch.Variant)
+ }
+
+ return nil
+}
+
// Start ClickHouse input service
func (ch *ClickHouse) Start(telegraf.Accumulator) error {
timeout := defaultTimeout
@@ -130,7 +145,6 @@
for i := range connects {
metricsFuncs := []func(acc telegraf.Accumulator, conn *connect)
error{
ch.tables,
- ch.zookeeper,
ch.replicationQueue,
ch.detachedParts,
ch.dictionaries,
@@ -140,6 +154,12 @@
ch.textLog,
}
+ // Managed instances on Clickhouse Cloud does not give a user
+ // permissions to the zookeeper table
+ if ch.Variant != "managed" {
+ metricsFuncs = append(metricsFuncs, ch.zookeeper)
+ }
+
for _, metricFunc := range metricsFuncs {
if err := metricFunc(acc, &connects[i]); err != nil {
acc.AddError(err)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/telegraf-1.29.0/plugins/inputs/clickhouse/clickhouse_test.go
new/telegraf-1.29.1/plugins/inputs/clickhouse/clickhouse_test.go
--- old/telegraf-1.29.0/plugins/inputs/clickhouse/clickhouse_test.go
2023-12-11 16:04:29.000000000 +0100
+++ new/telegraf-1.29.1/plugins/inputs/clickhouse/clickhouse_test.go
2023-12-13 17:34:29.000000000 +0100
@@ -492,6 +492,48 @@
acc.AssertDoesNotContainMeasurement(t, "clickhouse_text_log")
}
+func TestGatherClickhouseCloud(t *testing.T) {
+ ts := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r
*http.Request) {
+ type result struct {
+ Data interface{} `json:"data"`
+ }
+ enc := json.NewEncoder(w)
+ switch query := r.URL.Query().Get("query"); {
+ case strings.Contains(query, "zk_exists"):
+ err := enc.Encode(result{
+ Data: []struct {
+ ZkExists chUInt64 `json:"zk_exists"`
+ }{
+ {
+ ZkExists: 1,
+ },
+ },
+ })
+ require.NoError(t, err)
+ case strings.Contains(query, "zk_root_nodes"):
+ err := enc.Encode(result{
+ Data: []struct {
+ ZkRootNodes chUInt64
`json:"zk_root_nodes"`
+ }{
+ {
+ ZkRootNodes: 2,
+ },
+ },
+ })
+ require.NoError(t, err)
+ }
+ }))
+ defer ts.Close()
+
+ ch := &ClickHouse{
+ Servers: []string{ts.URL},
+ Variant: "managed",
+ }
+ acc := &testutil.Accumulator{}
+ require.NoError(t, ch.Gather(acc))
+ acc.AssertDoesNotContainMeasurement(t, "clickhouse_zookeeper")
+}
+
func TestWrongJSONMarshalling(t *testing.T) {
var (
ts = httptest.NewServer(http.HandlerFunc(func(w
http.ResponseWriter, r *http.Request) {
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/telegraf-1.29.0/plugins/inputs/clickhouse/sample.conf
new/telegraf-1.29.1/plugins/inputs/clickhouse/sample.conf
--- old/telegraf-1.29.0/plugins/inputs/clickhouse/sample.conf 2023-12-11
16:04:29.000000000 +0100
+++ new/telegraf-1.29.1/plugins/inputs/clickhouse/sample.conf 2023-12-13
17:34:29.000000000 +0100
@@ -16,6 +16,12 @@
## https://clickhouse.tech/docs/en/interfaces/http/
servers = ["http://127.0.0.1:8123";]
+ ## Server Variant
+ ## When set to "managed", some queries are excluded from being run. This is
+ ## useful for instances hosted in ClickHouse Cloud where certain tables are
+ ## not available.
+ # variant = "self-hosted"
+
## If "auto_discovery"" is "true" plugin tries to connect to all servers
## available in the cluster with using same "user:password" described in
## "user" and "password" parameters and get this server hostname list from
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/telegraf-1.29.0/plugins/inputs/cloudwatch/cloudwatch.go
new/telegraf-1.29.1/plugins/inputs/cloudwatch/cloudwatch.go
--- old/telegraf-1.29.0/plugins/inputs/cloudwatch/cloudwatch.go 2023-12-11
16:04:29.000000000 +0100
+++ new/telegraf-1.29.1/plugins/inputs/cloudwatch/cloudwatch.go 2023-12-13
17:34:29.000000000 +0100
@@ -178,14 +178,9 @@
return err
}
- var customResolver cwClient.EndpointResolver
- if c.CredentialConfig.EndpointURL != "" && c.CredentialConfig.Region !=
"" {
- customResolver =
cwClient.EndpointResolverFromURL(c.CredentialConfig.EndpointURL)
- }
-
c.client = cwClient.NewFromConfig(awsCreds, func(options
*cwClient.Options) {
- if customResolver != nil {
- options.EndpointResolver = customResolver
+ if c.CredentialConfig.EndpointURL != "" &&
c.CredentialConfig.Region != "" {
+ options.BaseEndpoint = &c.CredentialConfig.EndpointURL
}
options.ClientLogMode = 0
@@ -321,7 +316,7 @@
params := &cwClient.ListMetricsInput{
Dimensions: []types.DimensionFilter{},
Namespace: aws.String(namespace),
- IncludeLinkedAccounts: c.IncludeLinkedAccounts,
+ IncludeLinkedAccounts: &c.IncludeLinkedAccounts,
}
if c.RecentlyActive == "PT3H" {
params.RecentlyActive = types.RecentlyActivePt3h
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/telegraf-1.29.0/plugins/inputs/cloudwatch/cloudwatch_test.go
new/telegraf-1.29.1/plugins/inputs/cloudwatch/cloudwatch_test.go
--- old/telegraf-1.29.0/plugins/inputs/cloudwatch/cloudwatch_test.go
2023-12-11 16:04:29.000000000 +0100
+++ new/telegraf-1.29.1/plugins/inputs/cloudwatch/cloudwatch_test.go
2023-12-13 17:34:29.000000000 +0100
@@ -50,7 +50,7 @@
},
},
}
- if params.IncludeLinkedAccounts {
+ if params.IncludeLinkedAccounts != nil && *params.IncludeLinkedAccounts
{
(*response).OwningAccounts = []string{"123456789012",
"923456789017"}
}
return response, nil
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/telegraf-1.29.0/plugins/inputs/ldap/README.md
new/telegraf-1.29.1/plugins/inputs/ldap/README.md
--- old/telegraf-1.29.0/plugins/inputs/ldap/README.md 2023-12-11
16:04:29.000000000 +0100
+++ new/telegraf-1.29.1/plugins/inputs/ldap/README.md 2023-12-13
17:34:29.000000000 +0100
@@ -17,7 +17,7 @@
```toml @sample.conf
# LDAP monitoring plugin
-[[inputs.openldap]]
+[[inputs.ldap]]
## Server to monitor
## The scheme determines the mode to use for connection with
## ldap://... -- unencrypted (non-TLS) connection
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/telegraf-1.29.0/plugins/inputs/ldap/sample.conf
new/telegraf-1.29.1/plugins/inputs/ldap/sample.conf
--- old/telegraf-1.29.0/plugins/inputs/ldap/sample.conf 2023-12-11
16:04:29.000000000 +0100
+++ new/telegraf-1.29.1/plugins/inputs/ldap/sample.conf 2023-12-13
17:34:29.000000000 +0100
@@ -1,5 +1,5 @@
# LDAP monitoring plugin
-[[inputs.openldap]]
+[[inputs.ldap]]
## Server to monitor
## The scheme determines the mode to use for connection with
## ldap://... -- unencrypted (non-TLS) connection
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/telegraf-1.29.0/plugins/inputs/memcached/README.md
new/telegraf-1.29.1/plugins/inputs/memcached/README.md
--- old/telegraf-1.29.0/plugins/inputs/memcached/README.md 2023-12-11
16:04:29.000000000 +0100
+++ new/telegraf-1.29.1/plugins/inputs/memcached/README.md 2023-12-13
17:34:29.000000000 +0100
@@ -60,7 +60,7 @@
* decr_hits - Number of successful decr reqs
* decr_misses - Number of decr reqs against missing keys
* delete_hits - Number of deletion reqs resulting in an item being removed
-* delete_misses - umber of deletions reqs for missing keys
+* delete_misses - Number of deletions reqs for missing keys
* evicted_active - Items evicted from LRU that had been hit recently but did
not jump to top of LRU
* evicted_unfetched - Items evicted from LRU that were never touched by
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/telegraf-1.29.0/plugins/inputs/phpfpm/README.md
new/telegraf-1.29.1/plugins/inputs/phpfpm/README.md
--- old/telegraf-1.29.0/plugins/inputs/phpfpm/README.md 2023-12-11
16:04:29.000000000 +0100
+++ new/telegraf-1.29.1/plugins/inputs/phpfpm/README.md 2023-12-13
17:34:29.000000000 +0100
@@ -39,6 +39,12 @@
## urls = ["http://192.168.1.20/status";, "/tmp/fpm.sock"]
urls = ["http://localhost/status";]
+ ## Format of stats to parse, set to "status" or "json"
+ ## If the user configures the URL to return JSON (e.g.
+ ## http://localhost/status?json), set to JSON. Otherwise, will attempt to
+ ## parse line-by-line. The JSON mode will produce additonal metrics.
+ # format = "status"
+
## Duration allowed to complete HTTP requests.
# timeout = "5s"
@@ -70,6 +76,23 @@
- max_active_processes
- max_children_reached
- slow_requests
+- phpfpm_process
+ - tags:
+ - pool
+ - request method
+ - request uri
+ - script
+ - url
+ - user
+ - fields:
+ - content length
+ - last request cpu
+ - last request memory
+ - request duration
+ - requests
+ - start time
+ - start since
+ - state
## Example Output
@@ -78,3 +101,19 @@
phpfpm,pool=www2
accepted_conn=12i,active_processes=1i,idle_processes=2i,listen_queue=0i,listen_queue_len=0i,max_active_processes=2i,max_children_reached=0i,max_listen_queue=0i,slow_requests=0i,total_processes=3i
1453011293083691422
phpfpm,pool=www3
accepted_conn=11i,active_processes=1i,idle_processes=2i,listen_queue=0i,listen_queue_len=0i,max_active_processes=2i,max_children_reached=0i,max_listen_queue=0i,slow_requests=0i,total_processes=3i
1453011293083691658
```
+
+With the JSON output, additional metrics around processes are generated:
+
+```text
+phpfpm,pool=www,url=http://127.0.0.1:44637?full&json
accepted_conn=3879i,active_processes=1i,idle_processes=9i,listen_queue=0i,listen_queue_len=0i,max_active_processes=3i,max_children_reached=0i,max_listen_queue=0i,slow_requests=0i,start_since=4901i,total_processes=10i
+phpfpm_process,pool=www,request_method=GET,request_uri=/fpm-status?json&full,script=-,url=http://127.0.0.1:44637?full&json,user=-
content_length=0i,last_request_cpu=0,last_request_memory=0,request_duration=159i,requests=386i,start_time=1702044927i,state="Running"
+phpfpm_process,pool=www,request_method=GET,request_uri=/fpm-status,script=-,url=http://127.0.0.1:44637?full&json,user=-
content_length=0i,last_request_cpu=0,last_request_memory=2097152,request_duration=174i,requests=390i,start_time=1702044927i,state="Idle"
+phpfpm_process,pool=www,request_method=GET,request_uri=/index.php,script=script.php,url=http://127.0.0.1:44637?full&json,user=-
content_length=0i,last_request_cpu=104.93,last_request_memory=2097152,request_duration=9530i,requests=389i,start_time=1702044927i,state="Idle"
+phpfpm_process,pool=www,request_method=GET,request_uri=/ping,script=-,url=http://127.0.0.1:44637?full&json,user=-
content_length=0i,last_request_cpu=0,last_request_memory=2097152,request_duration=127i,requests=399i,start_time=1702044927i,state="Idle"
+phpfpm_process,pool=www,request_method=GET,request_uri=/index.php,script=script.php,url=http://127.0.0.1:44637?full&json,user=-
content_length=0i,last_request_cpu=0,last_request_memory=2097152,request_duration=9713i,requests=382i,start_time=1702044927i,state="Idle"
+phpfpm_process,pool=www,request_method=GET,request_uri=/ping,script=-,url=http://127.0.0.1:44637?full&json,user=-
content_length=0i,last_request_cpu=0,last_request_memory=2097152,request_duration=133i,requests=383i,start_time=1702044927i,state="Idle"
+phpfpm_process,pool=www,request_method=GET,request_uri=/fpm-status?json,script=-,url=http://127.0.0.1:44637?full&json,user=-
content_length=0i,last_request_cpu=0,last_request_memory=2097152,request_duration=154i,requests=381i,start_time=1702044927i,state="Idle"
+phpfpm_process,pool=www,request_method=GET,request_uri=/ping,script=-,url=http://127.0.0.1:44637?full&json,user=-
content_length=0i,last_request_cpu=0,last_request_memory=2097152,request_duration=108i,requests=397i,start_time=1702044927i,state="Idle"
+phpfpm_process,pool=www,request_method=GET,request_uri=/index.php,script=script.php,url=http://127.0.0.1:44637?full&json,user=-
content_length=0i,last_request_cpu=110.28,last_request_memory=2097152,request_duration=9068i,requests=381i,start_time=1702044927i,state="Idle"
+phpfpm_process,pool=www,request_method=GET,request_uri=/index.php,script=script.php,url=http://127.0.0.1:44637?full&json,user=-
content_length=0i,last_request_cpu=64.27,last_request_memory=2097152,request_duration=15559i,requests=391i,start_time=1702044927i,state="Idle"
+```
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/telegraf-1.29.0/plugins/inputs/phpfpm/phpfpm.go
new/telegraf-1.29.1/plugins/inputs/phpfpm/phpfpm.go
--- old/telegraf-1.29.0/plugins/inputs/phpfpm/phpfpm.go 2023-12-11
16:04:29.000000000 +0100
+++ new/telegraf-1.29.1/plugins/inputs/phpfpm/phpfpm.go 2023-12-13
17:34:29.000000000 +0100
@@ -5,6 +5,7 @@
"bufio"
"bytes"
_ "embed"
+ "encoding/json"
"fmt"
"io"
"net/http"
@@ -40,15 +41,49 @@
PfSlowRequests = "slow requests"
)
+type JSONMetrics struct {
+ Pool string `json:"pool"`
+ ProcessManager string `json:"process manager"`
+ StartTime int `json:"start time"`
+ StartSince int `json:"start since"`
+ AcceptedConn int `json:"accepted conn"`
+ ListenQueue int `json:"listen queue"`
+ MaxListenQueue int `json:"max listen queue"`
+ ListenQueueLen int `json:"listen queue len"`
+ IdleProcesses int `json:"idle processes"`
+ ActiveProcesses int `json:"active processes"`
+ TotalProcesses int `json:"total processes"`
+ MaxActiveProcesses int `json:"max active processes"`
+ MaxChildrenReached int `json:"max children reached"`
+ SlowRequests int `json:"slow requests"`
+ Processes []struct {
+ Pid int `json:"pid"`
+ State string `json:"state"`
+ StartTime int `json:"start time"`
+ StartSince int `json:"start since"`
+ Requests int `json:"requests"`
+ RequestDuration int `json:"request duration"`
+ RequestMethod string `json:"request method"`
+ RequestURI string `json:"request uri"`
+ ContentLength int `json:"content length"`
+ User string `json:"user"`
+ Script string `json:"script"`
+ LastRequestCPU float64 `json:"last request cpu"`
+ LastRequestMemory float64 `json:"last request memory"`
+ } `json:"processes"`
+}
+
type metric map[string]int64
type poolStat map[string]metric
type phpfpm struct {
- Urls []string
- Timeout config.Duration
- tls.ClientConfig
+ Format string `toml:"format"`
+ Timeout config.Duration `toml:"timeout"`
+ Urls []string `toml:"urls"`
+ tls.ClientConfig
client *http.Client
+ log telegraf.Logger
}
func (*phpfpm) SampleConfig() string {
@@ -61,6 +96,15 @@
return err
}
+ switch p.Format {
+ case "":
+ p.Format = "status"
+ case "status", "json":
+ // both valid
+ default:
+ return fmt.Errorf("invalid format: %s", p.Format)
+ }
+
p.client = &http.Client{
Transport: &http.Transport{
TLSClientConfig: tlsCfg,
@@ -158,7 +202,7 @@
}, "/"+statusPath)
if len(fpmErr) == 0 && err == nil {
- importMetric(bytes.NewReader(fpmOutput), acc, addr)
+ p.importMetric(bytes.NewReader(fpmOutput), acc, addr)
return nil
}
return fmt.Errorf("unable parse phpfpm status, error: %s; %w",
string(fpmErr), err)
@@ -186,12 +230,20 @@
return fmt.Errorf("unable to get valid stat result from %q:
%w", addr, err)
}
- importMetric(res.Body, acc, addr)
+ p.importMetric(res.Body, acc, addr)
return nil
}
// Import stat data into Telegraf system
-func importMetric(r io.Reader, acc telegraf.Accumulator, addr string) {
+func (p *phpfpm) importMetric(r io.Reader, acc telegraf.Accumulator, addr
string) {
+ if p.Format == "json" {
+ p.parseJSON(r, acc, addr)
+ } else {
+ parseLines(r, acc, addr)
+ }
+}
+
+func parseLines(r io.Reader, acc telegraf.Accumulator, addr string) {
stats := make(poolStat)
var currentPool string
@@ -245,6 +297,55 @@
}
}
+func (p *phpfpm) parseJSON(r io.Reader, acc telegraf.Accumulator, addr string)
{
+ var metrics JSONMetrics
+ if err := json.NewDecoder(r).Decode(&metrics); err != nil {
+ p.log.Errorf("Unable to decode JSON response: %s", err)
+ return
+ }
+ timestamp := time.Now()
+
+ tags := map[string]string{
+ "pool": metrics.Pool,
+ "url": addr,
+ }
+ fields := map[string]any{
+ "start_since": metrics.StartSince,
+ "accepted_conn": metrics.AcceptedConn,
+ "listen_queue": metrics.ListenQueue,
+ "max_listen_queue": metrics.MaxListenQueue,
+ "listen_queue_len": metrics.ListenQueueLen,
+ "idle_processes": metrics.IdleProcesses,
+ "active_processes": metrics.ActiveProcesses,
+ "total_processes": metrics.TotalProcesses,
+ "max_active_processes": metrics.MaxActiveProcesses,
+ "max_children_reached": metrics.MaxChildrenReached,
+ "slow_requests": metrics.SlowRequests,
+ }
+ acc.AddFields("phpfpm", fields, tags, timestamp)
+
+ for _, process := range metrics.Processes {
+ tags := map[string]string{
+ "pool": metrics.Pool,
+ "url": addr,
+ "user": process.User,
+ "request_uri": process.RequestURI,
+ "request_method": process.RequestMethod,
+ "script": process.Script,
+ }
+ fields := map[string]any{
+ "state": process.State,
+ "start_time": process.StartTime,
+ "requests": process.Requests,
+ "request_duration": process.RequestDuration,
+ "content_length": process.ContentLength,
+ "last_request_cpu": process.LastRequestCPU,
+ "last_request_memory": process.LastRequestMemory,
+ }
+ acc.AddFields("phpfpm_process", fields, tags, timestamp)
+ }
+}
+
func expandUrls(urls []string) ([]string, error) {
addrs := make([]string, 0, len(urls))
for _, address := range urls {
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/telegraf-1.29.0/plugins/inputs/phpfpm/phpfpm_test.go
new/telegraf-1.29.1/plugins/inputs/phpfpm/phpfpm_test.go
--- old/telegraf-1.29.0/plugins/inputs/phpfpm/phpfpm_test.go 2023-12-11
16:04:29.000000000 +0100
+++ new/telegraf-1.29.1/plugins/inputs/phpfpm/phpfpm_test.go 2023-12-13
17:34:29.000000000 +0100
@@ -13,11 +13,13 @@
"net/http"
"net/http/fcgi"
"net/http/httptest"
+ "os"
"strconv"
"testing"
"github.com/stretchr/testify/require"
+ "github.com/influxdata/telegraf/plugins/parsers/influx"
"github.com/influxdata/telegraf/testutil"
)
@@ -73,6 +75,34 @@
acc.AssertContainsTaggedFields(t, "phpfpm", fields, tags)
}
+func TestPhpFpmGeneratesJSONMetrics_From_Http(t *testing.T) {
+ outputSampleJSON, err := os.ReadFile("testdata/phpfpm.json")
+ require.NoError(t, err)
+ server := httptest.NewServer(http.HandlerFunc(func(w
http.ResponseWriter, r *http.Request) {
+ w.Header().Set("Content-Type", "text/json")
+ w.Header().Set("Content-Length",
strconv.Itoa(len(outputSampleJSON)))
+ _, err := fmt.Fprint(w, string(outputSampleJSON))
+ require.NoError(t, err)
+ }))
+ defer server.Close()
+
+ parser := &influx.Parser{}
+ require.NoError(t, parser.Init())
+ expected, err := testutil.ParseMetricsFromFile("testdata/expected.out",
parser)
+ require.NoError(t, err)
+
+ input := &phpfpm{
+ Urls: []string{server.URL + "?full&json"},
+ Format: "json",
+ log: testutil.Logger{},
+ }
+ require.NoError(t, input.Init())
+
+ var acc testutil.Accumulator
+ require.NoError(t, acc.GatherError(input.Gather))
+ testutil.RequireMetricsEqual(t, expected, acc.GetTelegrafMetrics(),
testutil.IgnoreTime(), testutil.IgnoreTags("url"))
+}
+
func TestPhpFpmGeneratesMetrics_From_Fcgi(t *testing.T) {
// Let OS find an available port
tcp, err := net.Listen("tcp", "127.0.0.1:0")
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/telegraf-1.29.0/plugins/inputs/phpfpm/sample.conf
new/telegraf-1.29.1/plugins/inputs/phpfpm/sample.conf
--- old/telegraf-1.29.0/plugins/inputs/phpfpm/sample.conf 2023-12-11
16:04:29.000000000 +0100
+++ new/telegraf-1.29.1/plugins/inputs/phpfpm/sample.conf 2023-12-13
17:34:29.000000000 +0100
@@ -23,6 +23,12 @@
## urls = ["http://192.168.1.20/status";, "/tmp/fpm.sock"]
urls = ["http://localhost/status";]
+ ## Format of stats to parse, set to "status" or "json"
+ ## If the user configures the URL to return JSON (e.g.
+ ## http://localhost/status?json), set to JSON. Otherwise, will attempt to
+ ## parse line-by-line. The JSON mode will produce additonal metrics.
+ # format = "status"
+
## Duration allowed to complete HTTP requests.
# timeout = "5s"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/telegraf-1.29.0/plugins/inputs/phpfpm/testdata/expected.out
new/telegraf-1.29.1/plugins/inputs/phpfpm/testdata/expected.out
--- old/telegraf-1.29.0/plugins/inputs/phpfpm/testdata/expected.out
1970-01-01 01:00:00.000000000 +0100
+++ new/telegraf-1.29.1/plugins/inputs/phpfpm/testdata/expected.out
2023-12-13 17:34:29.000000000 +0100
@@ -0,0 +1,11 @@
+phpfpm,pool=www,url=http://127.0.0.1:44637?full&json
accepted_conn=3879i,active_processes=1i,idle_processes=9i,listen_queue=0i,listen_queue_len=0i,max_active_processes=3i,max_children_reached=0i,max_listen_queue=0i,slow_requests=0i,start_since=4901i,total_processes=10i
+phpfpm_process,pool=www,request_method=GET,request_uri=/fpm-status?json&full,script=-,url=http://127.0.0.1:44637?full&json,user=-
content_length=0i,last_request_cpu=0,last_request_memory=0,request_duration=159i,requests=386i,start_time=1702044927i,state="Running"
+phpfpm_process,pool=www,request_method=GET,request_uri=/fpm-status,script=-,url=http://127.0.0.1:44637?full&json,user=-
content_length=0i,last_request_cpu=0,last_request_memory=2097152,request_duration=174i,requests=390i,start_time=1702044927i,state="Idle"
+phpfpm_process,pool=www,request_method=GET,request_uri=/index.php,script=script.php,url=http://127.0.0.1:44637?full&json,user=-
content_length=0i,last_request_cpu=104.93,last_request_memory=2097152,request_duration=9530i,requests=389i,start_time=1702044927i,state="Idle"
+phpfpm_process,pool=www,request_method=GET,request_uri=/ping,script=-,url=http://127.0.0.1:44637?full&json,user=-
content_length=0i,last_request_cpu=0,last_request_memory=2097152,request_duration=127i,requests=399i,start_time=1702044927i,state="Idle"
+phpfpm_process,pool=www,request_method=GET,request_uri=/index.php,script=script.php,url=http://127.0.0.1:44637?full&json,user=-
content_length=0i,last_request_cpu=0,last_request_memory=2097152,request_duration=9713i,requests=382i,start_time=1702044927i,state="Idle"
+phpfpm_process,pool=www,request_method=GET,request_uri=/ping,script=-,url=http://127.0.0.1:44637?full&json,user=-
content_length=0i,last_request_cpu=0,last_request_memory=2097152,request_duration=133i,requests=383i,start_time=1702044927i,state="Idle"
+phpfpm_process,pool=www,request_method=GET,request_uri=/fpm-status?json,script=-,url=http://127.0.0.1:44637?full&json,user=-
content_length=0i,last_request_cpu=0,last_request_memory=2097152,request_duration=154i,requests=381i,start_time=1702044927i,state="Idle"
+phpfpm_process,pool=www,request_method=GET,request_uri=/ping,script=-,url=http://127.0.0.1:44637?full&json,user=-
content_length=0i,last_request_cpu=0,last_request_memory=2097152,request_duration=108i,requests=397i,start_time=1702044927i,state="Idle"
+phpfpm_process,pool=www,request_method=GET,request_uri=/index.php,script=script.php,url=http://127.0.0.1:44637?full&json,user=-
content_length=0i,last_request_cpu=110.28,last_request_memory=2097152,request_duration=9068i,requests=381i,start_time=1702044927i,state="Idle"
+phpfpm_process,pool=www,request_method=GET,request_uri=/index.php,script=script.php,url=http://127.0.0.1:44637?full&json,user=-
content_length=0i,last_request_cpu=64.27,last_request_memory=2097152,request_duration=15559i,requests=391i,start_time=1702044927i,state="Idle"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/telegraf-1.29.0/plugins/inputs/phpfpm/testdata/phpfpm.json
new/telegraf-1.29.1/plugins/inputs/phpfpm/testdata/phpfpm.json
--- old/telegraf-1.29.0/plugins/inputs/phpfpm/testdata/phpfpm.json
1970-01-01 01:00:00.000000000 +0100
+++ new/telegraf-1.29.1/plugins/inputs/phpfpm/testdata/phpfpm.json
2023-12-13 17:34:29.000000000 +0100
@@ -0,0 +1,168 @@
+{
+ "pool": "www",
+ "process manager": "static",
+ "start time": 1702044927,
+ "start since": 4901,
+ "accepted conn": 3879,
+ "listen queue": 0,
+ "max listen queue": 0,
+ "listen queue len": 0,
+ "idle processes": 9,
+ "active processes": 1,
+ "total processes": 10,
+ "max active processes": 3,
+ "max children reached": 0,
+ "slow requests": 0,
+ "processes": [
+ {
+ "pid": 583,
+ "state": "Running",
+ "start time": 1702044927,
+ "start since": 4901,
+ "requests": 386,
+ "request duration": 159,
+ "request method": "GET",
+ "request uri": "/fpm-status?json&full",
+ "content length": 0,
+ "user": "-",
+ "script": "-",
+ "last request cpu": 0,
+ "last request memory": 0
+ },
+ {
+ "pid": 584,
+ "state": "Idle",
+ "start time": 1702044927,
+ "start since": 4901,
+ "requests": 390,
+ "request duration": 174,
+ "request method": "GET",
+ "request uri": "/fpm-status",
+ "content length": 0,
+ "user": "-",
+ "script": "-",
+ "last request cpu": 0,
+ "last request memory": 2097152
+ },
+ {
+ "pid": 585,
+ "state": "Idle",
+ "start time": 1702044927,
+ "start since": 4901,
+ "requests": 389,
+ "request duration": 9530,
+ "request method": "GET",
+ "request uri": "/index.php",
+ "content length": 0,
+ "user": "-",
+ "script": "script.php",
+ "last request cpu": 104.93,
+ "last request memory": 2097152
+ },
+ {
+ "pid": 586,
+ "state": "Idle",
+ "start time": 1702044927,
+ "start since": 4901,
+ "requests": 399,
+ "request duration": 127,
+ "request method": "GET",
+ "request uri": "/ping",
+ "content length": 0,
+ "user": "-",
+ "script": "-",
+ "last request cpu": 0,
+ "last request memory": 2097152
+ },
+ {
+ "pid": 587,
+ "state": "Idle",
+ "start time": 1702044927,
+ "start since": 4901,
+ "requests": 382,
+ "request duration": 9713,
+ "request method": "GET",
+ "request uri": "/index.php",
+ "content length": 0,
+ "user": "-",
+ "script": "script.php",
+ "last request cpu": 0,
+ "last request memory": 2097152
+ },
+ {
+ "pid": 588,
+ "state": "Idle",
+ "start time": 1702044927,
+ "start since": 4901,
+ "requests": 383,
+ "request duration": 133,
+ "request method": "GET",
+ "request uri": "/ping",
+ "content length": 0,
+ "user": "-",
+ "script": "-",
+ "last request cpu": 0,
+ "last request memory": 2097152
+ },
+ {
+ "pid": 589,
+ "state": "Idle",
+ "start time": 1702044927,
+ "start since": 4901,
+ "requests": 381,
+ "request duration": 154,
+ "request method": "GET",
+ "request uri": "/fpm-status?json",
+ "content length": 0,
+ "user": "-",
+ "script": "-",
+ "last request cpu": 0,
+ "last request memory": 2097152
+ },
+ {
+ "pid": 590,
+ "state": "Idle",
+ "start time": 1702044927,
+ "start since": 4901,
+ "requests": 397,
+ "request duration": 108,
+ "request method": "GET",
+ "request uri": "/ping",
+ "content length": 0,
+ "user": "-",
+ "script": "-",
+ "last request cpu": 0,
+ "last request memory": 2097152
+ },
+ {
+ "pid": 591,
+ "state": "Idle",
+ "start time": 1702044927,
+ "start since": 4901,
+ "requests": 381,
+ "request duration": 9068,
+ "request method": "GET",
+ "request uri": "/index.php",
+ "content length": 0,
+ "user": "-",
+ "script": "script.php",
+ "last request cpu": 110.28,
+ "last request memory": 2097152
+ },
+ {
+ "pid": 592,
+ "state": "Idle",
+ "start time": 1702044927,
+ "start since": 4901,
+ "requests": 391,
+ "request duration": 15559,
+ "request method": "GET",
+ "request uri": "/index.php",
+ "content length": 0,
+ "user": "-",
+ "script": "script.php",
+ "last request cpu": 64.27,
+ "last request memory": 2097152
+ }
+ ]
+}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/telegraf-1.29.0/plugins/inputs/procstat/procstat.go
new/telegraf-1.29.1/plugins/inputs/procstat/procstat.go
--- old/telegraf-1.29.0/plugins/inputs/procstat/procstat.go 2023-12-11
16:04:29.000000000 +0100
+++ new/telegraf-1.29.1/plugins/inputs/procstat/procstat.go 2023-12-13
17:34:29.000000000 +0100
@@ -37,7 +37,7 @@
CmdLineTag bool `toml:"cmdline_tag"
deprecated:"1.29.0;use 'tag_with' instead"`
ProcessName string `toml:"process_name"`
User string `toml:"user"`
- SystemdUnits string `toml:"systemd_units"`
+ SystemdUnit string `toml:"systemd_unit"`
SupervisorUnit []string `toml:"supervisor_unit"
deprecated:"1.29.0;use 'supervisor_units' instead"`
SupervisorUnits []string `toml:"supervisor_units"`
IncludeSystemdChildren bool `toml:"include_systemd_children"`
@@ -95,7 +95,7 @@
// Check filtering
switch {
- case len(p.SupervisorUnits) > 0, p.SystemdUnits != "", p.WinService !=
"",
+ case len(p.SupervisorUnits) > 0, p.SystemdUnit != "", p.WinService !=
"",
p.CGroup != "", p.PidFile != "", p.Exe != "", p.Pattern != "",
p.User != "":
// Do nothing as those are valid settings
@@ -221,7 +221,7 @@
switch {
case len(p.SupervisorUnits) > 0:
return p.findSupervisorUnits()
- case p.SystemdUnits != "":
+ case p.SystemdUnit != "":
return p.systemdUnitPIDs()
case p.WinService != "":
pids, err := p.winServicePIDs()
@@ -356,7 +356,7 @@
func (p *Procstat) systemdUnitPIDs() ([]PidsTags, error) {
if p.IncludeSystemdChildren {
- p.CGroup = fmt.Sprintf("systemd/system.slice/%s",
p.SystemdUnits)
+ p.CGroup = fmt.Sprintf("systemd/system.slice/%s", p.SystemdUnit)
return p.cgroupPIDs()
}
@@ -365,13 +365,13 @@
if err != nil {
return nil, err
}
- tags := map[string]string{"systemd_unit": p.SystemdUnits}
+ tags := map[string]string{"systemd_unit": p.SystemdUnit}
pidTags = append(pidTags, PidsTags{pids, tags})
return pidTags, nil
}
func (p *Procstat) simpleSystemdUnitPIDs() ([]PID, error) {
- out, err := execCommand("systemctl", "show", p.SystemdUnits).Output()
+ out, err := execCommand("systemctl", "show", p.SystemdUnit).Output()
if err != nil {
return nil, err
}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/telegraf-1.29.0/plugins/inputs/procstat/procstat_test.go
new/telegraf-1.29.1/plugins/inputs/procstat/procstat_test.go
--- old/telegraf-1.29.0/plugins/inputs/procstat/procstat_test.go
2023-12-11 16:04:29.000000000 +0100
+++ new/telegraf-1.29.1/plugins/inputs/procstat/procstat_test.go
2023-12-13 17:34:29.000000000 +0100
@@ -460,10 +460,10 @@
func TestGather_systemdUnitPIDs(t *testing.T) {
p := Procstat{
- SystemdUnits: "TestGather_systemdUnitPIDs",
- PidFinder: "test",
- Log: testutil.Logger{},
- finder: newTestFinder([]PID{pid}),
+ SystemdUnit: "TestGather_systemdUnitPIDs",
+ PidFinder: "test",
+ Log: testutil.Logger{},
+ finder: newTestFinder([]PID{pid}),
}
require.NoError(t, p.Init())
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/telegraf-1.29.0/plugins/outputs/timestream/timestream.go
new/telegraf-1.29.1/plugins/outputs/timestream/timestream.go
--- old/telegraf-1.29.0/plugins/outputs/timestream/timestream.go
2023-12-11 16:04:29.000000000 +0100
+++ new/telegraf-1.29.1/plugins/outputs/timestream/timestream.go
2023-12-13 17:34:29.000000000 +0100
@@ -353,8 +353,8 @@
DatabaseName: aws.String(t.DatabaseName),
TableName: aws.String(*tableName),
RetentionProperties: &types.RetentionProperties{
- MagneticStoreRetentionPeriodInDays:
t.CreateTableMagneticStoreRetentionPeriodInDays,
- MemoryStoreRetentionPeriodInHours:
t.CreateTableMemoryStoreRetentionPeriodInHours,
+ MagneticStoreRetentionPeriodInDays:
&t.CreateTableMagneticStoreRetentionPeriodInDays,
+ MemoryStoreRetentionPeriodInHours:
&t.CreateTableMemoryStoreRetentionPeriodInHours,
},
}
tags := make([]types.Tag, 0, len(t.CreateTableTags))
++++++ vendor.tar.xz ++++++
/work/SRC/openSUSE:Factory/telegraf/vendor.tar.xz
/work/SRC/openSUSE:Factory/.telegraf.new.25432/vendor.tar.xz differ: char 27,
line 1
