obd: Add console log to OBD output (#10372)

This commit is contained in:
Anis Elleuch
2020-09-16 02:02:54 +01:00
committed by GitHub
parent 80e3dce631
commit 8ea55f9dba
12 changed files with 130 additions and 25 deletions

View File

@@ -25,6 +25,7 @@ import (
"net/url"
"time"
"github.com/minio/minio/cmd/logger/message/log"
"github.com/minio/minio/pkg/disk"
"github.com/minio/minio/pkg/net"
@@ -42,6 +43,19 @@ type OBDInfo struct {
Perf PerfOBDInfo `json:"perf,omitempty"`
Minio MinioOBDInfo `json:"minio,omitempty"`
Sys SysOBDInfo `json:"sys,omitempty"`
Logging LogOBDInfo `json:"logging,omitempty"`
}
// LogOBDInfo holds different type of logs of all clusters
type LogOBDInfo struct {
ServersLog []ServerLogOBDInfo `json:"serverLogs"`
}
// ServerLogOBDInfo holds server's stdout log
type ServerLogOBDInfo struct {
Addr string `json:"nodeName"`
Entries []log.Entry `json:"entries"`
Error string `json:"error,omitempty"`
}
// SysOBDInfo - Includes hardware and system information of the MinIO cluster
@@ -185,6 +199,7 @@ const (
OBDDataTypeSysMem OBDDataType = "sysmem"
OBDDataTypeSysNet OBDDataType = "sysnet"
OBDDataTypeSysProcess OBDDataType = "sysprocess"
OBDDataTypeLog OBDDataType = "log"
)
// OBDDataTypesMap - Map of OBD datatypes
@@ -201,6 +216,7 @@ var OBDDataTypesMap = map[string]OBDDataType{
"sysmem": OBDDataTypeSysMem,
"sysnet": OBDDataTypeSysNet,
"sysprocess": OBDDataTypeSysProcess,
"log": OBDDataTypeLog,
}
// OBDDataTypesList - List of OBD datatypes
@@ -217,6 +233,7 @@ var OBDDataTypesList = []OBDDataType{
OBDDataTypeSysMem,
OBDDataTypeSysNet,
OBDDataTypeSysProcess,
OBDDataTypeLog,
}
// ServerOBDInfo - Connect to a minio server and call OBD Info Management API