From e6fc32bdf0652e1defcfdb79be98f60020e1f9a0 Mon Sep 17 00:00:00 2001 From: Frank Stutz Date: Tue, 18 Oct 2016 14:09:35 -0700 Subject: [PATCH] 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 --- CHANGELOG.md | 1 + plugins/inputs/puppetagent/last_run_summary.yaml | 4 ++-- plugins/inputs/puppetagent/puppetagent.go | 4 ++-- plugins/inputs/puppetagent/puppetagent_test.go | 2 +- 4 files changed, 6 insertions(+), 5 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index ed7ff2a2e454d..1357e6d901911 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -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] diff --git a/plugins/inputs/puppetagent/last_run_summary.yaml b/plugins/inputs/puppetagent/last_run_summary.yaml index 1f5dea3cea7c0..be2f017465fad 100644 --- a/plugins/inputs/puppetagent/last_run_summary.yaml +++ b/plugins/inputs/puppetagent/last_run_summary.yaml @@ -30,5 +30,5 @@ last_run: 1444936531 cron: 0.000584 version: - config: 1444936521 - puppet: "3.7.5" \ No newline at end of file + config: "environment:d6018ce" + puppet: "3.7.5" diff --git a/plugins/inputs/puppetagent/puppetagent.go b/plugins/inputs/puppetagent/puppetagent.go index f66aa989f6260..c8a265bb857bc 100644 --- a/plugins/inputs/puppetagent/puppetagent.go +++ b/plugins/inputs/puppetagent/puppetagent.go @@ -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 diff --git a/plugins/inputs/puppetagent/puppetagent_test.go b/plugins/inputs/puppetagent/puppetagent_test.go index d1470bc27bc8f..b1c447887f23c 100644 --- a/plugins/inputs/puppetagent/puppetagent_test.go +++ b/plugins/inputs/puppetagent/puppetagent_test.go @@ -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),