mudhorn/node_exporter
1
0
Fork 0
mirror of https://github.com/prometheus/node_exporter.git synced 2025-03-05 21:00:12 -08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Rename fields

Browse source
This commit is contained in:
Marc Tuduri 2023-09-27 17:29:41 +02:00
parent fbff3bb21a
commit d59d6568c6
No known key found for this signature in database
GPG key ID: 761973D5AE312AF4
3 changed files with 22 additions and 22 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

28
collector/diskstats_common.go
View file

@ -78,35 +78,35 @@ var (
) )
type DiskstatsDeviceFilterConfig struct { type DiskstatsDeviceFilterConfig struct {
DiskstatsDeviceExclude *string DeviceExclude *string
DiskstatsDeviceExcludeSet bool DeviceExcludeSet bool
OldDiskstatsDeviceExclude *string OldDeviceExclude *string
DiskstatsDeviceInclude *string DeviceInclude *string
} }
func newDiskstatsDeviceFilter(config DiskstatsDeviceFilterConfig, logger log.Logger) (deviceFilter, error) { func newDiskstatsDeviceFilter(config DiskstatsDeviceFilterConfig, logger log.Logger) (deviceFilter, error) {
if *config.OldDiskstatsDeviceExclude != "" { if *config.OldDeviceExclude != "" {
if !config.DiskstatsDeviceExcludeSet { if !config.DeviceExcludeSet {
level.Warn(logger).Log("msg", "--collector.diskstats.ignored-devices is DEPRECATED and will be removed in 2.0.0, use --collector.diskstats.device-exclude") level.Warn(logger).Log("msg", "--collector.diskstats.ignored-devices is DEPRECATED and will be removed in 2.0.0, use --collector.diskstats.device-exclude")
*config.DiskstatsDeviceExclude = *config.OldDiskstatsDeviceExclude *config.DeviceExclude = *config.OldDeviceExclude
} else { } else {
return deviceFilter{}, errors.New("--collector.diskstats.ignored-devices and --collector.diskstats.device-exclude are mutually exclusive") return deviceFilter{}, errors.New("--collector.diskstats.ignored-devices and --collector.diskstats.device-exclude are mutually exclusive")
} }
} }
if *config.DiskstatsDeviceExclude != "" && *config.DiskstatsDeviceInclude != "" { if *config.DeviceExclude != "" && *config.DeviceInclude != "" {
return deviceFilter{}, errors.New("device-exclude & device-include are mutually exclusive") return deviceFilter{}, errors.New("device-exclude & device-include are mutually exclusive")
} }
if *config.DiskstatsDeviceExclude != "" { if *config.DeviceExclude != "" {
level.Info(logger).Log("msg", "Parsed flag --collector.diskstats.device-exclude", "flag", *config.DiskstatsDeviceExclude) level.Info(logger).Log("msg", "Parsed flag --collector.diskstats.device-exclude", "flag", *config.DeviceExclude)
} else { } else {
*config.DiskstatsDeviceExclude = diskstatsDefaultIgnoredDevices *config.DeviceExclude = diskstatsDefaultIgnoredDevices
} }
if *config.DiskstatsDeviceInclude != "" { if *config.DeviceInclude != "" {
level.Info(logger).Log("msg", "Parsed Flag --collector.diskstats.device-include", "flag", *config.DiskstatsDeviceInclude) level.Info(logger).Log("msg", "Parsed Flag --collector.diskstats.device-include", "flag", *config.DeviceInclude)
} }
return newDeviceFilter(*config.DiskstatsDeviceExclude, *config.DiskstatsDeviceInclude), nil return newDeviceFilter(*config.DeviceExclude, *config.DeviceInclude), nil
} }

8
collector/diskstats_linux_test.go
View file

