Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

deprecate nagios monitor #5172

Merged
merged 3 commits into from
Aug 29, 2024
Merged

deprecate nagios monitor #5172

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
fc9d93a
deprecate nagios monitor
atoulme Aug 1, 2024
7357d44
Update CHANGELOG.md
atoulme Aug 8, 2024
9785042
Merge branch 'main' into deprecate_nagios
atoulme Aug 29, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,10 @@

## Unreleased

### 🚩Deprecations 🚩

- (Splunk) Deprecate the nagios monitor ([#5172](https://github.com/signalfx/splunk-otel-collector/pull/5172))

## v0.108.0

This Splunk OpenTelemetry Collector release includes changes from the [opentelemetry-collector v0.108.1](https://github.com/open-telemetry/opentelemetry-collector/releases/tag/v0.108.1) and the [opentelemetry-collector-contrib v0.108.0](https://github.com/open-telemetry/opentelemetry-collector-contrib/releases/tag/v0.108.0) releases where appropriate.
Expand Down
2 changes: 2 additions & 0 deletions internal/signalfx-agent/pkg/monitors/nagios/metadata.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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.

Expand Down
2 changes: 2 additions & 0 deletions internal/signalfx-agent/pkg/monitors/nagios/nagios.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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.")
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I believe we use [WARNING] in other places. Maybe better to be consistent if I'm not missing other places where we do [NOTICE]

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

it's already logging at WARN level and therefore will show as a warning. We use [NOTICE] for all deprecation notices so far.

https://github.com/search?q=repo%3Asignalfx%2Fsplunk-otel-collector%20%5BNOTICE%5D&type=code

You are correct that we use [WARNING], but only in the concept of config converters where we use log.Println:

https://github.com/search?q=repo%3Asignalfx%2Fsplunk-otel-collector+%5BWARNING%5D&type=code


// Define global dimensions used for both datapoint and event
dimensions := map[string]string{
"plugin": "nagios",
Expand Down
Loading