Skip to content

Commit 55e7e09

Browse files
0xack13oblitorum
0xack13
authored and
oblitorum
committed
bcache: remove cache_readaheads_totals metrics prometheus#2103 (prometheus#2583)
* bcache: remove cache_readaheads_totals metrics prometheus#2103 Signed-off-by: Saleh Sal <0xack13@gmail.com> * Append bcacheReadaheadMetrics when CacheReadaheads value exists Signed-off-by: Saleh Sal <0xack13@gmail.com> * Update test cases for cachereadahead greater than zero Signed-off-by: Saleh Sal <0xack13@gmail.com> --------- Signed-off-by: Saleh Sal <0xack13@gmail.com>
1 parent f29f7be commit 55e7e09

File tree

4 files changed

+25
-20
lines changed

4 files changed

+25
-20
lines changed

‎collector/bcache_linux.go‎

Lines changed: 13 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -134,14 +134,19 @@ func bcachePeriodStatsToMetric(ps *bcache.PeriodStats, labelValue string) []bcac
134134
extraLabel: label,
135135
extraLabelValue: labelValue,
136136
},
137-
{
138-
name: "cache_readaheads_total",
139-
desc: "Count of times readahead occurred.",
140-
value: float64(ps.CacheReadaheads),
141-
metricType: prometheus.CounterValue,
142-
extraLabel: label,
143-
extraLabelValue: labelValue,
144-
},
137+
}
138+
if ps.CacheReadaheads != 0 {
139+
bcacheReadaheadMetrics := []bcacheMetric{
140+
{
141+
name: "cache_readaheads_total",
142+
desc: "Count of times readahead occurred.",
143+
value: float64(ps.CacheReadaheads),
144+
metricType: prometheus.CounterValue,
145+
extraLabel: label,
146+
extraLabelValue: labelValue,
147+
},
148+
}
149+
metrics = append(metrics, bcacheReadaheadMetrics...)
145150
}
146151
return metrics
147152
}

