diff --git a/go.mod b/go.mod index 9d6fb4626bb..00260f338dc 100644 --- a/go.mod +++ b/go.mod @@ -11,7 +11,7 @@ require ( github.com/Azure/azure-sdk-for-go/sdk/azidentity v1.13.0 github.com/Azure/azure-sdk-for-go/sdk/storage/azblob v1.6.3 github.com/aws/aws-sdk-go v1.55.8 - github.com/bshuster-repo/logrus-logstash-hook v1.0.0 + github.com/bshuster-repo/logrus-logstash-hook v1.1.0 github.com/coreos/go-systemd/v22 v22.6.0 github.com/distribution/reference v0.5.0 github.com/docker/go-events v0.0.0-20250808211157-605354379745 diff --git a/go.sum b/go.sum index ec9e38e7685..b2f297ae3a0 100644 --- a/go.sum +++ b/go.sum @@ -54,8 +54,8 @@ github.com/beorn7/perks v0.0.0-20180321164747-3a771d992973/go.mod h1:Dwedo/Wpr24 github.com/beorn7/perks v1.0.0/go.mod h1:KWe93zE9D1o94FZ5RNwFwVgaQK1VOXiVxmqh+CedLV8= github.com/beorn7/perks v1.0.1 h1:VlbKKnNfV8bJzeqoa4cOKqO6bYr3WgKZxO8Z16+hsOM= github.com/beorn7/perks v1.0.1/go.mod h1:G2ZrVWU2WbWT9wwq4/hrbKbnv/1ERSJQ0ibhJ6rlkpw= -github.com/bshuster-repo/logrus-logstash-hook v1.0.0 h1:e+C0SB5R1pu//O4MQ3f9cFuPGoOVeF2fE4Og9otCc70= -github.com/bshuster-repo/logrus-logstash-hook v1.0.0/go.mod h1:zsTqEiSzDgAa/8GZR7E1qaXrhYNDKBYy5/dWPTIflbk= +github.com/bshuster-repo/logrus-logstash-hook v1.1.0 h1:o2FzZifLg+z/DN1OFmzTWzZZx/roaqt8IPZCIVco8r4= +github.com/bshuster-repo/logrus-logstash-hook v1.1.0/go.mod h1:Q2aXOe7rNuPgbBtPCOzYyWDvKX7+FpxE5sRdvcPoui0= github.com/bsm/ginkgo/v2 v2.7.0/go.mod h1:AiKlXPm7ItEHNc/2+OkrNG4E0ITzojb9/xWzvQ9XZ9w= github.com/bsm/ginkgo/v2 v2.9.5 h1:rtVBYPs3+TC5iLUVOis1B9tjLTup7Cj5IfzosKtvTJ0= github.com/bsm/ginkgo/v2 v2.9.5/go.mod h1:SwYbGRRDovPVboqFv0tPTcG1sN61LM1Z4ARdbAV9g4c= @@ -213,6 +213,7 @@ github.com/rogpeppe/go-internal v1.13.1 h1:KvO1DLK/DRN07sQ1LQKScxyZJuNnedQ5/wKSR github.com/rogpeppe/go-internal v1.13.1/go.mod h1:uMEvuHeurkdAXX61udpOXGD/AzZDWNMNyH2VO9fmH0o= github.com/russross/blackfriday/v2 v2.1.0/go.mod h1:+Rmxgy9KzJVeS9/2gXHxylqXiyQDYRxCVz55jmeOWTM= github.com/sirupsen/logrus v1.2.0/go.mod h1:LxeOpSwHxABJmUn/MG1IvRgCAasNZTLOkJPxbbu5VWo= +github.com/sirupsen/logrus v1.8.1/go.mod h1:yWOB1SBYBC5VeMP7gHvWumXLIWorT60ONWic61uBYv0= github.com/sirupsen/logrus v1.9.3 h1:dueUQJ1C2q9oE3F7wvmSGAaVtTmUizReu6fjN8uqzbQ= github.com/sirupsen/logrus v1.9.3/go.mod h1:naHLuLoDiP4jHNo9R0sCBMtWGeIprob74mVsIT4qYEQ= github.com/spf13/cobra v1.8.0 h1:7aJaZx1B85qltLMc546zn58BxxfZdR/W22ej9CFoEf0= @@ -301,6 +302,7 @@ golang.org/x/sys v0.0.0-20180905080454-ebe1bf3edb33/go.mod h1:STP8DvDyc/dI5b8T5h golang.org/x/sys v0.0.0-20181116152217-5ac8a444bdc5/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= golang.org/x/sys v0.0.0-20190801041406-cbf593c0f2f3/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20191026070338-33540a1f6037/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20201119102817-f84b799fce68/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20210615035016-665e8c7367d1/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20220520151302-bc2c85ada10a/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= diff --git a/vendor/github.com/bshuster-repo/logrus-logstash-hook/.travis.yml b/vendor/github.com/bshuster-repo/logrus-logstash-hook/.travis.yml deleted file mode 100644 index 0df15979ad5..00000000000 --- a/vendor/github.com/bshuster-repo/logrus-logstash-hook/.travis.yml +++ /dev/null @@ -1,16 +0,0 @@ -language: go -sudo: false - -go: - - "1.11.x" - - "1.12.x" - - "tip" - -install: - - # Skip - -script: - - go get -t -v ./... - - diff -u <(echo -n) <(gofmt -d .) - - go vet . - - go test -v -race ./... diff --git a/vendor/github.com/bshuster-repo/logrus-logstash-hook/README.md b/vendor/github.com/bshuster-repo/logrus-logstash-hook/README.md index f5cf16382f3..44e69628c3a 100644 --- a/vendor/github.com/bshuster-repo/logrus-logstash-hook/README.md +++ b/vendor/github.com/bshuster-repo/logrus-logstash-hook/README.md @@ -47,11 +47,18 @@ This is how it will look like: } ``` +# FAQ +Q: I would like to add characters to each line before sending to Logstash? +A: Logrustash gives you the ability to mutate the message before sending it to Logstash. Just follow [this example](https://github.com/bshuster-repo/logrus-logstash-hook/issues/60#issuecomment-604948272). + +Q: Is there a way to maintain the connection when it drops +A: It's recommended to use [GoAutoSocket](https://github.com/firstrow/goautosocket) for that. See [here](https://github.com/bshuster-repo/logrus-logstash-hook/issues/48#issuecomment-361938249) how it can be done. + # Maintainers -Name | Github | Twitter | ------------- | --------- | ---------- | -Boaz Shuster | ripcurld0 | @ripcurld0 | +Name | Github | +------------ | --------- | +Boaz Shuster | boaz0 | # License diff --git a/vendor/github.com/bshuster-repo/logrus-logstash-hook/hook.go b/vendor/github.com/bshuster-repo/logrus-logstash-hook/hook.go index cd229a75ea7..d628af630c5 100644 --- a/vendor/github.com/bshuster-repo/logrus-logstash-hook/hook.go +++ b/vendor/github.com/bshuster-repo/logrus-logstash-hook/hook.go @@ -1,8 +1,10 @@ package logrustash import ( + "fmt" "io" "sync" + "time" "github.com/sirupsen/logrus" ) @@ -12,7 +14,6 @@ import ( // formatter to format the entry to a Logstash format before sending. // // To initialize it use the `New` function. -// type Hook struct { writer io.Writer formatter logrus.Formatter @@ -64,6 +65,12 @@ func copyEntry(e *logrus.Entry, fields logrus.Fields) *logrus.Entry { ne.Level = e.Level ne.Time = e.Time ne.Data = logrus.Fields{} + + if e.HasCaller() { + ne.Data["function"] = e.Caller.Function + ne.Data["file"] = fmt.Sprintf("%s:%d", e.Caller.File, e.Caller.Line) + } + for k, v := range fields { ne.Data[k] = v } @@ -110,8 +117,11 @@ func DefaultFormatter(fields logrus.Fields) logrus.Formatter { } return LogstashFormatter{ - Formatter: &logrus.JSONFormatter{FieldMap: logstashFieldMap}, - Fields: fields, + Formatter: &logrus.JSONFormatter{ + FieldMap: logstashFieldMap, + TimestampFormat: time.RFC3339Nano, + }, + Fields: fields, } } diff --git a/vendor/modules.txt b/vendor/modules.txt index 450eb0a5dd8..e22041bb80a 100644 --- a/vendor/modules.txt +++ b/vendor/modules.txt @@ -189,8 +189,8 @@ github.com/aws/aws-sdk-go/service/sts/stsiface # github.com/beorn7/perks v1.0.1 ## explicit; go 1.11 github.com/beorn7/perks/quantile -# github.com/bshuster-repo/logrus-logstash-hook v1.0.0 -## explicit +# github.com/bshuster-repo/logrus-logstash-hook v1.1.0 +## explicit; go 1.16 github.com/bshuster-repo/logrus-logstash-hook # github.com/cenkalti/backoff/v4 v4.2.1 ## explicit; go 1.18