From fc9d93a5d1fb22bb402799c07eb2490be0cf7f5b Mon Sep 17 00:00:00 2001 From: Antoine Toulme Date: Thu, 1 Aug 2024 01:25:56 -0700 Subject: [PATCH 1/2] deprecate nagios monitor --- CHANGELOG.md | 4 ++++ internal/signalfx-agent/pkg/monitors/nagios/metadata.yaml | 2 ++ internal/signalfx-agent/pkg/monitors/nagios/nagios.go | 2 ++ 3 files changed, 8 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index ec29591126..4d106417df 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,10 @@ ## Unreleased +### 🚩Deprecations 🚩 + +- (Splunk) Deprecate the nagios monitor ([#](https://github.com/signalfx/splunk-otel-collector/pull/)) + ## v0.106.0 This Splunk OpenTelemetry Collector release includes changes from the [opentelemetry-collector v0.106.0](https://github.com/open-telemetry/opentelemetry-collector/releases/tag/v0.106.0)-[v0.106.1](https://github.com/open-telemetry/opentelemetry-collector/releases/tag/v0.106.1) and the [opentelemetry-collector-contrib v0.106.0](https://github.com/open-telemetry/opentelemetry-collector-contrib/releases/tag/v0.106.0)-[v0.106.1](https://github.com/open-telemetry/opentelemetry-collector-contrib/releases/tag/v0.106.1) releases where appropriate. diff --git a/internal/signalfx-agent/pkg/monitors/nagios/metadata.yaml b/internal/signalfx-agent/pkg/monitors/nagios/metadata.yaml index 797e3d1487..83f4abe376 100644 --- a/internal/signalfx-agent/pkg/monitors/nagios/metadata.yaml +++ b/internal/signalfx-agent/pkg/monitors/nagios/metadata.yaml @@ -1,5 +1,7 @@ monitors: - doc: | + The nagios monitor is deprecated and will be removed in a future release. + Wrapper to run existing nagios status check scripts through SignalFx agent which will play the role of NRPE or SNMP exec. diff --git a/internal/signalfx-agent/pkg/monitors/nagios/nagios.go b/internal/signalfx-agent/pkg/monitors/nagios/nagios.go index e88b22021b..670c326201 100644 --- a/internal/signalfx-agent/pkg/monitors/nagios/nagios.go +++ b/internal/signalfx-agent/pkg/monitors/nagios/nagios.go @@ -68,6 +68,8 @@ var ( // Configure and kick off internal metric collection func (m *Monitor) Configure(conf *Config) error { m.logger = logrus.WithFields(logrus.Fields{"monitorType": monitorType, "monitorID": conf.MonitorID}) + m.logger.Warn("[NOTICE] The nagios monitor is deprecated and will be removed in a future release.") + // Define global dimensions used for both datapoint and event dimensions := map[string]string{ "plugin": "nagios", From 7357d4489bf54e5afd041f622f1c6fe69fef0022 Mon Sep 17 00:00:00 2001 From: Antoine Toulme Date: Wed, 7 Aug 2024 17:26:09 -0700 Subject: [PATCH 2/2] Update CHANGELOG.md --- CHANGELOG.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 4d106417df..a824a4552d 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -4,7 +4,7 @@ ### 🚩Deprecations 🚩 -- (Splunk) Deprecate the nagios monitor ([#](https://github.com/signalfx/splunk-otel-collector/pull/)) +- (Splunk) Deprecate the nagios monitor ([#5172](https://github.com/signalfx/splunk-otel-collector/pull/5172)) ## v0.106.0