redefine API event

Author: Praveenrajmani

audit-event.go renamed to api-events.go

@@ -29,29 +29,27 @@ import (
 	"github.com/minio/madmin-go/v3/event"
 )
 
+// GetAPIEvents fetches the persisted API events from MinIO
 func (adm AdminClient) GetAPIEvents(ctx context.Context, node string, api string) <-chan event.API {
-	logCh := make(chan event.API)
+	eventCh := make(chan event.API)
 
 	// Only success, start a routine to start reading line by line.
-	go func(logCh chan<- event.API) {
-		defer close(logCh)
+	go func(eventCh chan<- event.API) {
+		defer close(eventCh)
 		urlValues := make(url.Values)
 		urlValues.Set("node", node)
 		urlValues.Set("api", api)
-		// for {
 		reqData := requestData{
 			relPath:     adminAPIPrefix + "/events/api",
 			queryValues: urlValues,
 		}
-		// Execute GET to call log handler
 		resp, err := adm.executeMethod(ctx, http.MethodGet, reqData)
 		if err != nil {
 			closeResponse(resp)
 			return
 		}
 
 		if resp.StatusCode != http.StatusOK {
-			// logCh <- LogInfo{Err: httpRespToErrorResponse(resp)}
 			return
 		}
 		dec := json.NewDecoder(resp.Body)
@@ -64,13 +62,11 @@ func (adm AdminClient) GetAPIEvents(ctx context.Context, node string, api string
 			select {
 			case <-ctx.Done():
 				return
-			case logCh <- info:
+			case eventCh <- info:
 			}
 		}
-		// }
 
-	}(logCh)
+	}(eventCh)
 
-	// Returns the log info channel, for caller to start reading from.
-	return logCh
+	return eventCh
 }

event/api.go

@@ -22,19 +22,36 @@ import "time"
 // API represents the api event
 type API struct {
 	Version      string    `json:"version"`
+	Type         string    `json:"type,omitempty"`
 	DeploymentID string    `json:"deploymentid,omitempty"`
 	SiteName     string    `json:"siteName,omitempty"`
 	Time         time.Time `json:"time"`
-	Event        string    `json:"event"`
-
-	Type string `json:"type,omitempty"`
-
-	API struct {
-		Name       string `json:"name,omitempty"`
-		Bucket     string `json:"bucket,omitempty"`
-		Object     string `json:"object,omitempty"`
-		StatusCode int    `json:"statusCode,omitempty"`
-	} `json:"api"`
+	Name         string    `json:"name,omitempty"`
+	Bucket       string    `json:"bucket,omitempty"`
+	Object       string    `json:"object,omitempty"`
+	VersionID    string    `json:"versionId,omitempty"`
+	External     bool      `json:"external,omitempty"`
+	CallInfo     *CallInfo `json:"callInfo,omitempty"`
+}
 
-	Error string `json:"error,omitempty"`
+// CallInfo represents the info for the external call
+type CallInfo struct {
+	StatusCode      int                    `json:"statusCode,omitempty"`
+	InputBytes      int64                  `json:"rx"`
+	OutputBytes     int64                  `json:"tx"`
+	HeaderBytes     int64                  `json:"txHeaders,omitempty"`
+	TimeToFirstByte string                 `json:"timeToFirstByte,omitempty"`
+	TimeToResponse  string                 `json:"timeToResponse,omitempty"`
+	RemoteHost      string                 `json:"remotehost,omitempty"`
+	RequestID       string                 `json:"requestID,omitempty"`
+	UserAgent       string                 `json:"userAgent,omitempty"`
+	ReqPath         string                 `json:"requestPath,omitempty"`
+	ReqHost         string                 `json:"requestHost,omitempty"`
+	ReqNode         string                 `json:"requestNode,omitempty"`
+	ReqClaims       map[string]interface{} `json:"requestClaims,omitempty"`
+	ReqQuery        map[string]string      `json:"requestQuery,omitempty"`
+	ReqHeader       map[string]string      `json:"requestHeader,omitempty"`
+	RespHeader      map[string]string      `json:"responseHeader,omitempty"`
+	AccessKey       string                 `json:"accessKey,omitempty"`
+	ParentUser      string                 `json:"parentUser,omitempty"`
 }