Skip to content

update disk -> drive change in prometheus metrics in minio master #2999

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Aug 16, 2023
Merged

update disk -> drive change in prometheus metrics in minio master #2999

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 5 additions & 5 deletions .github/workflows/cross-compile.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ jobs:
runs-on: ${{ matrix.os }}
strategy:
matrix:
go-version: [ 1.19.x, 1.20.x ]
go-version: [ 1.21.x ]
os: [ ubuntu-latest ]
steps:
- name: Check out code
Expand Down Expand Up @@ -56,7 +56,7 @@ jobs:
runs-on: ${{ matrix.os }}
strategy:
matrix:
go-version: [ 1.20.x ]
go-version: [ 1.21.x ]
os: [ ubuntu-latest ]
steps:
- name: Check out code
Expand Down Expand Up @@ -85,7 +85,7 @@ jobs:
runs-on: ${{ matrix.os }}
strategy:
matrix:
go-version: [ 1.20.x ]
go-version: [ 1.21.x ]
os: [ ubuntu-latest ]
steps:
- name: Check out code
Expand Down Expand Up @@ -115,7 +115,7 @@ jobs:
runs-on: ${{ matrix.os }}
strategy:
matrix:
go-version: [ 1.20.x ]
go-version: [ 1.21.x ]
os: [ ubuntu-latest ]
steps:
- name: Check out code
Expand Down Expand Up @@ -145,7 +145,7 @@ jobs:
runs-on: ${{ matrix.os }}
strategy:
matrix:
go-version: [ 1.20.x ]
go-version: [ 1.21.x ]
os: [ ubuntu-latest ]
steps:
- name: Check out code
Expand Down
48 changes: 24 additions & 24 deletions .github/workflows/jobs.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ jobs:
runs-on: [ubuntu-latest]
strategy:
matrix:
go-version: [1.20.x]
go-version: [1.21.x]
os: [ubuntu-latest]
steps:
- name: Check out code
Expand Down Expand Up @@ -65,7 +65,7 @@ jobs:
runs-on: ubuntu-latest
strategy:
matrix:
go-version: [1.20.x]
go-version: [1.21.x]
os: [ubuntu-latest]
steps:
- name: Check out code
Expand Down Expand Up @@ -110,7 +110,7 @@ jobs:
runs-on: ubuntu-latest
strategy:
matrix:
go-version: [1.20.x]
go-version: [1.21.x]
os: [ubuntu-latest]
steps:
- name: Check out code
Expand All @@ -133,7 +133,7 @@ jobs:
runs-on: [ubuntu-latest]
strategy:
matrix:
go-version: [1.20.x]
go-version: [1.21.x]
steps:
# To build minio image, we need to clone the repository first
- name: Clone github.com/minio/minio
Expand Down Expand Up @@ -168,7 +168,7 @@ jobs:
runs-on: ${{ matrix.os }}
strategy:
matrix:
go-version: [1.20.x]
go-version: [1.21.x]
os: [ubuntu-latest]
steps:
- name: Check out code
Expand Down Expand Up @@ -208,7 +208,7 @@ jobs:
timeout-minutes: 10
strategy:
matrix:
go-version: [1.20.x]
go-version: [1.21.x]
os: [ubuntu-latest]
steps:
- name: Check out code
Expand Down Expand Up @@ -256,7 +256,7 @@ jobs:
timeout-minutes: 10
strategy:
matrix:
go-version: [1.20.x]
go-version: [1.21.x]
os: [ubuntu-latest]
steps:
- name: Check out code
Expand Down Expand Up @@ -303,7 +303,7 @@ jobs:
timeout-minutes: 10
strategy:
matrix:
go-version: [1.20.x]
go-version: [1.21.x]
os: [ubuntu-latest]
steps:
- name: Check out code
Expand Down Expand Up @@ -350,7 +350,7 @@ jobs:
timeout-minutes: 15
strategy:
matrix:
go-version: [1.20.x]
go-version: [1.21.x]
os: [ubuntu-latest]
steps:
- name: Check out code
Expand Down Expand Up @@ -393,7 +393,7 @@ jobs:
runs-on: [ubuntu-latest]
strategy:
matrix:
go-version: [1.20.x]
go-version: [1.21.x]
os: [ubuntu-latest]
steps:
- name: Check out code
Expand Down Expand Up @@ -436,7 +436,7 @@ jobs:
runs-on: [ubuntu-latest]
strategy:
matrix:
go-version: [1.20.x]
go-version: [1.21.x]
os: [ubuntu-latest]
steps:
- name: Check out code
Expand Down Expand Up @@ -479,7 +479,7 @@ jobs:
runs-on: [ubuntu-latest]
strategy:
matrix:
go-version: [1.20.x]
go-version: [1.21.x]
os: [ubuntu-latest]
steps:
- name: Check out code
Expand Down Expand Up @@ -521,7 +521,7 @@ jobs:
runs-on: [ubuntu-latest]
strategy:
matrix:
go-version: [1.20.x]
go-version: [1.21.x]
os: [ubuntu-latest]
steps:
- name: Check out code
Expand Down Expand Up @@ -564,7 +564,7 @@ jobs:
runs-on: [ubuntu-latest]
strategy:
matrix:
go-version: [1.20.x]
go-version: [1.21.x]
os: [ubuntu-latest]
steps:
- name: Check out code
Expand Down Expand Up @@ -610,7 +610,7 @@ jobs:
runs-on: [ubuntu-latest]
strategy:
matrix:
go-version: [1.20.x]
go-version: [1.21.x]
os: [ubuntu-latest]
steps:
- name: Check out code
Expand Down Expand Up @@ -656,7 +656,7 @@ jobs:
runs-on: [ubuntu-latest]
strategy:
matrix:
go-version: [1.20.x]
go-version: [1.21.x]
os: [ubuntu-latest]
steps:
- name: Check out code
Expand Down Expand Up @@ -705,7 +705,7 @@ jobs:
runs-on: ${{ matrix.os }}
strategy:
matrix:
go-version: [1.20.x]
go-version: [1.21.x]
os: [ubuntu-latest]
steps:
- name: Check out code
Expand Down Expand Up @@ -742,7 +742,7 @@ jobs:
runs-on: ${{ matrix.os }}
strategy:
matrix:
go-version: [1.20.x]
go-version: [1.21.x]
os: [ubuntu-latest]
steps:
- name: Check out code
Expand Down Expand Up @@ -781,7 +781,7 @@ jobs:

