From 0914331022d19e99ed20d8efd68bc0807a2e2c1d Mon Sep 17 00:00:00 2001 From: Antoine Toulme Date: Thu, 30 Nov 2023 20:38:49 -0800 Subject: [PATCH 1/3] Add a deprecation notice to collectd-etcd --- internal/signalfx-agent/pkg/monitors/collectd/etcd/etcd.go | 1 + 1 file changed, 1 insertion(+) diff --git a/internal/signalfx-agent/pkg/monitors/collectd/etcd/etcd.go b/internal/signalfx-agent/pkg/monitors/collectd/etcd/etcd.go index 932628fe6b..ae728ac4e6 100644 --- a/internal/signalfx-agent/pkg/monitors/collectd/etcd/etcd.go +++ b/internal/signalfx-agent/pkg/monitors/collectd/etcd/etcd.go @@ -57,6 +57,7 @@ type Monitor struct { // Configure configures and runs the plugin in collectd func (m *Monitor) Configure(conf *Config) error { + m.Logger().Warn("The ectd-collectd plugin is deprecated. It will be removed in a future release.") conf.pyConf = &python.Config{ MonitorConfig: conf.MonitorConfig, Host: conf.Host, From f10d21680e3103168d9399a26c5196ab2b19505e Mon Sep 17 00:00:00 2001 From: Antoine Toulme Date: Fri, 1 Dec 2023 10:58:05 -0800 Subject: [PATCH 2/3] Update internal/signalfx-agent/pkg/monitors/collectd/etcd/etcd.go --- internal/signalfx-agent/pkg/monitors/collectd/etcd/etcd.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/internal/signalfx-agent/pkg/monitors/collectd/etcd/etcd.go b/internal/signalfx-agent/pkg/monitors/collectd/etcd/etcd.go index ae728ac4e6..f91d07ece8 100644 --- a/internal/signalfx-agent/pkg/monitors/collectd/etcd/etcd.go +++ b/internal/signalfx-agent/pkg/monitors/collectd/etcd/etcd.go @@ -57,7 +57,7 @@ type Monitor struct { // Configure configures and runs the plugin in collectd func (m *Monitor) Configure(conf *Config) error { - m.Logger().Warn("The ectd-collectd plugin is deprecated. It will be removed in a future release.") + m.Logger().Warn("The ectd-collectd plugin is deprecated. Please use the etcd plugin instead. See https://docs.splunk.com/observability/en/gdi/monitors-databases/etcd.html for more information. This plugin will be removed in a future release.") conf.pyConf = &python.Config{ MonitorConfig: conf.MonitorConfig, Host: conf.Host, From 60b35f1af41bb9de48eba91599306572bf9f279c Mon Sep 17 00:00:00 2001 From: Antoine Toulme Date: Fri, 1 Dec 2023 13:58:16 -0800 Subject: [PATCH 3/3] Update internal/signalfx-agent/pkg/monitors/collectd/etcd/etcd.go Co-authored-by: Ryan Fitzpatrick <10867373+rmfitzpatrick@users.noreply.github.com> --- internal/signalfx-agent/pkg/monitors/collectd/etcd/etcd.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/internal/signalfx-agent/pkg/monitors/collectd/etcd/etcd.go b/internal/signalfx-agent/pkg/monitors/collectd/etcd/etcd.go index f91d07ece8..73fdb28869 100644 --- a/internal/signalfx-agent/pkg/monitors/collectd/etcd/etcd.go +++ b/internal/signalfx-agent/pkg/monitors/collectd/etcd/etcd.go @@ -57,7 +57,7 @@ type Monitor struct { // Configure configures and runs the plugin in collectd func (m *Monitor) Configure(conf *Config) error { - m.Logger().Warn("The ectd-collectd plugin is deprecated. Please use the etcd plugin instead. See https://docs.splunk.com/observability/en/gdi/monitors-databases/etcd.html for more information. This plugin will be removed in a future release.") + m.Logger().Warn("The ectd-collectd plugin is deprecated. Please use the etcd monitor instead. See https://docs.splunk.com/observability/en/gdi/monitors-databases/etcd.html for more information. This plugin will be removed in a future release.") conf.pyConf = &python.Config{ MonitorConfig: conf.MonitorConfig, Host: conf.Host,