Skip to content

Commit 35bfe45

Browse files
authored
Merge pull request #1735 from prometheus/bjk/bump_procfs
Update prometheus/procfs
2 parents c8c1618 + baa7ab7 commit 35bfe45

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

51 files changed

+2699
-292
lines changed

collector/fixtures/sys.ttar

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1756,6 +1756,17 @@ Lines: 1
17561756
0
17571757
Mode: 644
17581758
# ttar - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
1759+
Path: sys/devices/pci0000:00/0000:00:0d.0/ata4/host3/target3:0:0/3:0:0:0/block/sdb/bcache/writeback_rate_debug
1760+
Lines: 7
1761+
rate: 1.1M/sec
1762+
dirty: 20.4G
1763+
target: 20.4G
1764+
proportional: 427.5k
1765+
integral: 790.0k
1766+
change: 321.5k/sec
1767+
next io: 17ms
1768+
Mode: 644
1769+
# ttar - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
17591770
Directory: sys/devices/pci0000:00/0000:00:0d.0/ata5
17601771
Mode: 755
17611772
# ttar - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -

go.mod

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,15 +20,15 @@ require (
2020
github.com/prometheus/client_golang v1.6.0
2121
github.com/prometheus/client_model v0.2.0
2222
github.com/prometheus/common v0.10.0
23-
github.com/prometheus/procfs v0.0.11
23+
github.com/prometheus/procfs v0.1.3
2424
github.com/siebenmann/go-kstat v0.0.0-20200303194639-4e8294f9e9d5
2525
github.com/soundcloud/go-runit v0.0.0-20150630195641-06ad41a06c4a
2626
go.uber.org/multierr v1.5.0 // indirect
2727
golang.org/x/crypto v0.0.0-20200510223506-06a226fb4e37
2828
golang.org/x/lint v0.0.0-20200302205851-738671d3881b // indirect
2929
golang.org/x/net v0.0.0-20200513185701-a91f0712d120 // indirect
3030
golang.org/x/sync v0.0.0-20200317015054-43a5402ce75a // indirect
31-
golang.org/x/sys v0.0.0-20200523222454-059865788121
31+
golang.org/x/sys v0.0.0-20200602225109-6fdc65e7d980
3232
golang.org/x/tools v0.0.0-20200513201620-d5fe73897c97 // indirect
3333
gopkg.in/alecthomas/kingpin.v2 v2.2.6
3434
gopkg.in/yaml.v2 v2.3.0

go.sum

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -289,6 +289,8 @@ github.com/prometheus/procfs v0.0.2/go.mod h1:TjEm7ze935MbeOT/UhFTIMYKhuLP4wbCsT
289289
github.com/prometheus/procfs v0.0.8/go.mod h1:7Qr8sr6344vo1JqZ6HhLceV9o3AJ1Ff+GxbHq6oeK9A=
290290
github.com/prometheus/procfs v0.0.11 h1:DhHlBtkHWPYi8O2y31JkK0TF+DGM+51OopZjH/Ia5qI=
291291
github.com/prometheus/procfs v0.0.11/go.mod h1:lV6e/gmhEcM9IjHGsFOCxxuZ+z1YqCvr4OA4YeYWdaU=
292+
github.com/prometheus/procfs v0.1.3 h1:F0+tqvhOksq22sc6iCHF5WGlWjdwj92p0udFh1VFBS8=
293+
github.com/prometheus/procfs v0.1.3/go.mod h1:lV6e/gmhEcM9IjHGsFOCxxuZ+z1YqCvr4OA4YeYWdaU=
292294
github.com/rcrowley/go-metrics v0.0.0-20181016184325-3113b8401b8a/go.mod h1:bCqnVzQkZxMG4s8nGwiZ5l3QUCyqpo9Y+/ZMZ9VjZe4=
293295
github.com/rogpeppe/fastuuid v0.0.0-20150106093220-6724a57986af/go.mod h1:XWv6SoW27p1b0cqNHllgS5HIMJraePCO15w5zCzIWYg=
294296
github.com/rogpeppe/go-internal v1.3.0/go.mod h1:M8bDsm7K2OlrFYOpmOWEs/qY81heoFRclV5y23lUDJ4=
@@ -432,8 +434,8 @@ golang.org/x/sys v0.0.0-20200106162015-b016eb3dc98e/go.mod h1:h1NjWce9XRLGQEsW7w
432434
golang.org/x/sys v0.0.0-20200202164722-d101bd2416d5/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
433435
golang.org/x/sys v0.0.0-20200323222414-85ca7c5b95cd/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
434436
golang.org/x/sys v0.0.0-20200420163511-1957bb5e6d1f/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
435-
golang.org/x/sys v0.0.0-20200523222454-059865788121 h1:rITEj+UZHYC927n8GT97eC3zrpzXdb/voyeOuVKS46o=
436-
golang.org/x/sys v0.0.0-20200523222454-059865788121/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
437+
golang.org/x/sys v0.0.0-20200602225109-6fdc65e7d980 h1:OjiUf46hAmXblsZdnoSXsEUSKU8r1UEzcL5RVZ4gO9Y=
438+
golang.org/x/sys v0.0.0-20200602225109-6fdc65e7d980/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
437439
golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
438440
golang.org/x/text v0.3.2 h1:tW2bmiBqwgJj/UpqtC8EpXEZVYOwU0yG4iWbprSVAcs=
439441
golang.org/x/text v0.3.2/go.mod h1:bEr9sfX3Q8Zfm5fL9x+3itogRgK3+ptLWKqgva+5dAk=

vendor/github.com/prometheus/procfs/Makefile.common

Lines changed: 11 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

vendor/github.com/prometheus/procfs/bcache/bcache.go

Lines changed: 16 additions & 4 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

vendor/github.com/prometheus/procfs/bcache/get.go

Lines changed: 109 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)