From 9ee91f0f4570b372f9be4fbc43fee10b4554f52b Mon Sep 17 00:00:00 2001 From: Sven Rebhan <36194019+srebhan@users.noreply.github.com> Date: Thu, 29 Feb 2024 20:25:17 +0100 Subject: [PATCH] chore(inputs.disk)!: Remove deprecated 'mountpoints' option (#14913) --- plugins/inputs/disk/disk.go | 18 +++++------------- 1 file changed, 5 insertions(+), 13 deletions(-) diff --git a/plugins/inputs/disk/disk.go b/plugins/inputs/disk/disk.go index 616febc2f..2da391d83 100644 --- a/plugins/inputs/disk/disk.go +++ b/plugins/inputs/disk/disk.go @@ -16,15 +16,12 @@ import ( var sampleConfig string type DiskStats struct { + MountPoints []string `toml:"mount_points"` + IgnoreFS []string `toml:"ignore_fs"` + IgnoreMountOpts []string `toml:"ignore_mount_opts"` + Log telegraf.Logger `toml:"-"` + ps system.PS - - LegacyMountPoints []string `toml:"mountpoints" deprecated:"0.10.2;1.30.0;use 'mount_points' instead"` - - MountPoints []string `toml:"mount_points"` - IgnoreFS []string `toml:"ignore_fs"` - IgnoreMountOpts []string `toml:"ignore_mount_opts"` - - Log telegraf.Logger `toml:"-"` } func (*DiskStats) SampleConfig() string { @@ -32,11 +29,6 @@ func (*DiskStats) SampleConfig() string { } func (ds *DiskStats) Init() error { - // Legacy support: - if len(ds.LegacyMountPoints) != 0 { - ds.MountPoints = ds.LegacyMountPoints - } - ps := system.NewSystemPS() ps.Log = ds.Log ds.ps = ps