diff --git a/app/multitenant/billing_emitter.go b/app/multitenant/billing_emitter.go index 1a418bf12..8c9e0963d 100644 --- a/app/multitenant/billing_emitter.go +++ b/app/multitenant/billing_emitter.go @@ -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 }