From 9fded9d34e36556ed5861d9798eea0facb4a2009 Mon Sep 17 00:00:00 2001 From: Marcus Cobden Date: Mon, 8 May 2017 11:25:28 +0000 Subject: [PATCH] Add weavenet metrics to billing --- app/multitenant/billing_emitter.go | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) diff --git a/app/multitenant/billing_emitter.go b/app/multitenant/billing_emitter.go index 886cc0cac..7081fae32 100644 --- a/app/multitenant/billing_emitter.go +++ b/app/multitenant/billing_emitter.go @@ -57,9 +57,15 @@ func (e *BillingEmitter) Add(ctx context.Context, rep report.Report, buf []byte) hasher := sha256.New() hasher.Write(buf) hash := "sha256:" + base64.URLEncoding.EncodeToString(hasher.Sum(nil)) + weaveNetCount := 0 + if hasWeaveNet(rep) { + weaveNetCount = 1 + } + amounts := billing.Amounts{ billing.ContainerSeconds: int64(interval/time.Second) * int64(len(rep.Container.Nodes)), billing.NodeSeconds: int64(interval/time.Second) * int64(len(rep.Host.Nodes)), + billing.WeaveNetSeconds: int64(interval/time.Second) * int64(weaveNetCount), } metadata := map[string]string{ "row_key": rowKey, @@ -112,6 +118,18 @@ func (e *BillingEmitter) reportInterval(r report.Report) time.Duration { return d } +// Tries to determine if this report came from a host running Weave Net +func hasWeaveNet(r report.Report) bool { + for _, n := range r.Overlay.Nodes { + overlayType, _ := report.ParseOverlayNodeID(n.ID) + if overlayType == report.WeaveOverlayPeerPrefix { + return true + } + } + + return false +} + // Close shuts down the billing emitter and billing client flushing events. func (e *BillingEmitter) Close() error { return e.billing.Close()