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

Merge pull request #3791 from weaveworks/fix-drop-topologies

Browse Source 
multitenant query: don't drop topologies so much
This commit is contained in:
Bryan Boreham
2020-05-26 09:22:06 +01:00
committed by GitHub
parent 7163f42170 a20c51e94d
commit bf90d56f0c
1 changed files with 6 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
app/multitenant/aws_collector.go
View File

@@ -113,6 +113,7 @@ func registerAWSCollectorMetrics() {
prometheus.MustRegister(reportSizeHistogram)
prometheus.MustRegister(reportsPerUser)
prometheus.MustRegister(reportSizePerUser)
prometheus.MustRegister(topologiesDropped)
prometheus.MustRegister(natsRequests)
flushDuration.Register()
}
@@ -449,8 +450,12 @@ func (c *awsCollector) getReports(ctx context.Context, userid string, reportKeys
// process a report from a probe which may be at an older version or overloaded
func (c *awsCollector) massageReport(userid string, report report.Report) report.Report {
if c.cfg.MaxTopNodes > 0 {
max := c.cfg.MaxTopNodes
if len(report.Host.Nodes) > 1 {
max = max * len(report.Host.Nodes) // higher limit for merged reports
}
var dropped []string
report, dropped = report.DropTopologiesOver(c.cfg.MaxTopNodes)
report, dropped = report.DropTopologiesOver(max)
for _, name := range dropped {
topologiesDropped.WithLabelValues(userid, name).Inc()
}