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

fix tests 

closes #939
This commit is contained in:
Rene Zbinden 2016-04-07 17:05:20 +00:00 committed by Michele Fadda
parent 00c777da05
commit f590e2aebd
4 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
CHANGELOG.md
View File

@ -5,6 +5,7 @@
- [#979](https://github.com/influxdata/telegraf/pull/979): Reduce allocations in the TCP listener. - [#979](https://github.com/influxdata/telegraf/pull/979): Reduce allocations in the TCP listener.
- [#935](https://github.com/influxdata/telegraf/pull/935): AWS Cloudwatch input plugin. Thanks @joshhardy & @ljosa! - [#935](https://github.com/influxdata/telegraf/pull/935): AWS Cloudwatch input plugin. Thanks @joshhardy & @ljosa!
- [#943](https://github.com/influxdata/telegraf/pull/943): http_response input plugin. Thanks @Lswith! - [#943](https://github.com/influxdata/telegraf/pull/943): http_response input plugin. Thanks @Lswith!
- [#939](https://github.com/influxdata/telegraf/pull/939): sysstat input plugin. Thanks @zbindenren!
### Bugfixes ### Bugfixes
- [#968](https://github.com/influxdata/telegraf/issues/968): Processes plugin gets unknown state when spaces are in (command name) - [#968](https://github.com/influxdata/telegraf/issues/968): Processes plugin gets unknown state when spaces are in (command name)

1
README.md
View File

@ -206,6 +206,7 @@ Currently implemented sources:
* [zfs](https://github.com/influxdata/telegraf/tree/master/plugins/inputs/zfs) * [zfs](https://github.com/influxdata/telegraf/tree/master/plugins/inputs/zfs)
* [zookeeper](https://github.com/influxdata/telegraf/tree/master/plugins/inputs/zookeeper) * [zookeeper](https://github.com/influxdata/telegraf/tree/master/plugins/inputs/zookeeper)
* [win_perf_counters ](https://github.com/influxdata/telegraf/tree/master/plugins/inputs/win_perf_counters) (windows performance counters) * [win_perf_counters ](https://github.com/influxdata/telegraf/tree/master/plugins/inputs/win_perf_counters) (windows performance counters)
* [sysstat](https://github.com/influxdata/telegraf/tree/master/plugins/inputs/sysstat)
* [system](https://github.com/influxdata/telegraf/tree/master/plugins/inputs/system) * [system](https://github.com/influxdata/telegraf/tree/master/plugins/inputs/system)
* cpu * cpu
* mem * mem

6
plugins/inputs/sysstat/sysstat.go
View File

@ -72,8 +72,10 @@ func (*Sysstat) Description() string {
var sampleConfig = ` var sampleConfig = `
## Path to the sadc command. ## Path to the sadc command.
# #
## On Debian and Arch Linux the default path is /usr/lib/sa/sadc whereas ## Common Defaults:
## on RHEL and CentOS the default path is /usr/lib64/sa/sadc ## Debian/Ubuntu: /usr/lib/sysstat/sadc
## Arch: /usr/lib/sa/sadc
## RHEL/CentOS: /usr/lib64/sa/sadc
sadc_path = "/usr/lib/sa/sadc" # required sadc_path = "/usr/lib/sa/sadc" # required
# #
# #

1
plugins/inputs/sysstat/sysstat_test.go
View File

@ -15,6 +15,7 @@ import (
var s = Sysstat{ var s = Sysstat{
interval: 10, interval: 10,
Sadc: "/usr/lib/sa/sadc", Sadc: "/usr/lib/sa/sadc",
Sadf: "/usr/bin/sadf",
Group: false, Group: false,
Activities: []string{"DISK", "SNMP"}, Activities: []string{"DISK", "SNMP"},
Options: map[string]string{ Options: map[string]string{