dom
/
telegraf
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Graylog output should set short_message field 

closes #2045
This commit is contained in:
Cameron Sparr 2016-12-13 16:10:59 +00:00
parent b78859b331
commit c4c13c4e90
3 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
CHANGELOG.md
View File

@ -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. - [#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. - [#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). - [#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] ## v1.1.2 [2016-12-12]

2
plugins/outputs/graylog/README.md
View File

@ -9,6 +9,6 @@ It requires a `servers` name.
```toml ```toml
# Send telegraf metrics to graylog(s) # Send telegraf metrics to graylog(s)
[[outputs.graylog]] [[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"] servers = ["127.0.0.1:12201", "192.168.1.1:12201"]
``` ```

4
plugins/outputs/graylog/graylog.go
View File

@ -154,7 +154,7 @@ type Graylog struct {
} }
var sampleConfig = ` 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"] servers = ["127.0.0.1:12201", "192.168.1.1:12201"]
` `
@ -213,7 +213,7 @@ func serialize(metric telegraf.Metric) ([]string, error) {
m := make(map[string]interface{}) m := make(map[string]interface{})
m["version"] = "1.1" m["version"] = "1.1"
m["timestamp"] = metric.UnixNano() / 1000000000 m["timestamp"] = metric.UnixNano() / 1000000000
m["short_message"] = " " m["short_message"] = "telegraf"
m["name"] = metric.Name() m["name"] = metric.Name()
if host, ok := metric.Tags()["host"]; ok { if host, ok := metric.Tags()["host"]; ok {