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

removed "panic" from zfs plugin 

also added zfs plugin to README.md

closes #341
This commit is contained in:
Roman Statsevich 2015-11-09 15:37:00 +03:00 committed by Cameron Sparr
parent d54f6be639
commit 1a05899be0
3 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
CHANGELOG.md
View File

@ -13,6 +13,7 @@ changed to just run docker commands in the Makefile. See `make docker-run` and
- [#318](https://github.com/influxdb/telegraf/pull/318): Prometheus output. Thanks @oldmantaiter! - [#318](https://github.com/influxdb/telegraf/pull/318): Prometheus output. Thanks @oldmantaiter!
- [#338](https://github.com/influxdb/telegraf/pull/338): Restart Telegraf on package upgrade. Thanks @linsomniac! - [#338](https://github.com/influxdb/telegraf/pull/338): Restart Telegraf on package upgrade. Thanks @linsomniac!
- [#337](https://github.com/influxdb/telegraf/pull/337): Jolokia plugin, thanks @saiello! - [#337](https://github.com/influxdb/telegraf/pull/337): Jolokia plugin, thanks @saiello!
- [#317](https://github.com/influxdb/telegraf/issues/317): ZFS plugin, thanks @cornerot!
### Bugfixes ### Bugfixes
- [#331](https://github.com/influxdb/telegraf/pull/331): Dont overwrite host tag in redis plugin. - [#331](https://github.com/influxdb/telegraf/pull/331): Dont overwrite host tag in redis plugin.

1
README.md
View File

@ -190,6 +190,7 @@ Telegraf currently has support for collecting metrics from:
* rabbitmq * rabbitmq
* redis * redis
* rethinkdb * rethinkdb
* zfs
* zookeeper * zookeeper
* system * system
* cpu * cpu

2
plugins/zfs/zfs.go
View File

@ -62,7 +62,7 @@ func (z *Zfs) Gather(acc plugins.Accumulator) error {
for _, metric := range kstatMetrics { for _, metric := range kstatMetrics {
lines, err := common.ReadLines(kstatPath + "/" + metric) lines, err := common.ReadLines(kstatPath + "/" + metric)
if err != nil { if err != nil {
panic(err) return err
} }
for i, line := range lines { for i, line := range lines {
if i == 0 || i == 1 { if i == 0 || i == 1 {