fix for puppetagent config - test 1

put Makefile back to normal

removed comment from puppetagent.go

changed config_version to config_version_string and fixed yaml for build

changed workind from branch to environment for config_string

fixed casing and Changelog

fixed test case

closes #1917
This commit is contained in:
Frank Stutz 2016-10-18 14:09:35 -07:00 committed by Cameron Sparr
parent 1ebc7245a3
commit 99daa52254
4 changed files with 6 additions and 5 deletions

View File

@ -38,6 +38,7 @@ in their config file.
- [#2045](https://github.com/influxdata/telegraf/issues/2045): Graylog output should set short_message field.
- [#1904](https://github.com/influxdata/telegraf/issues/1904): Hddtemp always put the value in the field temperature.
- [#1693](https://github.com/influxdata/telegraf/issues/1693): Properly collect nested jolokia struct data.
- [#1917](https://github.com/influxdata/telegraf/pull/1917): fix puppetagent inputs plugin to support string for config variable.
## v1.1.2 [2016-12-12]

View File

@ -30,5 +30,5 @@
last_run: 1444936531
cron: 0.000584
version:
config: 1444936521
config: "environment:d6018ce"
puppet: "3.7.5"

View File

@ -68,8 +68,8 @@ type time struct {
}
type version struct {
Config int64 `yaml:"config"`
Puppet string `yaml:"puppet"`
ConfigString string `yaml:"config"`
Puppet string `yaml:"puppet"`
}
// SampleConfig returns sample configuration message

View File

@ -28,7 +28,7 @@ func TestGather(t *testing.T) {
"resources_outofsync": int64(0),
"changes_total": int64(0),
"time_lastrun": int64(1444936531),
"version_config": int64(1444936521),
"version_configstring": "environment:d6018ce",
"time_user": float64(0.004331),
"time_schedule": float64(0.001123),
"time_filebucket": float64(0.000353),