Kiu/Node_Exporter
Kiu/Node_Exporter
1
0
Fork 0
mirror of https://github.com/prometheus/node_exporter.git synced 2025-01-20 07:19:01 +01:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

collector/diskstats: don't fail if there are extra stats, just ignore… (#1125)

Browse Source 
* collector/diskstats: don't fail if there are extra stats, just ignore them

Signed-off-by: Paul Gier <pgier@redhat.com>
This commit is contained in:
Paul Gier 2018-10-30 12:45:00 -05:00 committed by Ben Kochie
parent 9bd4416822
commit 38163f234f
3 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
collector/diskstats_linux.go
View File

@ -182,7 +182,7 @@ func NewDiskstatsCollector() (Collector, error) {
{ {
desc: prometheus.NewDesc( desc: prometheus.NewDesc(
prometheus.BuildFQName(namespace, diskSubsystem, "discarded_sectors_total"), prometheus.BuildFQName(namespace, diskSubsystem, "discarded_sectors_total"),
"The total number of sectors discard successfully.", "The total number of sectors discarded successfully.",
diskLabelNames, diskLabelNames,
nil, nil,
), valueType: prometheus.CounterValue, ), valueType: prometheus.CounterValue,
@ -212,11 +212,11 @@ func (c *diskstatsCollector) Update(ch chan<- prometheus.Metric) error {
continue continue
} }
if len(stats) > len(c.descs) {
return fmt.Errorf("invalid line for %s for %s", procFilePath(diskstatsFilename), dev)
}
for i, value := range stats { for i, value := range stats {
// ignore unrecognized additional stats
if i >= len(c.descs) {
break
}
v, err := strconv.ParseFloat(value, 64) v, err := strconv.ParseFloat(value, 64)
if err != nil { if err != nil {
return fmt.Errorf("invalid value %s in diskstats: %s", value, err) return fmt.Errorf("invalid value %s in diskstats: %s", value, err)

2
collector/fixtures/e2e-64k-page-output.txt
View File

@ -293,7 +293,7 @@ node_cpu_seconds_total{cpu="7",mode="user"} 290.98
# HELP node_disk_discard_time_seconds_total This is the total number of seconds spent by all discards. # HELP node_disk_discard_time_seconds_total This is the total number of seconds spent by all discards.
# TYPE node_disk_discard_time_seconds_total counter # TYPE node_disk_discard_time_seconds_total counter
node_disk_discard_time_seconds_total{device="sdb"} 11.13 node_disk_discard_time_seconds_total{device="sdb"} 11.13
# HELP node_disk_discarded_sectors_total The total number of sectors discard successfully. # HELP node_disk_discarded_sectors_total The total number of sectors discarded successfully.
# TYPE node_disk_discarded_sectors_total counter # TYPE node_disk_discarded_sectors_total counter
node_disk_discarded_sectors_total{device="sdb"} 1.925173784e+09 node_disk_discarded_sectors_total{device="sdb"} 1.925173784e+09
# HELP node_disk_discards_completed_total The total number of discards completed successfully. # HELP node_disk_discards_completed_total The total number of discards completed successfully.

2
collector/fixtures/e2e-output.txt
View File

@ -293,7 +293,7 @@ node_cpu_seconds_total{cpu="7",mode="user"} 290.98
# HELP node_disk_discard_time_seconds_total This is the total number of seconds spent by all discards. # HELP node_disk_discard_time_seconds_total This is the total number of seconds spent by all discards.
# TYPE node_disk_discard_time_seconds_total counter # TYPE node_disk_discard_time_seconds_total counter
node_disk_discard_time_seconds_total{device="sdb"} 11.13 node_disk_discard_time_seconds_total{device="sdb"} 11.13
# HELP node_disk_discarded_sectors_total The total number of sectors discard successfully. # HELP node_disk_discarded_sectors_total The total number of sectors discarded successfully.
# TYPE node_disk_discarded_sectors_total counter # TYPE node_disk_discarded_sectors_total counter
node_disk_discarded_sectors_total{device="sdb"} 1.925173784e+09 node_disk_discarded_sectors_total{device="sdb"} 1.925173784e+09
# HELP node_disk_discards_completed_total The total number of discards completed successfully. # HELP node_disk_discards_completed_total The total number of discards completed successfully.