mudhorn/node_exporter
1
0
Fork 0
mirror of https://github.com/prometheus/node_exporter.git synced 2024-12-26 22:19:44 -08:00
Code Issues Actions Packages Projects Releases Wiki Activity

fix issue where rootfs path strips to the empty string (#1464)

Browse source 
Change-type: patch
Connects-to: #1463
Signed-off-by: dt-rush <nickp@balena.io>
This commit is contained in:
dt-rush 2019-09-09 11:39:25 -04:00 committed by Ben Kochie
parent ab8cf1f718
commit 93fbb93a46
4 changed files with 8 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
CHANGELOG.md
View file

@ -25,6 +25,7 @@
* [BUGFIX] Fix netdev nil reference on Darwin #1414 * [BUGFIX] Fix netdev nil reference on Darwin #1414
* [BUGFIX] Strip path.rootfs from mountpoint labels #1421 * [BUGFIX] Strip path.rootfs from mountpoint labels #1421
* [FEATURE] Add new thermal_zone collector #1425 * [FEATURE] Add new thermal_zone collector #1425
* [BUGFIX] Fix empty string in path.rootfs #1464
## 0.18.1 / 2019-06-04 ## 0.18.1 / 2019-06-04

1
collector/filesystem_linux_test.go
View file

@ -120,6 +120,7 @@ func TestPathRootfs(t *testing.T) {
expected := map[string]string{ expected := map[string]string{
// should modify these mountpoints (removes /host, see fixture proc file) // should modify these mountpoints (removes /host, see fixture proc file)
"/": "",
"/media/volume1": "", "/media/volume1": "",
"/media/volume2": "", "/media/volume2": "",
// should not modify these mountpoints // should not modify these mountpoints

1
collector/fixtures_bindmount/proc/mounts
View file

@ -1,3 +1,4 @@
/dev/nvme1n0 /host ext4 rw,seclabel,relatime,data=ordered 0 0
/dev/nvme1n1 /host/media/volume1 ext4 rw,seclabel,relatime,data=ordered 0 0 /dev/nvme1n1 /host/media/volume1 ext4 rw,seclabel,relatime,data=ordered 0 0
/dev/nvme1n2 /host/media/volume2 ext4 rw,seclabel,relatime,data=ordered 0 0 /dev/nvme1n2 /host/media/volume2 ext4 rw,seclabel,relatime,data=ordered 0 0
tmpfs /dev/shm tmpfs rw,nosuid,nodev 0 0 tmpfs /dev/shm tmpfs rw,nosuid,nodev 0 0

6
collector/paths.go
View file

@ -44,5 +44,9 @@ func rootfsStripPrefix(path string) string {
if *rootfsPath == "/" { if *rootfsPath == "/" {
return path return path
} }
return strings.TrimPrefix(path, *rootfsPath) stripped := strings.TrimPrefix(path, *rootfsPath)
if stripped == "" {
return "/"
}
return stripped
} }