strategy:
matrix:
go-version: [1.20.x]
go-version: [1.21.x]

steps:
- name: Check out code
Expand Down Expand Up @@ -870,7 +870,7 @@ jobs:

strategy:
matrix:
go-version: [1.20.x]
go-version: [1.21.x]

steps:
- name: Check out code
Expand Down Expand Up @@ -945,7 +945,7 @@ jobs:

strategy:
matrix:
go-version: [1.20.x]
go-version: [1.21.x]

steps:
- name: Check out code
Expand Down Expand Up @@ -1016,7 +1016,7 @@ jobs:
runs-on: ${{ matrix.os }}
strategy:
matrix:
go-version: [1.20.x]
go-version: [1.21.x]
os: [ubuntu-latest]
steps:
- name: Check out code
Expand Down Expand Up @@ -1135,7 +1135,7 @@ jobs:
runs-on: ubuntu-latest
strategy:
matrix:
go-version: [1.20.x]
go-version: [1.21.x]
os: [ubuntu-latest]
steps:
- name: Check out code
Expand Down Expand Up @@ -1176,7 +1176,7 @@ jobs:
runs-on: ${{ matrix.os }}
strategy:
matrix:
go-version: [1.20.x]
go-version: [1.21.x]
os: [ubuntu-latest]
steps:
- name: Check out code
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/vulncheck.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ jobs:
- name: Set up Go
uses: actions/setup-go@v3
with:
go-version: 1.20.x
go-version: 1.21.0
check-latest: true
- name: Get official govulncheck
run: go install golang.org/x/vuln/cmd/govulncheck@latest
Expand All @@ -34,7 +34,7 @@ jobs:
runs-on: ubuntu-latest
strategy:
matrix:
go-version: [ 1.20.x ]
go-version: [ 1.21.0 ]
os: [ ubuntu-latest ]
steps:
- name: Check out code
Expand Down
34 changes: 17 additions & 17 deletions restapi/admin_info.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@ type UsageInfo struct {
Buckets int64
Objects int64
Usage int64
DisksUsage int64
DrivesUsage int64
Servers []*models.ServerProperties
EndpointNotReady bool
Backend *models.BackendProperties
Expand Down Expand Up @@ -125,12 +125,12 @@ func GetAdminInfo(ctx context.Context, client MinioAdmin) (*UsageInfo, error) {
OfflineDrives: int64(offlineDrives),
}
return &UsageInfo{
Buckets: int64(serverInfo.Buckets.Count),
Objects: int64(serverInfo.Objects.Count),
Usage: int64(serverInfo.Usage.Size),
DisksUsage: usedSpace,
Servers: serverArray,
Backend: backendData,
Buckets: int64(serverInfo.Buckets.Count),
Objects: int64(serverInfo.Objects.Count),
Usage: int64(serverInfo.Usage.Size),
DrivesUsage: usedSpace,
Servers: serverArray,
Backend: backendData,
}, nil
}

