mirror of
https://github.com/hanzos3/madmin-go.git
synced 2026-10-30 20:35:32 +00:00
* feat: add DistJobType enum and sync distjob status types Adds an iota-based DistJobType enum (mirrors the HealingDriveReason/ OfflineReason pattern already used in heal-commands.go) so distributed job identity is a typed wire value instead of a bare string, per review feedback on the eos distributed-job framework PR. Also syncs DistJobLeaderStatus/DistJobNodeStatus field shapes to match the current server-side JSON response (JobID/JobType replace JobName; drops the unused Generation/AssignedSets/top-level CurrentBucket fields that were never populated by the server). * fix: bump vulnerable prometheus dep - Add msgp generation (//msgp:tag json + //go:generate msgp) for DistJobLeaderStatus/DistJobNodeStatus, matching the pattern used by every other *-commands.go file in this package. - Add unit tests for ListDistJobStatuses (success path, job-filter query param, DistJobTypeUnknown no-filter case, non-200 error path). - Bump github.com/prometheus/prometheus v0.304.1 -> v0.312.0 to clear 3 of the 4 govulncheck findings on this branch (GO-2026-5710, GO-2026-5381, GO-2026-5264, all fixed by that version). The 4th, GO-2026-5662, has no fix published upstream yet and also currently fails govulncheck on main independent of this branch. * fix: pin go:generate directives to go.mod tool versions Consolidate distjob-commands.go's separate //msgp:tag json directive into the //go:generate msgp -d "tag json" flag, matching net-stats.go's style (review feedback, PR #557). Change every //go:generate msgp / //go:generate stringer directive (31 occurrences, 30 files) to //go:generate go tool msgp / go tool stringer, so generation always resolves the exact version pinned in go.mod's tool block instead of whatever binary happens to be on PATH. This was the root cause of the earlier stringer-drift CI failure. Drop the now-unnecessary `go install -v tool` step from lint.yml.
97 lines
3.2 KiB
Go
97 lines
3.2 KiB
Go
// Copyright (c) 2015-2025 MinIO, Inc.
|
|
//
|
|
// This file is part of MinIO Object Storage stack
|
|
//
|
|
// This program is free software: you can redistribute it and/or modify
|
|
// it under the terms of the GNU Affero General Public License as published by
|
|
// the Free Software Foundation, either version 3 of the License, or
|
|
// (at your option) any later version.
|
|
//
|
|
// This program is distributed in the hope that it will be useful
|
|
// but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
// GNU Affero General Public License for more details.
|
|
//
|
|
// You should have received a copy of the GNU Affero General Public License
|
|
// along with this program. If not, see <http://www.gnu.org/licenses/>.
|
|
|
|
package log
|
|
|
|
import (
|
|
"strings"
|
|
"time"
|
|
|
|
"github.com/minio/madmin-go/v4"
|
|
)
|
|
|
|
//msgp:tag json
|
|
//go:generate go tool msgp -d clearomitted -d "timezone utc" -file $GOFILE
|
|
|
|
// ObjectVersion object version key/versionId
|
|
type ObjectVersion struct {
|
|
ObjectName string `json:"objectName"`
|
|
VersionID string `json:"versionId,omitempty"`
|
|
}
|
|
|
|
// Args - defines the arguments for the API.
|
|
type Args struct {
|
|
Bucket string `json:"bucket,omitempty"`
|
|
Object string `json:"object,omitempty"`
|
|
VersionID string `json:"versionId,omitempty"`
|
|
Objects []ObjectVersion `json:"objects,omitempty"`
|
|
Metadata map[string]string `json:"metadata,omitempty"`
|
|
}
|
|
|
|
// Trace - defines the trace.
|
|
type Trace struct {
|
|
Message string `json:"message,omitempty"`
|
|
Source []string `json:"source,omitempty"`
|
|
Variables map[string]interface{} `json:"variables,omitempty"`
|
|
}
|
|
|
|
// API - defines the api type and its args.
|
|
type API struct {
|
|
Name string `json:"name,omitempty"`
|
|
Args *Args `json:"args,omitempty"`
|
|
}
|
|
|
|
//msgp:replace madmin.LogKind with:string
|
|
|
|
// Entry - defines fields and values of each log entry.
|
|
type Entry struct {
|
|
Site string `json:"site,omitempty"`
|
|
DeploymentID string `json:"deploymentid,omitempty"`
|
|
Level madmin.LogKind `json:"level"`
|
|
LogKind madmin.LogKind `json:"errKind,omitempty"` // Deprecated Jan 2024
|
|
Time time.Time `json:"time"`
|
|
API *API `json:"api,omitempty"`
|
|
RemoteHost string `json:"remotehost,omitempty"`
|
|
Host string `json:"host,omitempty"` // Deprecated Apr 2025
|
|
RequestHost string `json:"requestHost,omitempty"`
|
|
RequestNode string `json:"requestNode,omitempty"`
|
|
RequestID string `json:"requestID,omitempty"`
|
|
UserAgent string `json:"userAgent,omitempty"`
|
|
Message string `json:"message,omitempty"`
|
|
Trace *Trace `json:"error,omitempty"`
|
|
}
|
|
|
|
// Info holds console log messages
|
|
type Info struct {
|
|
Entry
|
|
NodeName string `json:"node"`
|
|
Err error `json:"-"`
|
|
}
|
|
|
|
// Mask returns the mask based on the error level.
|
|
func (l Info) Mask() uint64 {
|
|
return l.Level.LogMask().Mask()
|
|
}
|
|
|
|
// SendLog returns true if log pertains to node specified in args.
|
|
func (l Info) SendLog(node string, logKind madmin.LogMask) bool {
|
|
if logKind.Contains(l.Level.LogMask()) {
|
|
return node == "" || strings.EqualFold(node, l.NodeName) && !l.Time.IsZero()
|
|
}
|
|
return false
|
|
}
|