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

Jump to bottom

Fix breaking change in monitoring data #7563

Merged
merged 2 commits into from
Jul 18, 2018
Merged

Fix breaking change in monitoring data #7563

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
d84018a
Fix breaking change in monitoring data
ruflin Jul 11, 2018
6d0d5b0
apply PR review
ruflin Jul 13, 2018
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
11 changes: 6 additions & 5 deletions libbeat/monitoring/report/elasticsearch/elasticsearch.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -198,11 +198,12 @@ func (r *reporter) initLoop(c config) {
logp.Info("Successfully connected to X-Pack Monitoring endpoint.")

// Start collector and send loop if monitoring endpoint has been found.
go r.snapshotLoop("state", c.StatePeriod)
go r.snapshotLoop("stats", c.MetricsPeriod)
go r.snapshotLoop("state", "state", c.StatePeriod)
// For backward compatibility stats is named to metrics.
go r.snapshotLoop("stats", "metrics", c.MetricsPeriod)
}

func (r *reporter) snapshotLoop(namespace string, period time.Duration) {
func (r *reporter) snapshotLoop(namespace, prefix string, period time.Duration) {
ticker := time.NewTicker(period)
defer ticker.Stop()

Expand All @@ -225,8 +226,8 @@ func (r *reporter) snapshotLoop(namespace string, period time.Duration) {
}

fields := common.MapStr{
"beat": r.beatMeta,
namespace: snapshot,
"beat": r.beatMeta,
prefix: snapshot,
}
if len(r.tags) > 0 {
fields["tags"] = r.tags
Expand Down