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

[6.x] [APM] update index pattern for elastic/apm-server#1618 (#26643) #26698

Merged
merged 1 commit into from
Dec 5, 2018
Merged

[6.x] [APM] update index pattern for elastic/apm-server#1618 (#26643) #26698

merged 1 commit into from
Dec 5, 2018

Conversation

roncohen
Copy link
Contributor

@roncohen roncohen commented Dec 5, 2018

@roncohen
Copy link
Contributor Author

roncohen commented Dec 5, 2018

there was a conflict, so i recreated it from APM Server and loaded it in here.

@roncohen
Copy link
Contributor Author

roncohen commented Dec 5, 2018

goes hand in hand with elastic/apm-server#1623

@elasticmachine
Copy link
Contributor

💔 Build Failed

@roncohen
Copy link
Contributor Author

roncohen commented Dec 5, 2018

jenkins, retest this please

@roncohen roncohen added the Team:APM All issues that need APM UI Team support label Dec 5, 2018
@elasticmachine
Copy link
Contributor

Pinging @elastic/apm-ui

@elasticmachine
Copy link
Contributor

💚 Build Succeeded

sorenlouv
sorenlouv approved these changes Dec 5, 2018
View reviewed changes
Copy link
Member

@sorenlouv sorenlouv left a comment •
edited
Loading

Choose a reason for hiding this comment

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

there was a conflict, so i recreated it from APM Server and loaded it in here.

I wonder if that conflict was significant. Probably it's just because changes were made to the index patterns file in master, and not backported. In that case it should be fine.

@roncohen roncohen merged commit 6723275 into elastic:6.x Dec 5, 2018
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@graphaelli graphaelli graphaelli approved these changes

@sorenlouv sorenlouv sorenlouv approved these changes

Assignees
No one assigned
Labels
backport Team:APM All issues that need APM UI Team support
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
4 participants
@roncohen @elasticmachine @graphaelli @sorenlouv