Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

#2527 Allow collecting of host stats within docker containers by enab… #2924

Merged
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions plugins/inputs/system/PROCESSES_README.md
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,11 @@ it requires access to execute `ps`.
# no configuration
```

Another possible configuration is to define an alternative path for resolving the /proc location.
Using the environment variable `HOST_PROC` the plugin will retrieve process information from the specified location.

`docker run -v /proc:/rootfs/proc:ro -e HOST_PROC=/rootfs/proc`

### Measurements & Fields:

- processes
Expand Down
4 changes: 3 additions & 1 deletion plugins/inputs/system/linux_sysctl_fs.go
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@ import (

"github.com/influxdata/telegraf"
"github.com/influxdata/telegraf/plugins/inputs"
"path"
)

// https://www.kernel.org/doc/Documentation/sysctl/fs.txt
Expand Down Expand Up @@ -80,9 +81,10 @@ func (sfs *SysctlFS) Gather(acc telegraf.Accumulator) error {
}

func init() {

inputs.Add("linux_sysctl_fs", func() telegraf.Input {
return &SysctlFS{
path: "/proc/sys/fs",
path: path.Join(GetHostProc(), "/sys/fs"),
}
})
}
13 changes: 11 additions & 2 deletions plugins/inputs/system/processes.go
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@ import (

type Processes struct {
execPS func() ([]byte, error)
getHostProc func() string
readProcFile func(filename string) ([]byte, error)

forcePS bool
Expand Down Expand Up @@ -62,6 +63,14 @@ func (p *Processes) Gather(acc telegraf.Accumulator) error {
return nil
}

func GetHostProc() string {
procPath := "/proc"
if os.Getenv("HOST_PROC") != "" {
procPath = os.Getenv("HOST_PROC")
}
return procPath
}

// Gets empty fields of metrics based on the OS
func getEmptyFields() map[string]interface{} {
fields := map[string]interface{}{
Expand Down Expand Up @@ -132,14 +141,14 @@ func (p *Processes) gatherFromPS(fields map[string]interface{}) error {

// get process states from /proc/(pid)/stat files
func (p *Processes) gatherFromProc(fields map[string]interface{}) error {
filenames, err := filepath.Glob("/proc/[0-9]*/stat")
filenames, err := filepath.Glob(GetHostProc() + "/[0-9]*/stat")

if err != nil {
return err
}

for _, filename := range filenames {
_, err := os.Stat(filename)

data, err := p.readProcFile(filename)
if err != nil {
return err
Expand Down