这是indexloc提供的服务，不要输入任何密码
Skip to content
This repository was archived by the owner on Feb 13, 2025. It is now read-only.

cmd/scollector: count running linux processes from linux.proc collector #1316

Merged
merged 1 commit into from
Sep 17, 2015
Merged

cmd/scollector: count running linux processes from linux.proc collector #1316

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
28 changes: 18 additions & 10 deletions cmd/scollector/collectors/processes_linux.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,12 +39,14 @@ func WatchProcesses() {

func linuxProcMonitor(w *WatchedProc, md *opentsdb.MultiDataPoint) error {
var err error
var processCount int
for pid, id := range w.Processes {
file_status, e := os.Stat("/proc/" + pid)
if e != nil {
w.Remove(pid)
continue
}
processCount++
stats_file, e := ioutil.ReadFile("/proc/" + pid + "/stat")
if e != nil {
w.Remove(pid)
Expand Down Expand Up @@ -114,6 +116,9 @@ func linuxProcMonitor(w *WatchedProc, md *opentsdb.MultiDataPoint) error {
Add(md, "linux.proc.start_time", start_ts, tags, metadata.Gauge, metadata.Timestamp, descLinuxProcStartTS)
Add(md, "linux.proc.uptime", now()-start_ts, tags, metadata.Gauge, metadata.Second, descLinuxProcUptime)
}
if w.IncludeCount {
Add(md, "linux.proc.count", processCount, opentsdb.TagSet{"name": w.Name}, metadata.Gauge, metadata.Process, descLinuxProcCount)
}
return err
}

Expand All @@ -135,6 +140,7 @@ const (
descLinuxHardFileLimit = "The hard limit on the number of open file descriptors."
descLinuxProcUptime = "The length of time, in seconds, since the process was started."
descLinuxProcStartTS = "The timestamp of process start."
descLinuxProcCount = "The number of currently running processes."
)

type byModTime []os.FileInfo
Expand Down Expand Up @@ -201,7 +207,7 @@ type Process struct {
Arguments string
}

// NewWatchedProc takes a string of the form "command,name,regex".
// NewWatchedProc takes a configuration block [[Process]] from conf
func NewWatchedProc(params conf.ProcessParams) (*WatchedProc, error) {
if params.Name == "" {
params.Name = params.Command
Expand All @@ -210,19 +216,21 @@ func NewWatchedProc(params conf.ProcessParams) (*WatchedProc, error) {
return nil, fmt.Errorf("bad process name: %v", params.Name)
}
return &WatchedProc{
Command: params.Command,
Name: params.Name,
Processes: make(map[string]int),
ArgMatch: regexp.MustCompile(params.Args),
idPool: new(idPool),
Command: params.Command,
Name: params.Name,
IncludeCount: params.IncludeCount,
Processes: make(map[string]int),
ArgMatch: regexp.MustCompile(params.Args),
idPool: new(idPool),
}, nil
}

type WatchedProc struct {
Command string
Name string
Processes map[string]int
ArgMatch *regexp.Regexp
Command string
Name string
IncludeCount bool
Processes map[string]int
ArgMatch *regexp.Regexp
*idPool
}

Expand Down
7 changes: 4 additions & 3 deletions cmd/scollector/conf/conf_linux.go
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,8 @@
package conf

type ProcessParams struct {
Command string
Name string
Args string
Command string
Name string
Args string
IncludeCount bool
}