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.

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

[6.8] Only log error (don't also index it) if xpack is enabled. (#12353) #12379

Merged
merged 1 commit into from
Jun 3, 2019

Conversation

ycombinator
Copy link
Contributor

Backports the following commits to 6.8:

)

* Only log error (don't also index it) if xpack is enabled.

* Adding CHANGELOG entry
elastic.ReportAndLogError(err, r, m.Log)
return
}
return eventMapping(r, content)
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This should stay as before as we don't have the new framework in 6.8?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Note the name of this function. It's a function that is specific to this metricset, not part of the mb.MetricSet interface.

}
}

func (m *MetricSet) fetchSettings(r mb.ReporterV2, now time.Time) {
func (m *MetricSet) fetchSettings(r mb.ReporterV2, now time.Time) error {
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think I'm now confused. Do we already support this in 6.8?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Note the name of this function. It's a function that is specific to this metricset, not part of the mb.MetricSet interface.

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

🤦‍♂ Got it.

Copy link
Contributor

@cachedout cachedout left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I'm not familiar with the concerns that @ruflin raises here but other than his concerns, the rest looks fine to me.

@ycombinator ycombinator merged commit 201ff8e into elastic:6.8 Jun 3, 2019
@ycombinator ycombinator deleted the backport-12353 branch June 3, 2019 12:23
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants