-
Notifications
You must be signed in to change notification settings - Fork 4.9k
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
Remove _meta/kibana.generated symlink #9892
Conversation
@cwurm I was also looking at this and came to a similar solution (see dashboards.patch). But with few differences:
Do you want to incorporate some of this with your PR? |
@andrewkroh Thanks, definitely! I've pushed a new commit. |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
LGTM
Fixes a bug introduced with elastic#9546 where a symlink from `_meta/kibana.generated` to `build/kibana` would cause objects to be included in the dashboard ZIP file with the wrong path. This removes the symlink in favor of a conditional. Fixes elastic#9785.
Fixes a bug introduced with elastic#9546 where a symlink from `_meta/kibana.generated` to `build/kibana` would cause objects to be included in the dashboard ZIP file with the wrong path. This removes the symlink in favor of a conditional. Fixes elastic#9785. (cherry picked from commit 3a51720)
@cwurm This should not have been merged. It seems this change caused the failure for the test_ml jobs. The error is:
I assume this will also affect the backports? |
In elastic#9892 the build was broken by removing the symlink to the generated kibana files which broke the ml tests. This fixes the test by pointing to the new directory under build/kibana. Closes elastic#9938
@ruflin Ah you're right, sorry. Thanks for fixing it in master.
It shouldn't. In 6.x and 6.6 Filebeat is still using CI for 6.x and 6.6 look good for Filebeat. |
Fixes a bug introduced with elastic#9546 where a symlink from `_meta/kibana.generated` to `build/kibana` would cause objects to be included in the dashboard ZIP file with the wrong path. This removes the symlink in favor of a conditional. Fixes elastic#9785. (cherry picked from commit 23f1ea2)
#9546 introduced a symlink from
_meta/kibana.generated
tobuild/kibana
so Auditbeat remains backwards compatible with the other Beats (Auditbeat is already using the first as a location for all its Kibana objects, while the other Beats are still using the latter).This introduced a bug, where objects would be included in the dashboard ZIP file with the wrong path (#9785).
One way of fixing this would have been to double down on symlinks and change just one line in
addFileToZip
. But with #9842 about to change all Beats to use the newbuild/kibana
I thought it better to just remove the symlink capability altogether and instead if-else between the two possible locations based on whether they exist or not. #9842 will then change all of that - at least inmaster
- once it's merged.Fixes #9785.