CL-Softwares
/
telegraf
8
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Add setting to enable caching in ipmitool (#8335)

This commit is contained in:
A. Binzxxxxxx 2021-01-22 00:14:21 +01:00 committed by GitHub
parent eb42f11cd6
commit 358633bc4d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 47 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
plugins/inputs/ipmi_sensor/README.md
View File

@ -61,6 +61,15 @@ Any of the following parameters will be added to the aformentioned query if they
## Optionally provide the hex key for the IMPI connection. ## Optionally provide the hex key for the IMPI connection.
# hex_key = "" # hex_key = ""
## If ipmitool should use a cache
## for me ipmitool runs about 2 to 10 times faster with cache enabled on HP G10 servers (when using ubuntu20.04)
## the cache file may not work well for you if some sensors come up late
# use_cache = false
## Path to the ipmitools cache file (defaults to OS temp dir)
## The provided path must exist and must be writable
# cache_path = ""
``` ```
### Measurements ### Measurements

38
plugins/inputs/ipmi_sensor/ipmi.go
View File

@ -5,7 +5,9 @@ import (
"bytes" "bytes"
"fmt" "fmt"
"log" "log"
"os"
"os/exec" "os/exec"
"path/filepath"
"regexp" "regexp"
"strconv" "strconv"
"strings" "strings"
@ -34,6 +36,8 @@ type Ipmi struct {
Timeout internal.Duration Timeout internal.Duration
MetricVersion int MetricVersion int
UseSudo bool UseSudo bool
UseCache bool
CachePath string
} }
var sampleConfig = ` var sampleConfig = `
@ -69,6 +73,15 @@ var sampleConfig = `
## Optionally provide the hex key for the IMPI connection. ## Optionally provide the hex key for the IMPI connection.
# hex_key = "" # hex_key = ""
## If ipmitool should use a cache
## for me ipmitool runs about 2 to 10 times faster with cache enabled on HP G10 servers (when using ubuntu20.04)
## the cache file may not work well for you if some sensors come up late
# use_cache = false
## Path to the ipmitools cache file (defaults to OS temp dir)
## The provided path must exist and must be writable
# cache_path = ""
` `
// SampleConfig returns the documentation about the sample configuration // SampleConfig returns the documentation about the sample configuration
@ -119,6 +132,29 @@ func (m *Ipmi) parse(acc telegraf.Accumulator, server string) error {
opts = conn.options() opts = conn.options()
} }
opts = append(opts, "sdr") opts = append(opts, "sdr")
if m.UseCache {
cacheFile := filepath.Join(m.CachePath, server+"_ipmi_cache")
_, err := os.Stat(cacheFile)
if os.IsNotExist(err) {
dumpOpts := opts
// init cache file
dumpOpts = append(dumpOpts, "dump")
dumpOpts = append(dumpOpts, cacheFile)
name := m.Path
if m.UseSudo {
// -n - avoid prompting the user for input of any kind
dumpOpts = append([]string{"-n", name}, dumpOpts...)
name = "sudo"
}
cmd := execCommand(name, dumpOpts...)
out, err := internal.CombinedOutputTimeout(cmd, m.Timeout.Duration)
if err != nil {
return fmt.Errorf("failed to run command %s: %s - %s", strings.Join(cmd.Args, " "), err, string(out))
}
}
opts = append(opts, "-S")
opts = append(opts, cacheFile)
}
if m.MetricVersion == 2 { if m.MetricVersion == 2 {
opts = append(opts, "elist") opts = append(opts, "elist")
} }
@ -294,6 +330,8 @@ func init() {
m.Path = path m.Path = path
} }
m.Timeout = internal.Duration{Duration: time.Second * 20} m.Timeout = internal.Duration{Duration: time.Second * 20}
m.UseCache = false
m.CachePath = os.TempDir()
inputs.Add("ipmi_sensor", func() telegraf.Input { inputs.Add("ipmi_sensor", func() telegraf.Input {
m := m m := m
return &m return &m