The measures are consolidated to the following metrics - `disk_storage_used` : Disk space used by the disk. - `disk_storage_available`: Available disk space left on the disk. - `disk_storage_total`: Total disk space on the disk. - `disks_offline`: Total number of offline disks in current MinIO instance. - `disks_total`: Total number of disks in current MinIO instance. - `s3_requests_total`: Total number of s3 requests in current MinIO instance. - `s3_errors_total`: Total number of errors in s3 requests in current MinIO instance. - `s3_requests_current`: Total number of active s3 requests in current MinIO instance. - `internode_rx_bytes_total`: Total number of internode bytes received by current MinIO server instance. - `internode_tx_bytes_total`: Total number of bytes sent to the other nodes by current MinIO server instance. - `s3_rx_bytes_total`: Total number of s3 bytes received by current MinIO server instance. - `s3_tx_bytes_total`: Total number of s3 bytes sent by current MinIO server instance. - `minio_version_info`: Current MinIO version with commit-id. - `s3_ttfb_seconds_bucket`: Histogram that holds the latency information of the requests. And this PR also modifies the current StorageInfo queries - Decouples StorageInfo from ServerInfo . - StorageInfo is enhanced to give endpoint information. NOTE: ADMIN API VERSION IS BUMPED UP IN THIS PR Fixes #7873
165 lines
3.7 KiB
Go
165 lines
3.7 KiB
Go
/*
|
|
* MinIO Cloud Storage, (C) 2018-2019 MinIO, Inc.
|
|
*
|
|
* Licensed under the Apache License, Version 2.0 (the "License");
|
|
* you may not use this file except in compliance with the License.
|
|
* You may obtain a copy of the License at
|
|
*
|
|
* http://www.apache.org/licenses/LICENSE-2.0
|
|
*
|
|
* Unless required by applicable law or agreed to in writing, software
|
|
* distributed under the License is distributed on an "AS IS" BASIS,
|
|
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
|
* See the License for the specific language governing permissions and
|
|
* limitations under the License.
|
|
*
|
|
*/
|
|
|
|
package madmin
|
|
|
|
import (
|
|
"encoding/json"
|
|
"io/ioutil"
|
|
"net/http"
|
|
"net/url"
|
|
)
|
|
|
|
// GroupAddRemove is type for adding/removing members to/from a group.
|
|
type GroupAddRemove struct {
|
|
Group string `json:"group"`
|
|
Members []string `json:"members"`
|
|
IsRemove bool `json:"isRemove"`
|
|
}
|
|
|
|
// UpdateGroupMembers - adds/removes users to/from a group. Server
|
|
// creates the group as needed. Group is removed if remove request is
|
|
// made on empty group.
|
|
func (adm *AdminClient) UpdateGroupMembers(g GroupAddRemove) error {
|
|
data, err := json.Marshal(g)
|
|
if err != nil {
|
|
return err
|
|
}
|
|
|
|
reqData := requestData{
|
|
relPath: adminAPIPrefix + "/update-group-members",
|
|
content: data,
|
|
}
|
|
|
|
// Execute PUT on /minio/admin/v2/update-group-members
|
|
resp, err := adm.executeMethod("PUT", reqData)
|
|
|
|
defer closeResponse(resp)
|
|
if err != nil {
|
|
return err
|
|
}
|
|
|
|
if resp.StatusCode != http.StatusOK {
|
|
return httpRespToErrorResponse(resp)
|
|
}
|
|
|
|
return nil
|
|
}
|
|
|
|
// GroupDesc is a type that holds group info along with the policy
|
|
// attached to it.
|
|
type GroupDesc struct {
|
|
Name string `json:"name"`
|
|
Status string `json:"status"`
|
|
Members []string `json:"members"`
|
|
Policy string `json:"policy"`
|
|
}
|
|
|
|
// GetGroupDescription - fetches information on a group.
|
|
func (adm *AdminClient) GetGroupDescription(group string) (*GroupDesc, error) {
|
|
v := url.Values{}
|
|
v.Set("group", group)
|
|
reqData := requestData{
|
|
relPath: adminAPIPrefix + "/group",
|
|
queryValues: v,
|
|
}
|
|
|
|
resp, err := adm.executeMethod("GET", reqData)
|
|
defer closeResponse(resp)
|
|
if err != nil {
|
|
return nil, err
|
|
}
|
|
|
|
if resp.StatusCode != http.StatusOK {
|
|
return nil, httpRespToErrorResponse(resp)
|
|
}
|
|
|
|
data, err := ioutil.ReadAll(resp.Body)
|
|
if err != nil {
|
|
return nil, err
|
|
}
|
|
|
|
gd := GroupDesc{}
|
|
if err = json.Unmarshal(data, &gd); err != nil {
|
|
return nil, err
|
|
}
|
|
|
|
return &gd, nil
|
|
}
|
|
|
|
// ListGroups - lists all groups names present on the server.
|
|
func (adm *AdminClient) ListGroups() ([]string, error) {
|
|
reqData := requestData{
|
|
relPath: adminAPIPrefix + "/groups",
|
|
}
|
|
|
|
resp, err := adm.executeMethod("GET", reqData)
|
|
defer closeResponse(resp)
|
|
if err != nil {
|
|
return nil, err
|
|
}
|
|
|
|
if resp.StatusCode != http.StatusOK {
|
|
return nil, httpRespToErrorResponse(resp)
|
|
}
|
|
|
|
data, err := ioutil.ReadAll(resp.Body)
|
|
if err != nil {
|
|
return nil, err
|
|
}
|
|
|
|
groups := []string{}
|
|
if err = json.Unmarshal(data, &groups); err != nil {
|
|
return nil, err
|
|
}
|
|
|
|
return groups, nil
|
|
}
|
|
|
|
// GroupStatus - group status.
|
|
type GroupStatus string
|
|
|
|
// GroupStatus values.
|
|
const (
|
|
GroupEnabled GroupStatus = "enabled"
|
|
GroupDisabled GroupStatus = "disabled"
|
|
)
|
|
|
|
// SetGroupStatus - sets the status of a group.
|
|
func (adm *AdminClient) SetGroupStatus(group string, status GroupStatus) error {
|
|
v := url.Values{}
|
|
v.Set("group", group)
|
|
v.Set("status", string(status))
|
|
|
|
reqData := requestData{
|
|
relPath: adminAPIPrefix + "/set-group-status",
|
|
queryValues: v,
|
|
}
|
|
|
|
resp, err := adm.executeMethod("PUT", reqData)
|
|
defer closeResponse(resp)
|
|
if err != nil {
|
|
return err
|
|
}
|
|
|
|
if resp.StatusCode != http.StatusOK {
|
|
return httpRespToErrorResponse(resp)
|
|
}
|
|
|
|
return nil
|
|
}
|