Elgato_dark/fleet
1
0
Fork 0
mirror of https://github.com/fleetdm/fleet synced 2026-05-23 08:58:41 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 111

Reduce verbosity of default logging (#2225)

Browse source 
* Moves much logging from the info level to the debug level
* Tries to retain security/auditing relevant logs at info level
This commit is contained in:
Charlie Gildawie 2020-04-22 22:01:34 +01:00 committed by GitHub
parent be8dbb426e
commit df93abd722
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
16 changed files with 98 additions and 87 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
server/service/logging.go
View file

@ -2,6 +2,7 @@ package service
import (
kitlog "github.com/go-kit/kit/log"
"github.com/go-kit/kit/log/level"
"github.com/kolide/fleet/server/kolide"
)
@ -15,3 +16,13 @@ type loggingMiddleware struct {
func NewLoggingService(svc kolide.Service, logger kitlog.Logger) kolide.Service {
return loggingMiddleware{Service: svc, logger: logger}
}
// loggerDebug returns the debug level
func (mw loggingMiddleware) loggerDebug(err error) kitlog.Logger {
return level.Debug(mw.logger)
}
// loggerInfo returns the info level
func (mw loggingMiddleware) loggerInfo(err error) kitlog.Logger {
return level.Info(mw.logger)
}

6
server/service/logging_appconfig.go
View file

@ -14,7 +14,7 @@ func (mw loggingMiddleware) NewAppConfig(ctx context.Context, p kolide.AppConfig
)
defer func(begin time.Time) {
_ = mw.logger.Log(
_ = mw.loggerDebug(err).Log(
"method", "NewAppConfig",
"err", err,
"took", time.Since(begin),
@ -32,7 +32,7 @@ func (mw loggingMiddleware) AppConfig(ctx context.Context) (*kolide.AppConfig, e
)
defer func(begin time.Time) {
_ = mw.logger.Log(
_ = mw.loggerDebug(err).Log(
"method", "AppConfig",
"err", err,
"took", time.Since(begin),
@ -50,7 +50,7 @@ func (mw loggingMiddleware) ModifyAppConfig(ctx context.Context, p kolide.AppCon
)
defer func(begin time.Time) {
_ = mw.logger.Log(
_ = mw.loggerDebug(err).Log(
"method", "ModifyAppConfig",
"err", err,
"took", time.Since(begin),

6
server/service/logging_campaigns.go
View file

@ -24,7 +24,7 @@ func (mw loggingMiddleware) NewDistributedQueryCampaign(ctx context.Context, que
if campaign != nil {
numHosts = campaign.Metrics.TotalHosts
}
_ = mw.logger.Log(
_ = mw.loggerInfo(err).Log(
"method", "NewDistributedQueryCampaign",
"err", err,
"user", loggedInUser,
@ -52,7 +52,7 @@ func (mw loggingMiddleware) NewDistributedQueryCampaignByNames(ctx context.Conte
if campaign != nil {
numHosts = campaign.Metrics.TotalHosts
}
_ = mw.logger.Log(
_ = mw.loggerInfo(err).Log(
"method", "NewDistributedQueryCampaignByNames",
"err", err,
"user", loggedInUser,
@ -74,7 +74,7 @@ func (mw loggingMiddleware) StreamCampaignResults(ctx context.Context, conn *web
loggedInUser = vc.Username()
}
defer func(begin time.Time) {
_ = mw.logger.Log(
_ = mw.loggerInfo(err).Log(
"method", "StreamCampaignResults",
"campaignID", campaignID,
"err", err,

2
server/service/logging_email_change.go
View file

@ -11,7 +11,7 @@ func (mw loggingMiddleware) ChangeUserEmail(ctx context.Context, token string) (
newMail string
)
defer func(begin time.Time) {
mw.logger.Log(
_ = mw.loggerInfo(err).Log(
"method",
"CommitEmailChange",
"err", err,

12
server/service/logging_fim.go
View file

@ -7,26 +7,26 @@ import (
"github.com/kolide/fleet/server/kolide"
)
func (lm loggingMiddleware) GetFIM(ctx context.Context) (cfg *kolide.FIMConfig, err error) {
func (mw loggingMiddleware) GetFIM(ctx context.Context) (cfg *kolide.FIMConfig, err error) {
defer func(begin time.Time) {
lm.logger.Log(
_ = mw.loggerDebug(err).Log(
"method", "GetFIM",
"err", err,
"took", time.Since(begin),
)
}(time.Now())
cfg, err = lm.Service.GetFIM(ctx)
cfg, err = mw.Service.GetFIM(ctx)
return cfg, err
}
func (lm loggingMiddleware) ModifyFIM(ctx context.Context, fim kolide.FIMConfig) (err error) {
func (mw loggingMiddleware) ModifyFIM(ctx context.Context, fim kolide.FIMConfig) (err error) {
defer func(begin time.Time) {
lm.logger.Log(
_ = mw.loggerInfo(err).Log(
"method", "ModifyFIM",
"err", err,
"took", time.Since(begin),
)
}(time.Now())
err = lm.Service.ModifyFIM(ctx, fim)
err = mw.Service.ModifyFIM(ctx, fim)
return err
}

8
server/service/logging_hosts.go
View file

@ -14,7 +14,7 @@ func (mw loggingMiddleware) ListHosts(ctx context.Context, opt kolide.ListOption
)
defer func(begin time.Time) {
_ = mw.logger.Log(
_ = mw.loggerDebug(err).Log(
"method", "ListHosts",
"err", err,
"took", time.Since(begin),
@ -32,7 +32,7 @@ func (mw loggingMiddleware) GetHost(ctx context.Context, id uint) (*kolide.Host,
)
defer func(begin time.Time) {
_ = mw.logger.Log(
_ = mw.loggerDebug(err).Log(
"method", "GetHost",
"err", err,
"took", time.Since(begin),
@ -50,7 +50,7 @@ func (mw loggingMiddleware) GetHostSummary(ctx context.Context) (*kolide.HostSum
)
defer func(begin time.Time) {
_ = mw.logger.Log(
_ = mw.loggerDebug(err).Log(
"method", "GetHostSummary",
"err", err,
"took", time.Since(begin),
@ -67,7 +67,7 @@ func (mw loggingMiddleware) DeleteHost(ctx context.Context, id uint) error {
)
defer func(begin time.Time) {
_ = mw.logger.Log(
_ = mw.loggerInfo(err).Log(
"method", "DeleteHost",
"err", err,
"took", time.Since(begin),

8
server/service/logging_invites.go
View file

@ -19,7 +19,7 @@ func (mw loggingMiddleware) InviteNewUser(ctx context.Context, payload kolide.In
return nil, errNoContext
}
defer func(begin time.Time) {
_ = mw.logger.Log(
_ = mw.loggerInfo(err).Log(
"method", "InviteNewUser",
"created_by", vc.Username(),
"err", err,
@ -40,7 +40,7 @@ func (mw loggingMiddleware) DeleteInvite(ctx context.Context, id uint) error {
return errNoContext
}
defer func(begin time.Time) {
_ = mw.logger.Log(
_ = mw.loggerInfo(err).Log(
"method", "DeleteInvite",
"deleted_by", vc.Username(),
"err", err,
@ -61,7 +61,7 @@ func (mw loggingMiddleware) ListInvites(ctx context.Context, opt kolide.ListOpti
return nil, errNoContext
}
defer func(begin time.Time) {
_ = mw.logger.Log(
_ = mw.loggerInfo(err).Log(
"method", "Invites",
"called_by", vc.Username(),
"err", err,
@ -78,7 +78,7 @@ func (mw loggingMiddleware) VerifyInvite(ctx context.Context, token string) (*ko
invite *kolide.Invite
)
defer func(begin time.Time) {
_ = mw.logger.Log(
_ = mw.loggerInfo(err).Log(
"method", "VerifyInvite",
"token", token,
"err", err,

16
server/service/logging_labels.go
View file

@ -21,7 +21,7 @@ func (mw loggingMiddleware) NewLabel(ctx context.Context, p kolide.LabelPayload)
}
defer func(begin time.Time) {
_ = mw.logger.Log(
_ = mw.loggerInfo(err).Log(
"method", "NewLabel",
"err", err,
"user", loggedInUser,
@ -46,7 +46,7 @@ func (mw loggingMiddleware) ModifyLabel(ctx context.Context, id uint, p kolide.M
}
defer func(begin time.Time) {
mw.logger.Log(
_ = mw.loggerInfo(err).Log(
"method", "ModifyLabel",
"err", err,
"user", loggedInUser,
@ -65,7 +65,7 @@ func (mw loggingMiddleware) ListLabels(ctx context.Context, opt kolide.ListOptio
)
defer func(begin time.Time) {
_ = mw.logger.Log(
_ = mw.loggerDebug(err).Log(
"method", "ListLabels",
"err", err,
"took", time.Since(begin),
@ -83,7 +83,7 @@ func (mw loggingMiddleware) GetLabel(ctx context.Context, id uint) (*kolide.Labe
)
defer func(begin time.Time) {
_ = mw.logger.Log(
_ = mw.loggerDebug(err).Log(
"method", "GetLabel",
"err", err,
"took", time.Since(begin),
@ -106,7 +106,7 @@ func (mw loggingMiddleware) DeleteLabel(ctx context.Context, name string) error
}
defer func(begin time.Time) {
_ = mw.logger.Log(
_ = mw.loggerInfo(err).Log(
"method", "DeleteLabel",
"err", err,
"user", loggedInUser,
@ -120,7 +120,7 @@ func (mw loggingMiddleware) DeleteLabel(ctx context.Context, name string) error
func (mw loggingMiddleware) GetLabelSpec(ctx context.Context, name string) (spec *kolide.LabelSpec, err error) {
defer func(begin time.Time) {
mw.logger.Log(
_ = mw.loggerDebug(err).Log(
"method", "GetLabelSpec",
"err", err,
"took", time.Since(begin),
@ -132,7 +132,7 @@ func (mw loggingMiddleware) GetLabelSpec(ctx context.Context, name string) (spec
func (mw loggingMiddleware) GetLabelSpecs(ctx context.Context) (specs []*kolide.LabelSpec, err error) {
defer func(begin time.Time) {
mw.logger.Log(
_ = mw.loggerDebug(err).Log(
"method", "GetLabelSpecs",
"err", err,
"took", time.Since(begin),
@ -153,7 +153,7 @@ func (mw loggingMiddleware) ApplyLabelSpecs(ctx context.Context, specs []*kolide
}
defer func(begin time.Time) {
mw.logger.Log(
_ = mw.loggerInfo(err).Log(
"method", "ApplyLabelSpecs",
"err", err,
"user", loggedInUser,

6
server/service/logging_options.go
View file

@ -15,7 +15,7 @@ func (mw loggingMiddleware) GetOptions(ctx context.Context) ([]kolide.Option, er
)
defer func(begin time.Time) {
mw.logger.Log(
_ = mw.loggerDebug(err).Log(
"method", "GetOptions",
"err", err,
"took", time.Since(begin),
@ -38,7 +38,7 @@ func (mw loggingMiddleware) ModifyOptions(ctx context.Context, req kolide.Option
}
defer func(begin time.Time) {
mw.logger.Log(
_ = mw.loggerInfo(err).Log(
"method", "ModifyOptions",
"err", err,
"user", loggedInUser,
@ -55,7 +55,7 @@ func (mw loggingMiddleware) ResetOptions(ctx context.Context) ([]kolide.Option,
err error
)
defer func(begin time.Time) {
mw.logger.Log(
_ = mw.loggerInfo(err).Log(
"method", "ResetOptions",
"err", err,
"took", time.Since(begin),

14
server/service/logging_osquery.go
View file

@ -17,7 +17,7 @@ func (mw loggingMiddleware) EnrollAgent(ctx context.Context, enrollSecret string
)
defer func(begin time.Time) {
_ = mw.logger.Log(
_ = mw.loggerInfo(err).Log(
"method", "EnrollAgent",
"ip_addr", ctx.Value(kithttp.ContextKeyRequestRemoteAddr).(string),
"x_for_ip_addr", ctx.Value(kithttp.ContextKeyRequestXForwardedFor).(string),
@ -37,7 +37,7 @@ func (mw loggingMiddleware) AuthenticateHost(ctx context.Context, nodeKey string
)
defer func(begin time.Time) {
_ = mw.logger.Log(
_ = mw.loggerDebug(err).Log(
"method", "AuthenticateHost",
"ip_addr", ctx.Value(kithttp.ContextKeyRequestRemoteAddr).(string),
"x_for_ip_addr", ctx.Value(kithttp.ContextKeyRequestXForwardedFor).(string),
@ -57,7 +57,7 @@ func (mw loggingMiddleware) GetClientConfig(ctx context.Context) (map[string]int
)
defer func(begin time.Time) {
_ = mw.logger.Log(
_ = mw.loggerDebug(err).Log(
"method", "GetClientConfig",
"ip_addr", ctx.Value(kithttp.ContextKeyRequestRemoteAddr).(string),
"x_for_ip_addr", ctx.Value(kithttp.ContextKeyRequestXForwardedFor).(string),
@ -78,7 +78,7 @@ func (mw loggingMiddleware) GetDistributedQueries(ctx context.Context) (map[stri
)
defer func(begin time.Time) {
_ = mw.logger.Log(
_ = mw.loggerDebug(err).Log(
"method", "GetDistributedQueries",
"ip_addr", ctx.Value(kithttp.ContextKeyRequestRemoteAddr).(string),
"x_for_ip_addr", ctx.Value(kithttp.ContextKeyRequestXForwardedFor).(string),
@ -97,7 +97,7 @@ func (mw loggingMiddleware) SubmitDistributedQueryResults(ctx context.Context, r
)
defer func(begin time.Time) {
_ = mw.logger.Log(
_ = mw.loggerDebug(err).Log(
"method", "SubmitDistributedQueryResults",
"ip_addr", ctx.Value(kithttp.ContextKeyRequestRemoteAddr).(string),
"x_for_ip_addr", ctx.Value(kithttp.ContextKeyRequestXForwardedFor).(string),
@ -116,7 +116,7 @@ func (mw loggingMiddleware) SubmitStatusLogs(ctx context.Context, logs []json.Ra
)
defer func(begin time.Time) {
_ = mw.logger.Log(
_ = mw.loggerDebug(err).Log(
"method", "SubmitStatusLogs",
"ip_addr", ctx.Value(kithttp.ContextKeyRequestRemoteAddr).(string),
"x_for_ip_addr", ctx.Value(kithttp.ContextKeyRequestXForwardedFor).(string),
@ -135,7 +135,7 @@ func (mw loggingMiddleware) SubmitResultLogs(ctx context.Context, logs []json.Ra
)
defer func(begin time.Time) {
_ = mw.logger.Log(
_ = mw.loggerDebug(err).Log(
"method", "SubmitResultLogs",
"ip_addr", ctx.Value(kithttp.ContextKeyRequestRemoteAddr).(string),
"x_for_ip_addr", ctx.Value(kithttp.ContextKeyRequestXForwardedFor).(string),

4
server/service/logging_osquery_options.go
View file

@ -10,7 +10,7 @@ import (
func (mw loggingMiddleware) GetOptionsSpec(ctx context.Context) (spec *kolide.OptionsSpec, err error) {
defer func(begin time.Time) {
mw.logger.Log(
_ = mw.loggerDebug(err).Log(
"method", "GetOptionsSpec",
"err", err,
"took", time.Since(begin),
@ -30,7 +30,7 @@ func (mw loggingMiddleware) ApplyOptionsSpec(ctx context.Context, spec *kolide.O
loggedInUser = vc.Username()
}
defer func(begin time.Time) {
mw.logger.Log(
_ = mw.loggerDebug(err).Log(
"method", "ApplyOptionsSpec",
"err", err,
"user", loggedInUser,

30
server/service/logging_packs.go
View file

@ -21,7 +21,7 @@ func (mw loggingMiddleware) NewPack(ctx context.Context, p kolide.PackPayload) (
}
defer func(begin time.Time) {
_ = mw.logger.Log(
_ = mw.loggerInfo(err).Log(
"method", "NewPack",
"err", err,
"user", loggedInUser,
@ -46,7 +46,7 @@ func (mw loggingMiddleware) ModifyPack(ctx context.Context, id uint, p kolide.Pa
}
defer func(begin time.Time) {
_ = mw.logger.Log(
_ = mw.loggerInfo(err).Log(
"method", "ModifyPack",
"err", err,
"user", loggedInUser,
@ -65,7 +65,7 @@ func (mw loggingMiddleware) ListPacks(ctx context.Context, opt kolide.ListOption
)
defer func(begin time.Time) {
_ = mw.logger.Log(
_ = mw.loggerDebug(err).Log(
"method", "ListPacks",
"err", err,
"took", time.Since(begin),
@ -83,7 +83,7 @@ func (mw loggingMiddleware) GetPack(ctx context.Context, id uint) (*kolide.Pack,
)
defer func(begin time.Time) {
_ = mw.logger.Log(
_ = mw.loggerDebug(err).Log(
"method", "GetPack",
"err", err,
"took", time.Since(begin),
@ -106,7 +106,7 @@ func (mw loggingMiddleware) DeletePack(ctx context.Context, name string) error {
}
defer func(begin time.Time) {
_ = mw.logger.Log(
_ = mw.loggerInfo(err).Log(
"method", "DeletePack",
"err", err,
"user", loggedInUser,
@ -123,7 +123,7 @@ func (mw loggingMiddleware) AddLabelToPack(ctx context.Context, lid uint, pid ui
)
defer func(begin time.Time) {
_ = mw.logger.Log(
_ = mw.loggerInfo(err).Log(
"method", "AddLabelToPack",
"err", err,
"took", time.Since(begin),
@ -140,7 +140,7 @@ func (mw loggingMiddleware) RemoveLabelFromPack(ctx context.Context, lid uint, p
)
defer func(begin time.Time) {
_ = mw.logger.Log(
_ = mw.loggerInfo(err).Log(
"method", "RemoveLabelFromPack",
"err", err,
"took", time.Since(begin),
@ -158,7 +158,7 @@ func (mw loggingMiddleware) ListLabelsForPack(ctx context.Context, pid uint) ([]
)
defer func(begin time.Time) {
_ = mw.logger.Log(
_ = mw.loggerDebug(err).Log(
"method", "ListLabelsForPack",
"err", err,
"took", time.Since(begin),
@ -175,7 +175,7 @@ func (mw loggingMiddleware) AddHostToPack(ctx context.Context, hid uint, pid uin
)
defer func(begin time.Time) {
_ = mw.logger.Log(
_ = mw.loggerInfo(err).Log(
"method", "AddHostToPack",
"err", err,
"took", time.Since(begin),
@ -192,7 +192,7 @@ func (mw loggingMiddleware) RemoveHostFromPack(ctx context.Context, hid uint, pi
)
defer func(begin time.Time) {
_ = mw.logger.Log(
_ = mw.loggerInfo(err).Log(
"method", "RemoveHostFromPack",
"err", err,
"took", time.Since(begin),
@ -210,7 +210,7 @@ func (mw loggingMiddleware) ListPacksForHost(ctx context.Context, hid uint) ([]*
)
defer func(begin time.Time) {
_ = mw.logger.Log(
_ = mw.loggerDebug(err).Log(
"method", "ListPacksForHost",
"err", err,
"took", time.Since(begin),
@ -228,7 +228,7 @@ func (mw loggingMiddleware) ListHostsInPack(ctx context.Context, pid uint, opt k
)
defer func(begin time.Time) {
_ = mw.logger.Log(
_ = mw.loggerDebug(err).Log(
"method", "ListHostsInPack",
"err", err,
"took", time.Since(begin),
@ -241,7 +241,7 @@ func (mw loggingMiddleware) ListHostsInPack(ctx context.Context, pid uint, opt k
func (mw loggingMiddleware) GetPackSpec(ctx context.Context, name string) (spec *kolide.PackSpec, err error) {
defer func(begin time.Time) {
mw.logger.Log(
_ = mw.loggerDebug(err).Log(
"method", "GetPackSpec",
"err", err,
"took", time.Since(begin),
@ -253,7 +253,7 @@ func (mw loggingMiddleware) GetPackSpec(ctx context.Context, name string) (spec
func (mw loggingMiddleware) GetPackSpecs(ctx context.Context) (specs []*kolide.PackSpec, err error) {
defer func(begin time.Time) {
mw.logger.Log(
_ = mw.loggerDebug(err).Log(
"method", "GetPackSpecs",
"err", err,
"took", time.Since(begin),
@ -274,7 +274,7 @@ func (mw loggingMiddleware) ApplyPackSpecs(ctx context.Context, specs []*kolide.
}
defer func(begin time.Time) {
_ = mw.logger.Log(
_ = mw.loggerInfo(err).Log(
"method", "ApplyPackSpecs",
"err", err,
"user", loggedInUser,

16
server/service/logging_queries.go
View file

@ -10,7 +10,7 @@ import (
func (mw loggingMiddleware) GetQuerySpec(ctx context.Context, name string) (spec *kolide.QuerySpec, err error) {
defer func(begin time.Time) {
mw.logger.Log(
_ = mw.loggerDebug(err).Log(
"method", "GetQuerySpec",
"err", err,
"took", time.Since(begin),
@ -22,7 +22,7 @@ func (mw loggingMiddleware) GetQuerySpec(ctx context.Context, name string) (spec
func (mw loggingMiddleware) GetQuerySpecs(ctx context.Context) (specs []*kolide.QuerySpec, err error) {
defer func(begin time.Time) {
mw.logger.Log(
_ = mw.loggerDebug(err).Log(
"method", "GetQuerySpecs",
"err", err,
"took", time.Since(begin),
@ -34,7 +34,7 @@ func (mw loggingMiddleware) GetQuerySpecs(ctx context.Context) (specs []*kolide.
func (mw loggingMiddleware) ApplyQuerySpecs(ctx context.Context, specs []*kolide.QuerySpec) (err error) {
defer func(begin time.Time) {
mw.logger.Log(
_ = mw.loggerDebug(err).Log(
"method", "ApplyQuerySpecs",
"err", err,
"took", time.Since(begin),
@ -54,7 +54,7 @@ func (mw loggingMiddleware) ListQueries(ctx context.Context, opt kolide.ListOpti
loggedInUser = vc.Username()
}
defer func(begin time.Time) {
mw.logger.Log(
_ = mw.loggerDebug(err).Log(
"method", "ListQueries",
"err", err,
"user", loggedInUser,
@ -74,7 +74,7 @@ func (mw loggingMiddleware) GetQuery(ctx context.Context, id uint) (*kolide.Quer
loggedInUser = vc.Username()
}
defer func(begin time.Time) {
mw.logger.Log(
_ = mw.loggerDebug(err).Log(
"method", "GetQuery",
"err", err,
"user", loggedInUser,
@ -95,7 +95,7 @@ func (mw loggingMiddleware) NewQuery(ctx context.Context, p kolide.QueryPayload)
loggedInUser = vc.Username()
}
defer func(begin time.Time) {
mw.logger.Log(
_ = mw.loggerInfo(err).Log(
"method", "NewQuery",
"err", err,
"user", loggedInUser,
@ -118,7 +118,7 @@ func (mw loggingMiddleware) ModifyQuery(ctx context.Context, id uint, p kolide.Q
loggedInUser = vc.Username()
}
defer func(begin time.Time) {
mw.logger.Log(
_ = mw.loggerInfo(err).Log(
"method", "ModifyQuery",
"err", err,
"user", loggedInUser,
@ -140,7 +140,7 @@ func (mw loggingMiddleware) DeleteQuery(ctx context.Context, name string) error
loggedInUser = vc.Username()
}
defer func(begin time.Time) {
mw.logger.Log(
_ = mw.loggerInfo(err).Log(
"method", "DeleteQuery",
"err", err,
"name", name,

10
server/service/logging_scheduled_queries.go
View file

@ -15,7 +15,7 @@ func (mw loggingMiddleware) GetScheduledQueriesInPack(ctx context.Context, id ui
)
defer func(begin time.Time) {
_ = mw.logger.Log(
_ = mw.loggerDebug(err).Log(
"method", "GetScheduledQueriesInPack",
"err", err,
"took", time.Since(begin),
@ -33,7 +33,7 @@ func (mw loggingMiddleware) GetScheduledQuery(ctx context.Context, id uint) (*ko
)
defer func(begin time.Time) {
_ = mw.logger.Log(
_ = mw.loggerDebug(err).Log(
"method", "GetScheduledQuery",
"err", err,
"took", time.Since(begin),
@ -58,7 +58,7 @@ func (mw loggingMiddleware) ScheduleQuery(ctx context.Context, sq *kolide.Schedu
}
defer func(begin time.Time) {
_ = mw.logger.Log(
_ = mw.loggerInfo(err).Log(
"method", "ScheduleQuery",
"err", err,
"user", loggedInUser,
@ -82,7 +82,7 @@ func (mw loggingMiddleware) DeleteScheduledQuery(ctx context.Context, id uint) e
}
defer func(begin time.Time) {
_ = mw.logger.Log(
_ = mw.loggerInfo(err).Log(
"method", "DeleteScheduledQuery",
"err", err,
"user", loggedInUser,
@ -107,7 +107,7 @@ func (mw loggingMiddleware) ModifyScheduledQuery(ctx context.Context, id uint, p
}
defer func(begin time.Time) {
_ = mw.logger.Log(
_ = mw.loggerInfo(err).Log(
"method", "ModifyScheduledQuery",
"err", err,
"user", loggedInUser,

10
server/service/logging_sessions.go
View file

@ -10,7 +10,7 @@ import (
func (mw loggingMiddleware) Login(ctx context.Context, username, password string) (user *kolide.User, token string, err error) {
defer func(begin time.Time) {
_ = mw.logger.Log(
_ = mw.loggerInfo(err).Log(
"method", "Login",
"user", username,
"err", err,
@ -24,7 +24,7 @@ func (mw loggingMiddleware) Login(ctx context.Context, username, password string
func (mw loggingMiddleware) Logout(ctx context.Context) (err error) {
defer func(begin time.Time) {
_ = mw.logger.Log(
_ = mw.loggerInfo(err).Log(
"method", "Logout",
"err", err,
"took", time.Since(begin),
@ -37,7 +37,7 @@ func (mw loggingMiddleware) Logout(ctx context.Context) (err error) {
func (mw loggingMiddleware) InitiateSSO(ctx context.Context, relayURL string) (idpURL string, err error) {
defer func(begin time.Time) {
_ = mw.logger.Log(
_ = mw.loggerInfo(err).Log(
"method", "InitiateSSO",
"err", err,
"took", time.Since(begin),
@ -50,7 +50,7 @@ func (mw loggingMiddleware) InitiateSSO(ctx context.Context, relayURL string) (i
func (mw loggingMiddleware) CallbackSSO(ctx context.Context, auth kolide.Auth) (sess *kolide.SSOSession, err error) {
defer func(begin time.Time) {
_ = mw.logger.Log(
_ = mw.loggerInfo(err).Log(
"method", "CallbackSSO",
"err", err,
"took", time.Since(begin),
@ -62,7 +62,7 @@ func (mw loggingMiddleware) CallbackSSO(ctx context.Context, auth kolide.Auth) (
func (mw loggingMiddleware) SSOSettings(ctx context.Context) (settings *kolide.SSOSettings, err error) {
defer func(begin time.Time) {
_ = mw.logger.Log(
_ = mw.loggerInfo(err).Log(
"method", "SSOSettings",
"err", err,
"took", time.Since(begin),

26
server/service/logging_users.go
View file

@ -22,7 +22,7 @@ func (mw loggingMiddleware) ChangeUserAdmin(ctx context.Context, id uint, isAdmi
}
defer func(begin time.Time) {
_ = mw.logger.Log(
_ = mw.loggerInfo(err).Log(
"method", "ChangeUserAdmin",
"user", userName,
"changed_by", loggedInUser,
@ -53,7 +53,7 @@ func (mw loggingMiddleware) ChangeUserEnabled(ctx context.Context, id uint, isEn
}
defer func(begin time.Time) {
_ = mw.logger.Log(
_ = mw.loggerInfo(err).Log(
"method", "ChangeUserEnabled",
"user", userName,
"changed_by", loggedInUser,
@ -84,7 +84,7 @@ func (mw loggingMiddleware) NewAdminCreatedUser(ctx context.Context, p kolide.Us
}
defer func(begin time.Time) {
_ = mw.logger.Log(
_ = mw.loggerInfo(err).Log(
"method", "NewAdminCreatedUser",
"user", username,
"created_by", loggedInUser,
@ -113,7 +113,7 @@ func (mw loggingMiddleware) ListUsers(ctx context.Context, opt kolide.ListOption
}
defer func(begin time.Time) {
_ = mw.logger.Log(
_ = mw.loggerInfo(err).Log(
"method", "ListUsers",
"user", username,
"err", err,
@ -138,7 +138,7 @@ func (mw loggingMiddleware) RequirePasswordReset(ctx context.Context, uid uint,
}
defer func(begin time.Time) {
_ = mw.logger.Log(
_ = mw.loggerInfo(err).Log(
"method", "RequirePasswordReset",
"user", username,
"err", err,
@ -165,7 +165,7 @@ func (mw loggingMiddleware) NewUser(ctx context.Context, p kolide.UserPayload) (
}
defer func(begin time.Time) {
_ = mw.logger.Log(
_ = mw.loggerInfo(err).Log(
"method", "NewUser",
"user", username,
"created_by", loggedInUser,
@ -195,7 +195,7 @@ func (mw loggingMiddleware) ModifyUser(ctx context.Context, userID uint, p kolid
}
defer func(begin time.Time) {
_ = mw.logger.Log(
_ = mw.loggerInfo(err).Log(
"method", "ModifyUser",
"user", username,
"modified_by", vc.Username(),
@ -221,7 +221,7 @@ func (mw loggingMiddleware) User(ctx context.Context, id uint) (*kolide.User, er
)
defer func(begin time.Time) {
_ = mw.logger.Log(
_ = mw.loggerInfo(err).Log(
"method", "User",
"user", username,
"err", err,
@ -245,7 +245,7 @@ func (mw loggingMiddleware) AuthenticatedUser(ctx context.Context) (*kolide.User
)
defer func(begin time.Time) {
_ = mw.logger.Log(
_ = mw.loggerInfo(err).Log(
"method", "User",
"user", username,
"err", err,
@ -272,7 +272,7 @@ func (mw loggingMiddleware) ChangePassword(ctx context.Context, oldPass, newPass
}
defer func(begin time.Time) {
_ = mw.logger.Log(
_ = mw.loggerInfo(err).Log(
"method", "ChangePassword",
"err", err,
"requested_by", requestedBy,
@ -288,7 +288,7 @@ func (mw loggingMiddleware) ResetPassword(ctx context.Context, token, password s
var err error
defer func(begin time.Time) {
_ = mw.logger.Log(
_ = mw.loggerInfo(err).Log(
"method", "ResetPassword",
"err", err,
"took", time.Since(begin),
@ -310,7 +310,7 @@ func (mw loggingMiddleware) RequestPasswordReset(ctx context.Context, email stri
}
defer func(begin time.Time) {
_ = mw.logger.Log(
_ = mw.loggerInfo(err).Log(
"method", "RequestPasswordReset",
"email", email,
"err", err,
@ -333,7 +333,7 @@ func (mw loggingMiddleware) PerformRequiredPasswordReset(ctx context.Context, pa
resetBy = vc.Username()
}
defer func(begin time.Time) {
_ = mw.logger.Log(
_ = mw.loggerInfo(err).Log(
"method", "PerformRequiredPasswordReset",
"err", err,
"reset_by", resetBy,