Skip to content

Comments

Rename filesystem collector flags to match netdev and systemd collectors#2012

Merged
roidelapluie merged 1 commit intoprometheus:masterfrom
fhemberger:filesystem-flag
Mar 26, 2021
Merged

Rename filesystem collector flags to match netdev and systemd collectors#2012
roidelapluie merged 1 commit intoprometheus:masterfrom
fhemberger:filesystem-flag

Conversation

@fhemberger
Copy link
Contributor

@fhemberger fhemberger commented Mar 23, 2021

PR #1743 changed filter flag names to collector.netdev.device-exclude and collector.systemd.unit-exclude. To follow this naming scheme, collector.filesystem.ignored-mount-points and collector.filesystem.ignored-fs-typesshould be renamed as well and the old flags deprecated for 2.0.

Fixes: #1994

FYI: I couldn't run make and make test because of some linting issues in other modules I didn't want to touch:

GO111MODULE=on /Users/frederic/go/bin/golangci-lint run  ./...
collector/diskstats_common.go:54:2: `ioTimeSecondsDesc` is unused (deadcode)
        ioTimeSecondsDesc = prometheus.NewDesc(
        ^
collector/helper.go:23:6: `readUintFromFile` is unused (deadcode)
func readUintFromFile(path string) (uint64, error) {
     ^
collector/paths.go:39:6: `rootfsFilePath` is unused (deadcode)
func rootfsFilePath(name string) string {
     ^
collector/sysctl_bsd.go:52:2: `valueType` is unused (structcheck)
        valueType prometheus.ValueType
        ^
collector/filesystem_common.go:66:30: field `options` is unused (unused)
make: *** [common-lint] Error 1

Took the required code changes right from PR #1743.

@fhemberger
Copy link
Contributor Author

fhemberger commented Mar 24, 2021

No idea why the Docker test fails, there are no logs during the CI run. Maybe @SuperQ can help?

@SuperQ
Copy link
Member

SuperQ commented Mar 24, 2021

@roidelapluie Do we need to do something similar to #2000?

@roidelapluie
Copy link
Member

roidelapluie commented Mar 24, 2021

@roidelapluie Do we need to do something similar to #2000?

Yes I think so. The old flags should also not have defaults and be hidden.

@fhemberger
Copy link
Contributor Author

fhemberger commented Mar 24, 2021

@roidelapluie Thanks, will look into it!

@fhemberger
Rename collector.filesystem flags to match other collectors
3912462 
Ref: prometheus#1743
Fixes: prometheus#1994

Signed-off-by: Frederic Hemberger <mail@frederic-hemberger.de>
@fhemberger
Copy link
Contributor Author

fhemberger commented Mar 24, 2021

@SuperQ @roidelapluie Yay, tests are passing, thanks for your help! 🎉

SuperQ
SuperQ approved these changes Mar 26, 2021
View reviewed changes
Copy link
Member

@SuperQ SuperQ left a comment

Choose a reason for hiding this comment

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

LGTM, thanks a ton.

roidelapluie
roidelapluie approved these changes Mar 26, 2021
View reviewed changes
Copy link
Member

@roidelapluie roidelapluie left a comment

Choose a reason for hiding this comment

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

Thanks!

@roidelapluie roidelapluie merged commit 7717702 into prometheus:master Mar 26, 2021
@fhemberger fhemberger deleted the filesystem-flag branch March 26, 2021 21:21
SuperQ added a commit that referenced this pull request Jul 12, 2021
@SuperQ
Release 1.2.0
1adc131 
NOTE: Ignoring invalid network speed will be the default in 2.x
NOTE: Filesystem collector flags have been renamed. `--collector.filesystem.ignored-mount-points` is now `--collector.filesystem.mount-points-exclude` and `--collector.filesystem.ignored-fs-types` is now `--collector.filesystem.fs-types-exclude`. The old flags will be removed in 2.x.

* [CHANGE] Rename filesystem collector flags to match other collectors #2012
* [CHANGE] Make node_exporter print usage to STDOUT #2039
* [FEATURE] Add conntrack statistics metrics #1155
* [FEATURE] Add ethtool stats collector #1832
* [FEATURE] Add flag to ignore network speed if it is unknown #1989
* [FEATURE] Add tapestats collector for Linux #2044
* [ENHANCEMENT] Add ErrorLog plumbing to promhttp #1887
* [ENHANCEMENT] Add time zone offset metric #2060
* [BUGFIX] Add ErrorLog plumbing to promhttp #1887
* [BUGFIX] Handle errors from disabled PSI subsystem #1983
* [BUGFIX] Fix panic when using backwards compatible flags #2000
* [BUGFIX] Only initiate collectors once #2048
* [BUGFIX] Handle small backwards jumps in CPU idle #2067

Signed-off-by: Ben Kochie <superq@gmail.com>
@SuperQ SuperQ mentioned this pull request Jul 12, 2021
Merged
SuperQ added a commit that referenced this pull request Jul 15, 2021
@SuperQ
Release 1.2.0
138d4a2 
NOTE: Ignoring invalid network speed will be the default in 2.x
NOTE: Filesystem collector flags have been renamed. `--collector.filesystem.ignored-mount-points` is now `--collector.filesystem.mount-points-exclude` and `--collector.filesystem.ignored-fs-types` is now `--collector.filesystem.fs-types-exclude`. The old flags will be removed in 2.x.

* [CHANGE] Rename filesystem collector flags to match other collectors #2012
* [CHANGE] Make node_exporter print usage to STDOUT #2039
* [FEATURE] Add conntrack statistics metrics #1155
* [FEATURE] Add ethtool stats collector #1832
* [FEATURE] Add flag to ignore network speed if it is unknown #1989
* [FEATURE] Add tapestats collector for Linux #2044
* [FEATURE] Add nvme collector #2062
* [ENHANCEMENT] Add ErrorLog plumbing to promhttp #1887
* [ENHANCEMENT] Add more Infiniband counters #2019
* [ENHANCEMENT] netclass: retrieve interface names and filter before parsing #2033
* [ENHANCEMENT] Add time zone offset metric #2060
* [BUGFIX] Handle errors from disabled PSI subsystem #1983
* [BUGFIX] Fix panic when using backwards compatible flags #2000
* [BUGFIX] Fix wrong value for OpenBSD memory buffer cache #2015
* [BUGFIX] Only initiate collectors once #2048
* [BUGFIX] Handle small backwards jumps in CPU idle #2067

Signed-off-by: Ben Kochie <superq@gmail.com>
oblitorum pushed a commit to shatteredsilicon/node_exporter that referenced this pull request Apr 9, 2024
@SuperQ @oblitorum
Release 1.2.0
1b4b63f 
NOTE: Ignoring invalid network speed will be the default in 2.x
NOTE: Filesystem collector flags have been renamed. `--collector.filesystem.ignored-mount-points` is now `--collector.filesystem.mount-points-exclude` and `--collector.filesystem.ignored-fs-types` is now `--collector.filesystem.fs-types-exclude`. The old flags will be removed in 2.x.

* [CHANGE] Rename filesystem collector flags to match other collectors prometheus#2012
* [CHANGE] Make node_exporter print usage to STDOUT prometheus#2039
* [FEATURE] Add conntrack statistics metrics prometheus#1155
* [FEATURE] Add ethtool stats collector prometheus#1832
* [FEATURE] Add flag to ignore network speed if it is unknown prometheus#1989
* [FEATURE] Add tapestats collector for Linux prometheus#2044
* [FEATURE] Add nvme collector prometheus#2062
* [ENHANCEMENT] Add ErrorLog plumbing to promhttp prometheus#1887
* [ENHANCEMENT] Add more Infiniband counters prometheus#2019
* [ENHANCEMENT] netclass: retrieve interface names and filter before parsing prometheus#2033
* [ENHANCEMENT] Add time zone offset metric prometheus#2060
* [BUGFIX] Handle errors from disabled PSI subsystem prometheus#1983
* [BUGFIX] Fix panic when using backwards compatible flags prometheus#2000
* [BUGFIX] Fix wrong value for OpenBSD memory buffer cache prometheus#2015
* [BUGFIX] Only initiate collectors once prometheus#2048
* [BUGFIX] Handle small backwards jumps in CPU idle prometheus#2067

Signed-off-by: Ben Kochie <superq@gmail.com>
oblitorum pushed a commit to shatteredsilicon/node_exporter that referenced this pull request Apr 9, 2024
@SuperQ @oblitorum
Release 1.2.0
675dfc6 
NOTE: Ignoring invalid network speed will be the default in 2.x
NOTE: Filesystem collector flags have been renamed. `--collector.filesystem.ignored-mount-points` is now `--collector.filesystem.mount-points-exclude` and `--collector.filesystem.ignored-fs-types` is now `--collector.filesystem.fs-types-exclude`. The old flags will be removed in 2.x.

* [CHANGE] Rename filesystem collector flags to match other collectors prometheus#2012
* [CHANGE] Make node_exporter print usage to STDOUT prometheus#2039
* [FEATURE] Add conntrack statistics metrics prometheus#1155
* [FEATURE] Add ethtool stats collector prometheus#1832
* [FEATURE] Add flag to ignore network speed if it is unknown prometheus#1989
* [FEATURE] Add tapestats collector for Linux prometheus#2044
* [FEATURE] Add nvme collector prometheus#2062
* [ENHANCEMENT] Add ErrorLog plumbing to promhttp prometheus#1887
* [ENHANCEMENT] Add more Infiniband counters prometheus#2019
* [ENHANCEMENT] netclass: retrieve interface names and filter before parsing prometheus#2033
* [ENHANCEMENT] Add time zone offset metric prometheus#2060
* [BUGFIX] Handle errors from disabled PSI subsystem prometheus#1983
* [BUGFIX] Fix panic when using backwards compatible flags prometheus#2000
* [BUGFIX] Fix wrong value for OpenBSD memory buffer cache prometheus#2015
* [BUGFIX] Only initiate collectors once prometheus#2048
* [BUGFIX] Handle small backwards jumps in CPU idle prometheus#2067

Signed-off-by: Ben Kochie <superq@gmail.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@roidelapluie roidelapluie roidelapluie approved these changes

@SuperQ SuperQ SuperQ approved these changes

@discordianfish discordianfish Awaiting requested review from discordianfish

Assignees

No one assigned

Labels

None yet

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

Feature request: Rename flag collector.filesystem.ignored-mount-points to match other collectors

3 participants

@fhemberger @SuperQ @roidelapluie