Skip to content

Commit 430ae66

Browse files
harshavardhanaharshavardhana
authored
update disk -> drive change in prometheus metrics in minio master (#2999)
refer to minio/minio#17854
1 parent 3abbbc8 commit 430ae66

File tree

4 files changed

+48
-48
lines changed

4 files changed

+48
-48
lines changed

‎.github/workflows/cross-compile.yaml‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ jobs:
2626
runs-on: ${{ matrix.os }}
2727
strategy:
2828
matrix:
29-
go-version: [ 1.19.x, 1.20.x ]
29+
go-version: [ 1.21.x ]
3030
os: [ ubuntu-latest ]
3131
steps:
3232
- name: Check out code
@@ -56,7 +56,7 @@ jobs:
5656
runs-on: ${{ matrix.os }}
5757
strategy:
5858
matrix:
59-
go-version: [ 1.20.x ]
59+
go-version: [ 1.21.x ]
6060
os: [ ubuntu-latest ]
6161
steps:
6262
- name: Check out code
@@ -85,7 +85,7 @@ jobs:
8585
runs-on: ${{ matrix.os }}
8686
strategy:
8787
matrix:
88-
go-version: [ 1.20.x ]
88+
go-version: [ 1.21.x ]
8989
os: [ ubuntu-latest ]
9090
steps:
9191
- name: Check out code
@@ -115,7 +115,7 @@ jobs:
115115
runs-on: ${{ matrix.os }}
116116
strategy:
117117
matrix:
118-
go-version: [ 1.20.x ]
118+
go-version: [ 1.21.x ]
119119
os: [ ubuntu-latest ]
120120
steps:
121121
- name: Check out code
@@ -145,7 +145,7 @@ jobs:
145145
runs-on: ${{ matrix.os }}
146146
strategy:
147147
matrix:
148-
go-version: [ 1.20.x ]
148+
go-version: [ 1.21.x ]
149149
os: [ ubuntu-latest ]
150150
steps:
151151
- name: Check out code

‎.github/workflows/jobs.yaml‎

Lines changed: 24 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ jobs:
2222
runs-on: [ubuntu-latest]
2323
strategy:
2424
matrix:
25-
go-version: [1.20.x]
25+
go-version: [1.21.x]
2626
os: [ubuntu-latest]
2727
steps:
2828
- name: Check out code
@@ -65,7 +65,7 @@ jobs:
6565
runs-on: ubuntu-latest
6666
strategy:
6767
matrix:
68-
go-version: [1.20.x]
68+
go-version: [1.21.x]
6969
os: [ubuntu-latest]
7070
steps:
7171
- name: Check out code
@@ -110,7 +110,7 @@ jobs:
110110
runs-on: ubuntu-latest
111111
strategy:
112112
matrix:
113-
go-version: [1.20.x]
113+
go-version: [1.21.x]
114114
os: [ubuntu-latest]
115115
steps:
116116
- name: Check out code
@@ -133,7 +133,7 @@ jobs:
133133
runs-on: [ubuntu-latest]
134134
strategy:
135135
matrix:
136-
go-version: [1.20.x]
136+
go-version: [1.21.x]
137137
steps:
138138
# To build minio image, we need to clone the repository first
139139
- name: Clone github.com/minio/minio
@@ -168,7 +168,7 @@ jobs:
168168
runs-on: ${{ matrix.os }}
169169
strategy:
170170
matrix:
171-
go-version: [1.20.x]
171+
go-version: [1.21.x]
172172
os: [ubuntu-latest]
173173
steps:
174174
- name: Check out code
@@ -208,7 +208,7 @@ jobs:
208208
timeout-minutes: 10
209209
strategy:
210210
matrix:
211-
go-version: [1.20.x]
211+
go-version: [1.21.x]
212212
os: [ubuntu-latest]
213213
steps:
214214
- name: Check out code
@@ -256,7 +256,7 @@ jobs:
256256
timeout-minutes: 10
257257
strategy:
258258
matrix:
259-
go-version: [1.20.x]
259+
go-version: [1.21.x]
260260
os: [ubuntu-latest]
261261
steps:
262262
- name: Check out code
@@ -303,7 +303,7 @@ jobs:
303303
timeout-minutes: 10
304304
strategy:
305305
matrix:
306-
go-version: [1.20.x]
306+
go-version: [1.21.x]
307307
os: [ubuntu-latest]
308308
steps:
309309
- name: Check out code
@@ -350,7 +350,7 @@ jobs:
350350
timeout-minutes: 15
351351
strategy:
352352
matrix:
353-
go-version: [1.20.x]
353+
go-version: [1.21.x]
354354
os: [ubuntu-latest]
355355
steps:
356356
- name: Check out code
@@ -393,7 +393,7 @@ jobs:
393393
runs-on: [ubuntu-latest]
394394
strategy:
395395
matrix:
396-
go-version: [1.20.x]
396+
go-version: [1.21.x]
397397
os: [ubuntu-latest]
398398
steps:
399399
- name: Check out code
@@ -436,7 +436,7 @@ jobs:
436436
runs-on: [ubuntu-latest]
437437
strategy:
438438
matrix:
439-
go-version: [1.20.x]
439+
go-version: [1.21.x]
440440
os: [ubuntu-latest]
441441
steps:
442442
- name: Check out code
@@ -479,7 +479,7 @@ jobs:
479479
runs-on: [ubuntu-latest]
480480
strategy:
481481
matrix:
482-
go-version: [1.20.x]
482+
go-version: [1.21.x]
483483
os: [ubuntu-latest]
484484
steps:
485485
- name: Check out code
@@ -521,7 +521,7 @@ jobs:
521521
runs-on: [ubuntu-latest]
522522
strategy:
523523
matrix:
524-
go-version: [1.20.x]
524+
go-version: [1.21.x]
525525
os: [ubuntu-latest]
526526
steps:
527527
- name: Check out code
@@ -564,7 +564,7 @@ jobs:
564564
runs-on: [ubuntu-latest]
565565
strategy:
566566
matrix:
567-
go-version: [1.20.x]
567+
go-version: [1.21.x]
568568
os: [ubuntu-latest]
569569
steps:
570570
- name: Check out code
@@ -610,7 +610,7 @@ jobs:
610610
runs-on: [ubuntu-latest]
611611
strategy:
612612
matrix:
613-
go-version: [1.20.x]
613+
go-version: [1.21.x]
614614
os: [ubuntu-latest]
615615
steps:
616616
- name: Check out code
@@ -656,7 +656,7 @@ jobs:
656656
runs-on: [ubuntu-latest]
657657
strategy:
658658
matrix:
659-
go-version: [1.20.x]
659+
go-version: [1.21.x]
660660
os: [ubuntu-latest]
661661
steps:
662662
- name: Check out code
@@ -705,7 +705,7 @@ jobs:
705705
runs-on: ${{ matrix.os }}
706706
strategy:
707707
matrix:
708-
go-version: [1.20.x]
708+
go-version: [1.21.x]
709709
os: [ubuntu-latest]
710710
steps:
711711
- name: Check out code
@@ -742,7 +742,7 @@ jobs:
742742
runs-on: ${{ matrix.os }}
743743
strategy:
744744
matrix:
745-
go-version: [1.20.x]
745+
go-version: [1.21.x]
746746
os: [ubuntu-latest]
747747
steps:
748748
- name: Check out code
@@ -781,7 +781,7 @@ jobs:
781781

782782
strategy:
783783
matrix:
784-
go-version: [1.20.x]
784+
go-version: [1.21.x]
785785

786786
steps:
787787
- name: Check out code
@@ -870,7 +870,7 @@ jobs:
870870

871871
strategy:
872872
matrix:
873-
go-version: [1.20.x]
873+
go-version: [1.21.x]
874874

875875
steps:
876876
- name: Check out code
@@ -945,7 +945,7 @@ jobs:
945945

946946
strategy:
947947
matrix:
948-
go-version: [1.20.x]
948+
go-version: [1.21.x]
949949

950950
steps:
951951
- name: Check out code
@@ -1016,7 +1016,7 @@ jobs:
10161016
runs-on: ${{ matrix.os }}
10171017
strategy:
10181018
matrix:
1019-
go-version: [1.20.x]
1019+
go-version: [1.21.x]
10201020
os: [ubuntu-latest]
10211021
steps:
10221022
- name: Check out code
@@ -1135,7 +1135,7 @@ jobs:
11351135
runs-on: ubuntu-latest
11361136
strategy:
11371137
matrix:
1138-
go-version: [1.20.x]
1138+
go-version: [1.21.x]
11391139
os: [ubuntu-latest]
11401140
steps:
11411141
- name: Check out code
@@ -1176,7 +1176,7 @@ jobs:
11761176
runs-on: ${{ matrix.os }}
11771177
strategy:
11781178
matrix:
1179-
go-version: [1.20.x]
1179+
go-version: [1.21.x]
11801180
os: [ubuntu-latest]
11811181
steps:
11821182
- name: Check out code

‎.github/workflows/vulncheck.yaml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ jobs:
2020
- name: Set up Go
2121
uses: actions/setup-go@v3
2222
with:
23-
go-version: 1.20.x
23+
go-version: 1.21.0
2424
check-latest: true
2525
- name: Get official govulncheck
2626
run: go install golang.org/x/vuln/cmd/govulncheck@latest
@@ -34,7 +34,7 @@ jobs:
3434
runs-on: ubuntu-latest
3535
strategy:
3636
matrix:
37-
go-version: [ 1.20.x ]
37+
go-version: [ 1.21.0 ]
3838
os: [ ubuntu-latest ]
3939
steps:
4040
- name: Check out code

‎restapi/admin_info.go‎

Lines changed: 17 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@ type UsageInfo struct {
6060
Buckets int64
6161
Objects int64
6262
Usage int64
63-
DisksUsage int64
63+
DrivesUsage int64
6464
Servers []*models.ServerProperties
6565
EndpointNotReady bool
6666
Backend *models.BackendProperties
@@ -125,12 +125,12 @@ func GetAdminInfo(ctx context.Context, client MinioAdmin) (*UsageInfo, error) {
125125
OfflineDrives: int64(offlineDrives),
126126
}
127127
return &UsageInfo{
128-
Buckets: int64(serverInfo.Buckets.Count),
129-
Objects: int64(serverInfo.Objects.Count),
130-
Usage: int64(serverInfo.Usage.Size),
131-
DisksUsage: usedSpace,
132-
Servers: serverArray,
133-
Backend: backendData,
128+
Buckets: int64(serverInfo.Buckets.Count),
129+
Objects: int64(serverInfo.Objects.Count),
130+
Usage: int64(serverInfo.Usage.Size),
131+
DrivesUsage: usedSpace,
132+
Servers: serverArray,
133+
Backend: backendData,
134134
}, nil
135135
}
136136

@@ -173,7 +173,7 @@ type WidgetLabel struct {
173173

174174
var labels = []WidgetLabel{
175175
{Name: "instance"},
176-
{Name: "disk"},
176+
{Name: "drive"},
177177
{Name: "server"},
178178
{Name: "api"},
179179
}
@@ -443,7 +443,7 @@ var widgets = []Metric{
443443
},
444444
{
445445
ID: 9,
446-
Title: "Total Online Disks",
446+
Title: "Total Online Drives",
447447
Type: "stat",
448448
MaxDataPoints: 100,
449449
GridPos: GridPos{
@@ -461,8 +461,8 @@ var widgets = []Metric{
461461
},
462462
Targets: []Target{
463463
{
464-
Expr: `minio_cluster_disk_online_total{$__query}`,
465-
LegendFormat: "Total online disks in MinIO Cluster",
464+
Expr: `minio_cluster_drive_online_total{$__query}`,
465+
LegendFormat: "Total online drives in MinIO Cluster",
466466
Step: 60,
467467
},
468468
},
@@ -555,7 +555,7 @@ var widgets = []Metric{
555555
},
556556
{
557557
ID: 78,
558-
Title: "Total Offline Disks",
558+
Title: "Total Offline Drives",
559559
Type: "stat",
560560
MaxDataPoints: 100,
561561
GridPos: GridPos{
@@ -573,7 +573,7 @@ var widgets = []Metric{
573573
},
574574
Targets: []Target{
575575
{
576-
Expr: `minio_cluster_disk_offline_total{$__query}`,
576+
Expr: `minio_cluster_drive_offline_total{$__query}`,
577577
LegendFormat: "",
578578
Step: 60,
579579
},
@@ -759,8 +759,8 @@ var widgets = []Metric{
759759
},
760760
Targets: []Target{
761761
{
762-
Expr: `minio_node_disk_used_bytes{$__query}`,
763-
LegendFormat: "Used Capacity [{{server}}:{{disk}}]",
762+
Expr: `minio_node_drive_used_bytes{$__query}`,
763+
LegendFormat: "Used Capacity [{{server}}:{{drive}}]",
764764
},
765765
},
766766
},
@@ -776,8 +776,8 @@ var widgets = []Metric{
776776
},
777777
Targets: []Target{
778778
{
779-
Expr: `minio_cluster_disk_free_inodes{$__query}`,
780-
LegendFormat: "Free Inodes [{{server}}:{{disk}}]",
779+
Expr: `minio_cluster_drive_free_inodes{$__query}`,
780+
LegendFormat: "Free Inodes [{{server}}:{{drive}}]",
781781
},
782782
},
783783
},

0 commit comments

Comments
 (0)