Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

multitenant query: don't drop topologies so much #3791

Merged
merged 2 commits into from
May 26, 2020
Merged

multitenant query: don't drop topologies so much #3791

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
fd65155
Register the metric for dropped topologies
bboreham May 25, 2020
a20c51e
Higher limit on topology size for merged reports.
bboreham May 25, 2020
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
7 changes: 6 additions & 1 deletion app/multitenant/aws_collector.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -113,6 +113,7 @@ func registerAWSCollectorMetrics() {
prometheus.MustRegister(reportSizeHistogram)
prometheus.MustRegister(reportsPerUser)
prometheus.MustRegister(reportSizePerUser)
prometheus.MustRegister(topologiesDropped)
prometheus.MustRegister(natsRequests)
flushDuration.Register()
}
Expand Down Expand Up @@ -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()
}
Expand Down