Discharge7443/fleet
1
0
Fork 0
Code Issues Pull Requests Actions 5 Packages Projects Releases Wiki Activity

Revert "add remote ip address to service logs (#1635)" (#1651)

Browse Source 
This reverts commit 11707132bd.
This commit is contained in:
Mike Arpaia
2017-11-27 17:56:09 -05:00
committed by Victor Vrantchan
parent 63d60d5f6a
commit edca82eaf2
2 changed files with 0 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
server/service/handler.go
-1
View File
@@ -334,7 +334,6 @@ func makeKolideKitHandlers(e KolideEndpoints, opts []kithttp.ServerOption) *koli
func MakeHandler(svc kolide.Service, jwtKey string, logger kitlog.Logger) http.Handler {
kolideAPIOptions := []kithttp.ServerOption{
kithttp.ServerBefore(
kithttp.PopulateRequestContext, // populate the request context with common fields
setRequestsContexts(svc, jwtKey),
),
kithttp.ServerErrorLogger(logger),
server/service/logging_osquery.go
-8
View File
@@ -5,7 +5,6 @@ import (
"encoding/json"
"time"
kithttp "github.com/go-kit/kit/transport/http"
"github.com/kolide/fleet/server/kolide"
)
@@ -18,7 +17,6 @@ func (mw loggingMiddleware) EnrollAgent(ctx context.Context, enrollSecret string
defer func(begin time.Time) {
_ = mw.logger.Log(
"method", "EnrollAgent",
"ip_addr", ctx.Value(kithttp.ContextKeyRequestRemoteAddr).(string),
"err", err,
"took", time.Since(begin),
)
@@ -37,7 +35,6 @@ func (mw loggingMiddleware) AuthenticateHost(ctx context.Context, nodeKey string
defer func(begin time.Time) {
_ = mw.logger.Log(
"method", "AuthenticateHost",
"ip_addr", ctx.Value(kithttp.ContextKeyRequestRemoteAddr).(string),
"err", err,
"took", time.Since(begin),
)
@@ -56,7 +53,6 @@ func (mw loggingMiddleware) GetClientConfig(ctx context.Context) (*kolide.Osquer
defer func(begin time.Time) {
_ = mw.logger.Log(
"method", "GetClientConfig",
"ip_addr", ctx.Value(kithttp.ContextKeyRequestRemoteAddr).(string),
"err", err,
"took", time.Since(begin),
)
@@ -76,7 +72,6 @@ func (mw loggingMiddleware) GetDistributedQueries(ctx context.Context) (map[stri
defer func(begin time.Time) {
_ = mw.logger.Log(
"method", "GetDistributedQueries",
"ip_addr", ctx.Value(kithttp.ContextKeyRequestRemoteAddr).(string),
"err", err,
"took", time.Since(begin),
)
@@ -94,7 +89,6 @@ func (mw loggingMiddleware) SubmitDistributedQueryResults(ctx context.Context, r
defer func(begin time.Time) {
_ = mw.logger.Log(
"method", "SubmitDistributedQueryResults",
"ip_addr", ctx.Value(kithttp.ContextKeyRequestRemoteAddr).(string),
"err", err,
"took", time.Since(begin),
)
@@ -112,7 +106,6 @@ func (mw loggingMiddleware) SubmitStatusLogs(ctx context.Context, logs []kolide.
defer func(begin time.Time) {
_ = mw.logger.Log(
"method", "SubmitStatusLogs",
"ip_addr", ctx.Value(kithttp.ContextKeyRequestRemoteAddr).(string),
"err", err,
"took", time.Since(begin),
)
@@ -130,7 +123,6 @@ func (mw loggingMiddleware) SubmitResultLogs(ctx context.Context, logs []json.Ra
defer func(begin time.Time) {
_ = mw.logger.Log(
"method", "SubmitResultLogs",
"ip_addr", ctx.Value(kithttp.ContextKeyRequestRemoteAddr).(string),
"err", err,
"took", time.Since(begin),
)