‎collector/fixtures/e2e-64k-page-output.txt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -97,7 +97,7 @@ node_bcache_cache_misses_total{backing_device="bdev0",uuid="deaddd54-c735-46d5-8
9797
node_bcache_cache_read_races_total{uuid="deaddd54-c735-46d5-868e-f331c5fd7c74"} 0
9898
# HELP node_bcache_cache_readaheads_total Count of times readahead occurred.
9999
# TYPE node_bcache_cache_readaheads_total counter
100-
node_bcache_cache_readaheads_total{backing_device="bdev0",uuid="deaddd54-c735-46d5-868e-f331c5fd7c74"} 0
100+
node_bcache_cache_readaheads_total{backing_device="bdev0",uuid="deaddd54-c735-46d5-868e-f331c5fd7c74"} 13
101101
# HELP node_bcache_congested Congestion.
102102
# TYPE node_bcache_congested gauge
103103
node_bcache_congested{uuid="deaddd54-c735-46d5-868e-f331c5fd7c74"} 0

‎collector/fixtures/e2e-output.txt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -97,7 +97,7 @@ node_bcache_cache_misses_total{backing_device="bdev0",uuid="deaddd54-c735-46d5-8
9797
node_bcache_cache_read_races_total{uuid="deaddd54-c735-46d5-868e-f331c5fd7c74"} 0
9898
# HELP node_bcache_cache_readaheads_total Count of times readahead occurred.
9999
# TYPE node_bcache_cache_readaheads_total counter
100-
node_bcache_cache_readaheads_total{backing_device="bdev0",uuid="deaddd54-c735-46d5-868e-f331c5fd7c74"} 0
100+
node_bcache_cache_readaheads_total{backing_device="bdev0",uuid="deaddd54-c735-46d5-868e-f331c5fd7c74"} 13
101101
# HELP node_bcache_congested Congestion.
102102
# TYPE node_bcache_congested gauge
103103
node_bcache_congested{uuid="deaddd54-c735-46d5-868e-f331c5fd7c74"} 0

‎collector/fixtures/sys.ttar‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -141,7 +141,7 @@ Mode: 400
141141
# ttar - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
142142
Path: sys/class/dmi/id/product_version
143143
Lines: 1
144-
�[�
144+
�[�
145145
Mode: 444
146146
# ttar - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
147147
Path: sys/class/dmi/id/sys_vendor
@@ -1440,7 +1440,7 @@ Mode: 444
14401440
# ttar - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
14411441
Path: sys/class/power_supply/BAT0/model_name
14421442
Lines: 1
1443-
LNV-45N1��
1443+
LNV-45N1��
14441444
Mode: 444
14451445
# ttar - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
14461446
Directory: sys/class/power_supply/BAT0/power
@@ -2396,7 +2396,7 @@ Mode: 644
23962396
# ttar - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
23972397
Path: sys/devices/pci0000:00/0000:00:0d.0/ata4/host3/target3:0:0/3:0:0:0/block/sdb/bcache/stats_day/cache_readaheads
23982398
Lines: 1
2399-
0
2399+
13
24002400
Mode: 644
24012401
# ttar - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
24022402
Directory: sys/devices/pci0000:00/0000:00:0d.0/ata4/host3/target3:0:0/3:0:0:0/block/sdb/bcache/stats_five_minute
@@ -2439,7 +2439,7 @@ Mode: 644
24392439
# ttar - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
24402440
Path: sys/devices/pci0000:00/0000:00:0d.0/ata4/host3/target3:0:0/3:0:0:0/block/sdb/bcache/stats_five_minute/cache_readaheads
24412441
Lines: 1
2442-
0
2442+
13
24432443
Mode: 644
24442444
# ttar - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
24452445
Directory: sys/devices/pci0000:00/0000:00:0d.0/ata4/host3/target3:0:0/3:0:0:0/block/sdb/bcache/stats_hour
@@ -2482,7 +2482,7 @@ Mode: 644
24822482
# ttar - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
24832483
Path: sys/devices/pci0000:00/0000:00:0d.0/ata4/host3/target3:0:0/3:0:0:0/block/sdb/bcache/stats_hour/cache_readaheads
24842484
Lines: 1
2485-
0
2485+
13
24862486
Mode: 644
24872487
# ttar - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
24882488
Directory: sys/devices/pci0000:00/0000:00:0d.0/ata4/host3/target3:0:0/3:0:0:0/block/sdb/bcache/stats_total
@@ -2525,7 +2525,7 @@ Mode: 644
25252525
# ttar - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
25262526
Path: sys/devices/pci0000:00/0000:00:0d.0/ata4/host3/target3:0:0/3:0:0:0/block/sdb/bcache/stats_total/cache_readaheads
25272527
Lines: 1
2528-
0
2528+
13
25292529
Mode: 644
25302530
# ttar - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
25312531
Path: sys/devices/pci0000:00/0000:00:0d.0/ata4/host3/target3:0:0/3:0:0:0/block/sdb/bcache/writeback_rate_debug
@@ -3900,7 +3900,7 @@ Mode: 644
39003900
# ttar - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
39013901
Path: sys/fs/bcache/deaddd54-c735-46d5-868e-f331c5fd7c74/stats_day/cache_readaheads
39023902
Lines: 1
3903-
0
3903+
13
39043904
Mode: 644
39053905
# ttar - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
39063906
Directory: sys/fs/bcache/deaddd54-c735-46d5-868e-f331c5fd7c74/stats_five_minute
@@ -3943,7 +3943,7 @@ Mode: 644
39433943
# ttar - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
39443944
Path: sys/fs/bcache/deaddd54-c735-46d5-868e-f331c5fd7c74/stats_five_minute/cache_readaheads
39453945
Lines: 1
3946-
0
3946+
13
39473947
Mode: 644
39483948
# ttar - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
39493949
Directory: sys/fs/bcache/deaddd54-c735-46d5-868e-f331c5fd7c74/stats_hour
@@ -3986,7 +3986,7 @@ Mode: 644
39863986
# ttar - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
39873987
Path: sys/fs/bcache/deaddd54-c735-46d5-868e-f331c5fd7c74/stats_hour/cache_readaheads
39883988
Lines: 1
3989-
0
3989+
13
39903990
Mode: 644
39913991
# ttar - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
39923992
Directory: sys/fs/bcache/deaddd54-c735-46d5-868e-f331c5fd7c74/stats_total
@@ -4029,7 +4029,7 @@ Mode: 644
40294029
# ttar - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
40304030
Path: sys/fs/bcache/deaddd54-c735-46d5-868e-f331c5fd7c74/stats_total/cache_readaheads
40314031
Lines: 1
4032-
0
4032+
13
40334033
Mode: 644
40344034
# ttar - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
40354035
Path: sys/fs/bcache/deaddd54-c735-46d5-868e-f331c5fd7c74/tree_depth

0 commit comments

Comments
 (0)