Repository navigation
Commit 39d28bc
committed
collector/slabinfo: index duplicate slab entries
/proc/slabinfo can list the same slab name more than once, for example one
cache per device instance. Labelling only by slab name therefore produces
duplicate label sets, causing the registry to reject the scrape.
Add an index label carrying each entry's position among entries sharing the
same slab name. This preserves one series per kernel cache and keeps each
entry's own counts and geometry.
The label name matches the existing ordinal index convention used by other
collectors. The ordinal follows /proc/slabinfo ordering and is not a stable
identity. It is assigned after filtering so excluded slabs do not consume an
index.
Fixes #3506
Signed-off-by: Kyle Mason <kyle@kylemason.org>1 parent ac83e37 commit 39d28bc
4 files changed
Lines changed: 239 additions & 56 deletions
File tree
- collector
- fixtures
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
3774 | 3774 | | |
3775 | 3775 | | |
3776 | 3776 | | |
3777 | | - | |
3778 | | - | |
3779 | | - | |
3780 | | - | |
| 3777 | + | |
| 3778 | + | |
| 3779 | + | |
| 3780 | + | |
3781 | 3781 | | |
3782 | 3782 | | |
3783 | | - | |
3784 | | - | |
3785 | | - | |
3786 | | - | |
| 3783 | + | |
| 3784 | + | |
| 3785 | + | |
| 3786 | + | |
3787 | 3787 | | |
3788 | 3788 | | |
3789 | | - | |
3790 | | - | |
3791 | | - | |
3792 | | - | |
| 3789 | + | |
| 3790 | + | |
| 3791 | + | |
| 3792 | + | |
3793 | 3793 | | |
3794 | 3794 | | |
3795 | | - | |
3796 | | - | |
3797 | | - | |
3798 | | - | |
| 3795 | + | |
| 3796 | + | |
| 3797 | + | |
| 3798 | + | |
3799 | 3799 | | |
3800 | 3800 | | |
3801 | | - | |
3802 | | - | |
3803 | | - | |
3804 | | - | |
| 3801 | + | |
| 3802 | + | |
| 3803 | + | |
| 3804 | + | |
3805 | 3805 | | |
3806 | 3806 | | |
3807 | 3807 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
3806 | 3806 | | |
3807 | 3807 | | |
3808 | 3808 | | |
3809 | | - | |
3810 | | - | |
3811 | | - | |
3812 | | - | |
| 3809 | + | |
| 3810 | + | |
| 3811 | + | |
| 3812 | + | |
3813 | 3813 | | |
3814 | 3814 | | |
3815 | | - | |
3816 | | - | |
3817 | | - | |
3818 | | - | |
| 3815 | + | |
| 3816 | + | |
| 3817 | + | |
| 3818 | + | |
3819 | 3819 | | |
3820 | 3820 | | |
3821 | | - | |
3822 | | - | |
3823 | | - | |
3824 | | - | |
| 3821 | + | |
| 3822 | + | |
| 3823 | + | |
| 3824 | + | |
3825 | 3825 | | |
3826 | 3826 | | |
3827 | | - | |
3828 | | - | |
3829 | | - | |
3830 | | - | |
| 3827 | + | |
| 3828 | + | |
| 3829 | + | |
| 3830 | + | |
3831 | 3831 | | |
3832 | 3832 | | |
3833 | | - | |
3834 | | - | |
3835 | | - | |
3836 | | - | |
| 3833 | + | |
| 3834 | + | |
| 3835 | + | |
| 3836 | + | |
3837 | 3837 | | |
3838 | 3838 | | |
3839 | 3839 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
18 | 18 | | |
19 | 19 | | |
20 | 20 | | |
| 21 | + | |
21 | 22 | | |
22 | 23 | | |
23 | 24 | | |
| |||
50 | 51 | | |
51 | 52 | | |
52 | 53 | | |
53 | | - | |
| 54 | + | |
54 | 55 | | |
55 | 56 | | |
56 | 57 | | |
| |||
61 | 62 | | |
62 | 63 | | |
63 | 64 | | |
| 65 | + | |
| 66 | + | |
| 67 | + | |
| 68 | + | |
| 69 | + | |
| 70 | + | |
| 71 | + | |
| 72 | + | |
| 73 | + | |
| 74 | + | |
| 75 | + | |
64 | 76 | | |
65 | 77 | | |
66 | 78 | | |
67 | 79 | | |
68 | | - | |
69 | | - | |
70 | | - | |
71 | | - | |
72 | | - | |
| 80 | + | |
| 81 | + | |
| 82 | + | |
| 83 | + | |
| 84 | + | |
| 85 | + | |
| 86 | + | |
73 | 87 | | |
74 | 88 | | |
75 | 89 | | |
76 | 90 | | |
77 | 91 | | |
78 | | - | |
| 92 | + | |
79 | 93 | | |
80 | 94 | | |
81 | 95 | | |
82 | 96 | | |
83 | 97 | | |
84 | 98 | | |
85 | | - | |
| 99 | + | |
86 | 100 | | |
87 | 101 | | |
88 | 102 | | |
89 | | - | |
| 103 | + | |
90 | 104 | | |
91 | 105 | | |
92 | 106 | | |
93 | 107 | | |
94 | 108 | | |
95 | 109 | | |
96 | | - | |
| 110 | + | |
97 | 111 | | |
98 | 112 | | |
99 | 113 | | |
100 | | - | |
| 114 | + | |
101 | 115 | | |
102 | 116 | | |
103 | 117 | | |
104 | 118 | | |
105 | 119 | | |
106 | 120 | | |
107 | | - | |
| 121 | + | |
108 | 122 | | |
109 | 123 | | |
110 | 124 | | |
111 | | - | |
| 125 | + | |
112 | 126 | | |
113 | 127 | | |
114 | 128 | | |
115 | 129 | | |
116 | 130 | | |
117 | 131 | | |
118 | | - | |
| 132 | + | |
119 | 133 | | |
120 | 134 | | |
121 | 135 | | |
122 | | - | |
| 136 | + | |
123 | 137 | | |
124 | 138 | | |
125 | 139 | | |
126 | 140 | | |
127 | 141 | | |
128 | 142 | | |
129 | | - | |
| 143 | + | |
130 | 144 | | |
131 | 145 | | |
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
| 1 | + | |
| 2 | + | |
| 3 | + | |
| 4 | + | |
| 5 | + | |
| 6 | + | |
| 7 | + | |
| 8 | + | |
| 9 | + | |
| 10 | + | |
| 11 | + | |
| 12 | + | |
| 13 | + | |
| 14 | + | |
| 15 | + | |
| 16 | + | |
| 17 | + | |
| 18 | + | |
| 19 | + | |
| 20 | + | |
| 21 | + | |
| 22 | + | |
| 23 | + | |
| 24 | + | |
| 25 | + | |
| 26 | + | |
| 27 | + | |
| 28 | + | |
| 29 | + | |
| 30 | + | |
| 31 | + | |
| 32 | + | |
| 33 | + | |
| 34 | + | |
| 35 | + | |
| 36 | + | |
| 37 | + | |
| 38 | + | |
| 39 | + | |
| 40 | + | |
| 41 | + | |
| 42 | + | |
| 43 | + | |
| 44 | + | |
| 45 | + | |
| 46 | + | |
| 47 | + | |
| 48 | + | |
| 49 | + | |
| 50 | + | |
| 51 | + | |
| 52 | + | |
| 53 | + | |
| 54 | + | |
| 55 | + | |
| 56 | + | |
| 57 | + | |
| 58 | + | |
| 59 | + | |
| 60 | + | |
| 61 | + | |
| 62 | + | |
| 63 | + | |
| 64 | + | |
| 65 | + | |
| 66 | + | |
| 67 | + | |
| 68 | + | |
| 69 | + | |
| 70 | + | |
| 71 | + | |
| 72 | + | |
| 73 | + | |
| 74 | + | |
| 75 | + | |
| 76 | + | |
| 77 | + | |
| 78 | + | |
| 79 | + | |
| 80 | + | |
| 81 | + | |
| 82 | + | |
| 83 | + | |
| 84 | + | |
| 85 | + | |
| 86 | + | |
| 87 | + | |
| 88 | + | |
| 89 | + | |
| 90 | + | |
| 91 | + | |
| 92 | + | |
| 93 | + | |
| 94 | + | |
| 95 | + | |
| 96 | + | |
| 97 | + | |
| 98 | + | |
| 99 | + | |
| 100 | + | |
| 101 | + | |
| 102 | + | |
| 103 | + | |
| 104 | + | |
| 105 | + | |
| 106 | + | |
| 107 | + | |
| 108 | + | |
| 109 | + | |
| 110 | + | |
| 111 | + | |
| 112 | + | |
| 113 | + | |
| 114 | + | |
| 115 | + | |
| 116 | + | |
| 117 | + | |
| 118 | + | |
| 119 | + | |
| 120 | + | |
| 121 | + | |
| 122 | + | |
| 123 | + | |
| 124 | + | |
| 125 | + | |
| 126 | + | |
| 127 | + | |
| 128 | + | |
| 129 | + | |
| 130 | + | |
| 131 | + | |
| 132 | + | |
| 133 | + | |
| 134 | + | |
| 135 | + | |
| 136 | + | |
| 137 | + | |
| 138 | + | |
| 139 | + | |
| 140 | + | |
| 141 | + | |
| 142 | + | |
| 143 | + | |
| 144 | + | |
| 145 | + | |
| 146 | + | |
| 147 | + | |
| 148 | + | |
| 149 | + | |
| 150 | + | |
| 151 | + | |
| 152 | + | |
| 153 | + | |
| 154 | + | |
| 155 | + | |
| 156 | + | |
| 157 | + | |
| 158 | + | |
| 159 | + | |
| 160 | + | |
| 161 | + | |
| 162 | + | |
| 163 | + | |
| 164 | + | |
| 165 | + | |
| 166 | + | |
| 167 | + | |
| 168 | + | |
| 169 | + | |
0 commit comments