Expand Down Expand Up @@ -173,7 +173,7 @@ type WidgetLabel struct {

var labels = []WidgetLabel{
{Name: "instance"},
{Name: "disk"},
{Name: "drive"},
{Name: "server"},
{Name: "api"},
}
Expand Down Expand Up @@ -443,7 +443,7 @@ var widgets = []Metric{
},
{
ID: 9,
Title: "Total Online Disks",
Title: "Total Online Drives",
Type: "stat",
MaxDataPoints: 100,
GridPos: GridPos{
Expand All @@ -461,8 +461,8 @@ var widgets = []Metric{
},
Targets: []Target{
{
Expr: `minio_cluster_disk_online_total{$__query}`,
LegendFormat: "Total online disks in MinIO Cluster",
Expr: `minio_cluster_drive_online_total{$__query}`,
LegendFormat: "Total online drives in MinIO Cluster",
Step: 60,
},
},
Expand Down Expand Up @@ -555,7 +555,7 @@ var widgets = []Metric{
},
{
ID: 78,
Title: "Total Offline Disks",
Title: "Total Offline Drives",
Type: "stat",
MaxDataPoints: 100,
GridPos: GridPos{
Expand All @@ -573,7 +573,7 @@ var widgets = []Metric{
},
Targets: []Target{
{
Expr: `minio_cluster_disk_offline_total{$__query}`,
Expr: `minio_cluster_drive_offline_total{$__query}`,
LegendFormat: "",
Step: 60,
},
Expand Down Expand Up @@ -759,8 +759,8 @@ var widgets = []Metric{
},
Targets: []Target{
{
Expr: `minio_node_disk_used_bytes{$__query}`,
LegendFormat: "Used Capacity [{{server}}:{{disk}}]",
Expr: `minio_node_drive_used_bytes{$__query}`,
LegendFormat: "Used Capacity [{{server}}:{{drive}}]",
},
},
},
Expand All @@ -776,8 +776,8 @@ var widgets = []Metric{
},
Targets: []Target{
{
Expr: `minio_cluster_disk_free_inodes{$__query}`,
LegendFormat: "Free Inodes [{{server}}:{{disk}}]",
Expr: `minio_cluster_drive_free_inodes{$__query}`,
LegendFormat: "Free Inodes [{{server}}:{{drive}}]",
},
},
},
Expand Down