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

Merge branch 'master' of https://github.com/bagelswitch/telegraf

This commit is contained in:
ncohensm 2016-07-08 09:55:52 -07:00
parent 6da73ded58 bb093638e9
commit 7843c3a3dd
4 changed files with 10 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.gitignore vendored
View File

@ -1,3 +1,4 @@
build
tivan tivan
.vagrant .vagrant
/telegraf /telegraf

1
CHANGELOG.md
View File

@ -37,6 +37,7 @@ should now look like:
### Bugfixes ### Bugfixes
- [#1426](https://github.com/influxdata/telegraf/pull/1426): nil metrics panic fix.
- [#1384](https://github.com/influxdata/telegraf/pull/1384): Fix datarace in apache input plugin. - [#1384](https://github.com/influxdata/telegraf/pull/1384): Fix datarace in apache input plugin.
- [#1399](https://github.com/influxdata/telegraf/issues/1399): Add `read_repairs` statistics to riak plugin. - [#1399](https://github.com/influxdata/telegraf/issues/1399): Add `read_repairs` statistics to riak plugin.
- [#1405](https://github.com/influxdata/telegraf/issues/1405): Fix memory/connection leak in prometheus input plugin. - [#1405](https://github.com/influxdata/telegraf/issues/1405): Fix memory/connection leak in prometheus input plugin.

2
internal/models/running_output.go
View File

@ -138,7 +138,7 @@ func (ro *RunningOutput) Write() error {
} }
func (ro *RunningOutput) write(metrics []telegraf.Metric) error { func (ro *RunningOutput) write(metrics []telegraf.Metric) error {
if len(metrics) == 0 { if metrics == nil || len(metrics) == 0 {
return nil return nil
} }
start := time.Now() start := time.Now()

7
plugins/serializers/graphite/graphite.go
View File

@ -26,6 +26,9 @@ func (s *GraphiteSerializer) Serialize(metric telegraf.Metric) ([]string, error)
timestamp := metric.UnixNano() / 1000000000 timestamp := metric.UnixNano() / 1000000000
bucket := s.SerializeBucketName(metric.Name(), metric.Tags()) bucket := s.SerializeBucketName(metric.Name(), metric.Tags())
if bucket == "" {
return out, nil
}
for fieldName, value := range metric.Fields() { for fieldName, value := range metric.Fields() {
// Convert value to string // Convert value to string
@ -89,6 +92,10 @@ func (s *GraphiteSerializer) SerializeBucketName(
} }
} }
if len(out) == 0 {
return ""
}
if s.Prefix == "" { if s.Prefix == "" {
return sanitizedChars.Replace(strings.Join(out, ".")) return sanitizedChars.Replace(strings.Join(out, "."))
} }