github/weave-scope
1
0
Fork 0
mirror of https://github.com/weaveworks/scope.git synced 2026-07-25 00:06:46 +00:00
Code Issues Packages Projects Releases Wiki Activity

multitenant: scan container command-lines as well as process

Browse Source
This commit is contained in:
Bryan Boreham
2020-05-19 10:09:28 +00:00
parent f83ad517d8
commit ad82fafde8
1 changed files with 11 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
app/multitenant/billing_emitter.go
View File

@@ -139,13 +139,22 @@ func (e *BillingEmitter) reportInterval(r report.Report) time.Duration {
return r.Window
}
var inter string
for _, c := range r.Process.Nodes {
if cmd, ok := c.Latest.Lookup(report.Cmdline); ok {
for _, c := range r.Container.Nodes {
if cmd, ok := c.Latest.Lookup(report.DockerContainerCommand); ok {
if inter = intervalFromCommand(cmd); inter != "" {
break
}
}
}
if inter == "" { // not found in containers: look in processes
for _, c := range r.Process.Nodes {
if cmd, ok := c.Latest.Lookup(report.Cmdline); ok {
if inter = intervalFromCommand(cmd); inter != "" {
break
}
}
}
}
if inter == "" {
return 0
}