Skip to content

Commit

Permalink
Graylog output should set short_message field
Browse files Browse the repository at this point in the history
  • Loading branch information
sparrc committed Dec 13, 2016
1 parent 8a4ab36 commit 5f06bd2
Show file tree
Hide file tree
Showing 3 changed files with 4 additions and 3 deletions.
1 change: 1 addition & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,7 @@
- [#1843](https://github.com/influxdata/telegraf/pull/1843) & [#1668](https://github.com/influxdata/telegraf/issues/1668): Add optional ability to define PID as a tag.
- [#1730](https://github.com/influxdata/telegraf/issues/1730): Fix win_perf_counters not gathering non-English counters.
- [#2061](https://github.com/influxdata/telegraf/issues/2061): Fix panic when file stat info cannot be collected due to permissions or other issue(s).
- [#2045](https://github.com/influxdata/telegraf/issues/2045): Graylog output should set short_message field.

## v1.1.2 [2016-12-12]

Expand Down
2 changes: 1 addition & 1 deletion plugins/outputs/graylog/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,6 @@ It requires a `servers` name.
```toml
# Send telegraf metrics to graylog(s)
[[outputs.graylog]]
## Udp endpoint for your graylog instance.
## UDP endpoint for your graylog instance(s).
servers = ["127.0.0.1:12201", "192.168.1.1:12201"]
```
4 changes: 2 additions & 2 deletions plugins/outputs/graylog/graylog.go
Original file line number Diff line number Diff line change
Expand Up @@ -154,7 +154,7 @@ type Graylog struct {
}

var sampleConfig = `
## Udp endpoint for your graylog instance.
## UDP endpoint for your graylog instance.
servers = ["127.0.0.1:12201", "192.168.1.1:12201"]
`

Expand Down Expand Up @@ -213,7 +213,7 @@ func serialize(metric telegraf.Metric) ([]string, error) {
m := make(map[string]interface{})
m["version"] = "1.1"
m["timestamp"] = metric.UnixNano() / 1000000000
m["short_message"] = " "
m["short_message"] = "telegraf"
m["name"] = metric.Name()

if host, ok := metric.Tags()["host"]; ok {
Expand Down

0 comments on commit 5f06bd2

Please sign in to comment.