mirror of https://github.com/sirupsen/logrus.git
Removing logstash formatter
This commit is contained in:
parent
f3cfb454f4
commit
4ee95f9462
|
@ -306,14 +306,10 @@ The built-in logging formatters are:
|
||||||
field to `true`. To force no colored output even if there is a TTY set the
|
field to `true`. To force no colored output even if there is a TTY set the
|
||||||
`DisableColors` field to `true`
|
`DisableColors` field to `true`
|
||||||
* `logrus.JSONFormatter`. Logs fields as JSON.
|
* `logrus.JSONFormatter`. Logs fields as JSON.
|
||||||
* `logrus/formatters/logstash.LogstashFormatter`. Logs fields as [Logstash](http://logstash.net) Events.
|
|
||||||
|
|
||||||
```go
|
|
||||||
logrus.SetFormatter(&logstash.LogstashFormatter{Type: "application_name"})
|
|
||||||
```
|
|
||||||
|
|
||||||
Third party logging formatters:
|
Third party logging formatters:
|
||||||
|
|
||||||
|
* [`logstash`](https://github.com/bshuster-repo/logrus-logstash-hook). Logs fields as [Logstash](http://logstash.net) Events.
|
||||||
* [`prefixed`](https://github.com/x-cray/logrus-prefixed-formatter). Displays log entry source along with alternative layout.
|
* [`prefixed`](https://github.com/x-cray/logrus-prefixed-formatter). Displays log entry source along with alternative layout.
|
||||||
* [`zalgo`](https://github.com/aybabtme/logzalgo). Invoking the P͉̫o̳̼̊w̖͈̰͎e̬͔̭͂r͚̼̹̲ ̫͓͉̳͈ō̠͕͖̚f̝͍̠ ͕̲̞͖͑Z̖̫̤̫ͪa͉̬͈̗l͖͎g̳̥o̰̥̅!̣͔̲̻͊̄ ̙̘̦̹̦.
|
* [`zalgo`](https://github.com/aybabtme/logzalgo). Invoking the P͉̫o̳̼̊w̖͈̰͎e̬͔̭͂r͚̼̹̲ ̫͓͉̳͈ō̠͕͖̚f̝͍̠ ͕̲̞͖͑Z̖̫̤̫ͪa͉̬͈̗l͖͎g̳̥o̰̥̅!̣͔̲̻͊̄ ̙̘̦̹̦.
|
||||||
|
|
||||||
|
|
|
@ -1,63 +0,0 @@
|
||||||
package logstash
|
|
||||||
|
|
||||||
import (
|
|
||||||
"encoding/json"
|
|
||||||
"fmt"
|
|
||||||
|
|
||||||
"github.com/Sirupsen/logrus"
|
|
||||||
)
|
|
||||||
|
|
||||||
// Formatter generates json in logstash format.
|
|
||||||
// Logstash site: http://logstash.net/
|
|
||||||
type LogstashFormatter struct {
|
|
||||||
Type string // if not empty use for logstash type field.
|
|
||||||
|
|
||||||
// TimestampFormat sets the format used for timestamps.
|
|
||||||
TimestampFormat string
|
|
||||||
}
|
|
||||||
|
|
||||||
func (f *LogstashFormatter) Format(entry *logrus.Entry) ([]byte, error) {
|
|
||||||
fields := make(logrus.Fields)
|
|
||||||
for k, v := range entry.Data {
|
|
||||||
fields[k] = v
|
|
||||||
}
|
|
||||||
|
|
||||||
fields["@version"] = 1
|
|
||||||
|
|
||||||
timeStampFormat := f.TimestampFormat
|
|
||||||
|
|
||||||
if timeStampFormat == "" {
|
|
||||||
timeStampFormat = logrus.DefaultTimestampFormat
|
|
||||||
}
|
|
||||||
|
|
||||||
fields["@timestamp"] = entry.Time.Format(timeStampFormat)
|
|
||||||
|
|
||||||
// set message field
|
|
||||||
v, ok := entry.Data["message"]
|
|
||||||
if ok {
|
|
||||||
fields["fields.message"] = v
|
|
||||||
}
|
|
||||||
fields["message"] = entry.Message
|
|
||||||
|
|
||||||
// set level field
|
|
||||||
v, ok = entry.Data["level"]
|
|
||||||
if ok {
|
|
||||||
fields["fields.level"] = v
|
|
||||||
}
|
|
||||||
fields["level"] = entry.Level.String()
|
|
||||||
|
|
||||||
// set type field
|
|
||||||
if f.Type != "" {
|
|
||||||
v, ok = entry.Data["type"]
|
|
||||||
if ok {
|
|
||||||
fields["fields.type"] = v
|
|
||||||
}
|
|
||||||
fields["type"] = f.Type
|
|
||||||
}
|
|
||||||
|
|
||||||
serialized, err := json.Marshal(fields)
|
|
||||||
if err != nil {
|
|
||||||
return nil, fmt.Errorf("Failed to marshal fields to JSON, %v", err)
|
|
||||||
}
|
|
||||||
return append(serialized, '\n'), nil
|
|
||||||
}
|
|
|
@ -1,52 +0,0 @@
|
||||||
package logstash
|
|
||||||
|
|
||||||
import (
|
|
||||||
"bytes"
|
|
||||||
"encoding/json"
|
|
||||||
"github.com/Sirupsen/logrus"
|
|
||||||
"github.com/stretchr/testify/assert"
|
|
||||||
"testing"
|
|
||||||
)
|
|
||||||
|
|
||||||
func TestLogstashFormatter(t *testing.T) {
|
|
||||||
assert := assert.New(t)
|
|
||||||
|
|
||||||
lf := LogstashFormatter{Type: "abc"}
|
|
||||||
|
|
||||||
fields := logrus.Fields{
|
|
||||||
"message": "def",
|
|
||||||
"level": "ijk",
|
|
||||||
"type": "lmn",
|
|
||||||
"one": 1,
|
|
||||||
"pi": 3.14,
|
|
||||||
"bool": true,
|
|
||||||
}
|
|
||||||
|
|
||||||
entry := logrus.WithFields(fields)
|
|
||||||
entry.Message = "msg"
|
|
||||||
entry.Level = logrus.InfoLevel
|
|
||||||
|
|
||||||
b, _ := lf.Format(entry)
|
|
||||||
|
|
||||||
var data map[string]interface{}
|
|
||||||
dec := json.NewDecoder(bytes.NewReader(b))
|
|
||||||
dec.UseNumber()
|
|
||||||
dec.Decode(&data)
|
|
||||||
|
|
||||||
// base fields
|
|
||||||
assert.Equal(json.Number("1"), data["@version"])
|
|
||||||
assert.NotEmpty(data["@timestamp"])
|
|
||||||
assert.Equal("abc", data["type"])
|
|
||||||
assert.Equal("msg", data["message"])
|
|
||||||
assert.Equal("info", data["level"])
|
|
||||||
|
|
||||||
// substituted fields
|
|
||||||
assert.Equal("def", data["fields.message"])
|
|
||||||
assert.Equal("ijk", data["fields.level"])
|
|
||||||
assert.Equal("lmn", data["fields.type"])
|
|
||||||
|
|
||||||
// formats
|
|
||||||
assert.Equal(json.Number("1"), data["one"])
|
|
||||||
assert.Equal(json.Number("3.14"), data["pi"])
|
|
||||||
assert.Equal(true, data["bool"])
|
|
||||||
}
|
|
Loading…
Reference in New Issue