The prometheus metrics refractoring (#8003)
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 #7873master
Praveen raj Mani
5 years ago
committed by
Harshavardhana
parent
f01d53b20f
commit
8836d57e3c
File diff suppressed because one or more lines are too long
@ -0,0 +1,107 @@ |
||||
/* |
||||
* MinIO Cloud Storage, (C) 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 cmd |
||||
|
||||
import ( |
||||
"io" |
||||
"net/http" |
||||
"time" |
||||
) |
||||
|
||||
// records the incoming bytes from the underlying request.Body.
|
||||
type recordTrafficRequest struct { |
||||
io.ReadCloser |
||||
isS3Request bool |
||||
} |
||||
|
||||
// Records the bytes read.
|
||||
func (r *recordTrafficRequest) Read(p []byte) (n int, err error) { |
||||
n, err = r.ReadCloser.Read(p) |
||||
globalConnStats.incInputBytes(n) |
||||
if r.isS3Request { |
||||
globalConnStats.incS3InputBytes(n) |
||||
} |
||||
return n, err |
||||
} |
||||
|
||||
// Records the outgoing bytes through the responseWriter.
|
||||
type recordTrafficResponse struct { |
||||
// wrapper for underlying http.ResponseWriter.
|
||||
writer http.ResponseWriter |
||||
isS3Request bool |
||||
} |
||||
|
||||
// Calls the underlying WriteHeader.
|
||||
func (r *recordTrafficResponse) WriteHeader(i int) { |
||||
r.writer.WriteHeader(i) |
||||
} |
||||
|
||||
// Calls the underlying Header.
|
||||
func (r *recordTrafficResponse) Header() http.Header { |
||||
return r.writer.Header() |
||||
} |
||||
|
||||
// Records the output bytes
|
||||
func (r *recordTrafficResponse) Write(p []byte) (n int, err error) { |
||||
n, err = r.writer.Write(p) |
||||
globalConnStats.incOutputBytes(n) |
||||
// Check if it is s3 request
|
||||
if r.isS3Request { |
||||
globalConnStats.incS3OutputBytes(n) |
||||
} |
||||
return n, err |
||||
} |
||||
|
||||
// Calls the underlying Flush.
|
||||
func (r *recordTrafficResponse) Flush() { |
||||
r.writer.(http.Flusher).Flush() |
||||
} |
||||
|
||||
// Records the outgoing bytes through the responseWriter.
|
||||
type recordAPIStats struct { |
||||
// wrapper for underlying http.ResponseWriter.
|
||||
writer http.ResponseWriter |
||||
TTFB time.Time // TimeToFirstByte.
|
||||
firstByteRead bool |
||||
respStatusCode int |
||||
isS3Request bool |
||||
} |
||||
|
||||
// Calls the underlying WriteHeader.
|
||||
func (r *recordAPIStats) WriteHeader(i int) { |
||||
r.respStatusCode = i |
||||
r.writer.WriteHeader(i) |
||||
} |
||||
|
||||
// Calls the underlying Header.
|
||||
func (r *recordAPIStats) Header() http.Header { |
||||
return r.writer.Header() |
||||
} |
||||
|
||||
// Records the TTFB on the first byte write.
|
||||
func (r *recordAPIStats) Write(p []byte) (n int, err error) { |
||||
if !r.firstByteRead { |
||||
r.TTFB = UTCNow() |
||||
r.firstByteRead = true |
||||
} |
||||
return r.writer.Write(p) |
||||
} |
||||
|
||||
// Calls the underlying Flush.
|
||||
func (r *recordAPIStats) Flush() { |
||||
r.writer.(http.Flusher).Flush() |
||||
} |
||||
@ -1,57 +0,0 @@ |
||||
/* |
||||
* MinIO Cloud Storage, (C) 2017-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 http |
||||
|
||||
import ( |
||||
"net" |
||||
) |
||||
|
||||
// AccountingConn - is a generic stream-oriented network connection supporting buffered reader and read/write timeout.
|
||||
type AccountingConn struct { |
||||
net.Conn |
||||
updateBytesReadFunc func(int) // function to be called to update bytes read.
|
||||
updateBytesWrittenFunc func(int) // function to be called to update bytes written.
|
||||
} |
||||
|
||||
// Read - reads data from the connection using wrapped buffered reader.
|
||||
func (c *AccountingConn) Read(b []byte) (n int, err error) { |
||||
n, err = c.Conn.Read(b) |
||||
if err == nil && c.updateBytesReadFunc != nil { |
||||
c.updateBytesReadFunc(n) |
||||
} |
||||
|
||||
return n, err |
||||
} |
||||
|
||||
// Write - writes data to the connection.
|
||||
func (c *AccountingConn) Write(b []byte) (n int, err error) { |
||||
n, err = c.Conn.Write(b) |
||||
if err == nil && c.updateBytesWrittenFunc != nil { |
||||
c.updateBytesWrittenFunc(n) |
||||
} |
||||
|
||||
return n, err |
||||
} |
||||
|
||||
// newAccountingConn - creates a new connection object wrapping net.Conn with deadlines.
|
||||
func newAccountingConn(c net.Conn, updateBytesReadFunc, updateBytesWrittenFunc func(int)) *AccountingConn { |
||||
return &AccountingConn{ |
||||
Conn: c, |
||||
updateBytesReadFunc: updateBytesReadFunc, |
||||
updateBytesWrittenFunc: updateBytesWrittenFunc, |
||||
} |
||||
} |
||||
@ -0,0 +1,44 @@ |
||||
// +build ignore
|
||||
|
||||
/* |
||||
* MinIO Cloud Storage, (C) 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 main |
||||
|
||||
import ( |
||||
"log" |
||||
|
||||
"github.com/minio/minio/pkg/madmin" |
||||
) |
||||
|
||||
func main() { |
||||
// Note: YOUR-ACCESSKEYID, YOUR-SECRETACCESSKEY and my-bucketname are
|
||||
// dummy values, please replace them with original values.
|
||||
|
||||
// API requests are secure (HTTPS) if secure=true and insecure (HTTPS) otherwise.
|
||||
// New returns an MinIO Admin client object.
|
||||
madmClnt, err := madmin.New("your-minio.example.com:9000", "YOUR-ACCESSKEYID", "YOUR-SECRETACCESSKEY", true) |
||||
if err != nil { |
||||
log.Fatalln(err) |
||||
} |
||||
|
||||
st, err := madmClnt.StorageInfo() |
||||
if err != nil { |
||||
log.Fatalln(err) |
||||
} |
||||
log.Println(st) |
||||
} |
||||
Loading…
Reference in new issue