Skip to content

Commit

Permalink
Exporting Ipmi.Path to be set by config. (influxdata#2498)
Browse files Browse the repository at this point in the history
* Exporting Ipmi.Path to be set by config.

Currently "path" is not exported, giving this error when users try to
override the variable via telegraf.conf as per the sample config:

`field corresponding to `path' is not defined in `*ipmi_sensor.Ipmi'`

Exporting the variable solves the problem.

* Updating changelog.
  • Loading branch information
Robpol86 authored and calerogers committed Apr 5, 2017
1 parent c609415 commit 9855e9f
Show file tree
Hide file tree
Showing 3 changed files with 7 additions and 6 deletions.
1 change: 1 addition & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -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]

Expand Down
8 changes: 4 additions & 4 deletions plugins/inputs/ipmi_sensor/ipmi.go
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ var (
)

type Ipmi struct {
path string
Path string
Servers []string
}

Expand All @@ -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")
}

Expand Down Expand Up @@ -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))
Expand Down Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions plugins/inputs/ipmi_sensor/ipmi_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -118,7 +118,7 @@ func TestGather(t *testing.T) {
}

i = &Ipmi{
path: "ipmitool",
Path: "ipmitool",
}

err = i.Gather(&acc)
Expand Down

0 comments on commit 9855e9f

Please sign in to comment.