diff --git a/CHANGELOG.md b/CHANGELOG.md index 8418ffd2162ae26eae3cd7495f0898f18f7c84b5..3a8e586f15e66dae7c4ac047dbe2b2dfd9a6dca2 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -75,6 +75,7 @@ be deprecated eventually. - [#2466](https://github.com/influxdata/telegraf/issues/2466): Telegraf can crash in LoadDirectory on 0600 files. - [#2215](https://github.com/influxdata/telegraf/issues/2215): Iptables input: document better that rules without a comment are ignored. - [#2483](https://github.com/influxdata/telegraf/pull/2483): Fix win_perf_counters capping values at 100. +- [#2498](https://github.com/influxdata/telegraf/pull/2498): Exporting Ipmi.Path to be set by config. ## v1.2.1 [2017-02-01] diff --git a/plugins/inputs/ipmi_sensor/ipmi.go b/plugins/inputs/ipmi_sensor/ipmi.go index b2389a67538f428a5554ae69d5c58bdee9dc7cbf..0114812d3800aa44eb7a206c1e043291f983fc7d 100644 --- a/plugins/inputs/ipmi_sensor/ipmi.go +++ b/plugins/inputs/ipmi_sensor/ipmi.go @@ -17,7 +17,7 @@ var ( ) type Ipmi struct { - path string + Path string Servers []string } @@ -44,7 +44,7 @@ func (m *Ipmi) Description() string { } func (m *Ipmi) Gather(acc telegraf.Accumulator) error { - if len(m.path) == 0 { + if len(m.Path) == 0 { return fmt.Errorf("ipmitool not found: verify that ipmitool is installed and that ipmitool is in your PATH") } @@ -76,7 +76,7 @@ func (m *Ipmi) parse(acc telegraf.Accumulator, server string) error { } opts = append(opts, "sdr") - cmd := execCommand(m.path, opts...) + cmd := execCommand(m.Path, opts...) out, err := internal.CombinedOutputTimeout(cmd, time.Second*5) if err != nil { return fmt.Errorf("failed to run command %s: %s - %s", strings.Join(cmd.Args, " "), err, string(out)) @@ -149,7 +149,7 @@ func init() { m := Ipmi{} path, _ := exec.LookPath("ipmitool") if len(path) > 0 { - m.path = path + m.Path = path } inputs.Add("ipmi_sensor", func() telegraf.Input { return &m diff --git a/plugins/inputs/ipmi_sensor/ipmi_test.go b/plugins/inputs/ipmi_sensor/ipmi_test.go index 94dc066c851ad77fb8542f9fcdaeba0085756efc..84bcdcac01b9329afdd8366ac2f7e4a87c3e572d 100644 --- a/plugins/inputs/ipmi_sensor/ipmi_test.go +++ b/plugins/inputs/ipmi_sensor/ipmi_test.go @@ -14,7 +14,7 @@ import ( func TestGather(t *testing.T) { i := &Ipmi{ Servers: []string{"USERID:PASSW0RD@lan(192.168.1.1)"}, - path: "ipmitool", + Path: "ipmitool", } // overwriting exec commands with mock commands execCommand = fakeExecCommand @@ -118,7 +118,7 @@ func TestGather(t *testing.T) { } i = &Ipmi{ - path: "ipmitool", + Path: "ipmitool", } err = i.Gather(&acc)