@ -52,9 +52,9 @@ func NewTestDiskStatsCollector(config NodeCollectorConfig, logger log.Logger) (p
func TestDiskStats(t *testing.T) { func TestDiskStats(t *testing.T) {
config := NodeCollectorConfig{ config := NodeCollectorConfig{
DiskstatsDeviceFilter: DiskstatsDeviceFilterConfig{ DiskstatsDeviceFilter: DiskstatsDeviceFilterConfig{
DiskstatsDeviceExclude: new(string), DeviceExclude: new(string),
DiskstatsDeviceInclude: new(string), DeviceInclude: new(string),
OldDiskstatsDeviceExclude: new(string), OldDeviceExclude: new(string),
}, },
} }
sysPath := "fixtures/sys" sysPath := "fixtures/sys"
@ -67,7 +67,7 @@ func TestDiskStats(t *testing.T) {
config.Path.UdevDataPath = &udevDataPath config.Path.UdevDataPath = &udevDataPath
diskstatsDeviceExclude := "^(ram|loop|fd|(h|s|v|xv)d[a-z]|nvme\\d+n\\d+p)\\d+$" diskstatsDeviceExclude := "^(ram|loop|fd|(h|s|v|xv)d[a-z]|nvme\\d+n\\d+p)\\d+$"
config.DiskstatsDeviceFilter.DiskstatsDeviceExclude = &diskstatsDeviceExclude config.DiskstatsDeviceFilter.DeviceExclude = &diskstatsDeviceExclude
testcase := `# HELP node_disk_ata_rotation_rate_rpm ATA disk rotation rate in RPMs (0 for SSDs). testcase := `# HELP node_disk_ata_rotation_rate_rpm ATA disk rotation rate in RPMs (0 for SSDs).
# TYPE node_disk_ata_rotation_rate_rpm gauge # TYPE node_disk_ata_rotation_rate_rpm gauge
node_disk_ata_rotation_rate_rpm{device="sda"} 7200 node_disk_ata_rotation_rate_rpm{device="sda"} 7200

8
kingpinconfig/flags.go
View file

@ -33,18 +33,18 @@ func AddFlags(a *kingpin.Application) collector.NodeCollectorConfig {
config.CPU.FlagsInclude = a.Flag("collector.cpu.info.flags-include", "Filter the `flags` field in cpuInfo with a value that must be a regular expression").String() config.CPU.FlagsInclude = a.Flag("collector.cpu.info.flags-include", "Filter the `flags` field in cpuInfo with a value that must be a regular expression").String()
config.CPU.BugsInclude = a.Flag("collector.cpu.info.bugs-include", "Filter the `bugs` field in cpuInfo with a value that must be a regular expression").String() config.CPU.BugsInclude = a.Flag("collector.cpu.info.bugs-include", "Filter the `bugs` field in cpuInfo with a value that must be a regular expression").String()
config.DiskstatsDeviceFilter.DiskstatsDeviceExclude = a.Flag( config.DiskstatsDeviceFilter.DeviceExclude = a.Flag(
"collector.diskstats.device-exclude", "collector.diskstats.device-exclude",
"Regexp of diskstats devices to exclude (mutually exclusive to device-include).", "Regexp of diskstats devices to exclude (mutually exclusive to device-include).",
).PreAction(func(c *kingpin.ParseContext) error { ).PreAction(func(c *kingpin.ParseContext) error {
config.DiskstatsDeviceFilter.DiskstatsDeviceExcludeSet = true config.DiskstatsDeviceFilter.DeviceExcludeSet = true
return nil return nil
}).String() }).String()
config.DiskstatsDeviceFilter.OldDiskstatsDeviceExclude = a.Flag( config.DiskstatsDeviceFilter.OldDeviceExclude = a.Flag(
"collector.diskstats.ignored-devices", "collector.diskstats.ignored-devices",
"DEPRECATED: Use collector.diskstats.device-exclude", "DEPRECATED: Use collector.diskstats.device-exclude",
).Hidden().String() ).Hidden().String()
config.DiskstatsDeviceFilter.DiskstatsDeviceInclude = a.Flag("collector.diskstats.device-include", "Regexp of diskstats devices to include (mutually exclusive to device-exclude).").String() config.DiskstatsDeviceFilter.DeviceInclude = a.Flag("collector.diskstats.device-include", "Regexp of diskstats devices to include (mutually exclusive to device-exclude).").String()
config.Ethtool.DeviceInclude = a.Flag("collector.ethtool.device-include", "Regexp of ethtool devices to include (mutually exclusive to device-exclude).").String() config.Ethtool.DeviceInclude = a.Flag("collector.ethtool.device-include", "Regexp of ethtool devices to include (mutually exclusive to device-exclude).").String()
config.Ethtool.DeviceExclude = a.Flag("collector.ethtool.device-exclude", "Regexp of ethtool devices to exclude (mutually exclusive to device-include).").String() config.Ethtool.DeviceExclude = a.Flag("collector.ethtool.device-exclude", "Regexp of ethtool devices to exclude (mutually exclusive to device-include).").String()