Unify Kibana dashboard directory logic across Beats #7265
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
ruflin
force-pushed
the
kibana-dir-changes
branch
4 times, most recently
from
b6e1535
to
e10e130
Compare
Currently all dashboards end up under `_meta/kibana` in each Beat. The problem with this directory is that for some Beats it contains the automatically collected and generated files and for others the original. This prevents us from having decoded JSON files for all dashboards across Beats. An other benefit of having the `kibana.generated` directory is that now `_meta/kibana` can become the place for dashboards across modules in one Beat without having to worry about overwriting / removing these dashboards. Community Beats must convert their dashboards with the script under elastic#7224. Further changes: * Decode Packetbeat and Winlogbeat dashboards * Move encoding step to libbeat so it is applied automatically to all dashboards in the kibana.generated directory. * Remove _meta/kibana from .gitignore as it can now be used to contain dashboards in all Beats. * Adjust Makefiles for the new logic. * Adjust tests to depend on kibana.generated directory
ruflin
force-pushed
the
kibana-dir-changes
branch
from
e10e130
to
4f31283
Compare
ruflin
added
review
libbeat
:Dashboards
and removed
in progress
ruflin
changed the title
jsoriano
approved these changes
Jun 11, 2018
| @@ -4,7 +4,7 @@ MAINTAINER Nicolas Ruflin <ruflin@elastic.co> | |||
| RUN set -x && \ | |||
| apt-get update && \ | |||
| apt-get install -y --no-install-recommends \ | |||
| netcat python-pip virtualenv && \ | |||
| netcat python-pip rsync virtualenv && \ | |||
There was a problem hiding this comment.
Yes and now. It was used when make update was called inside the container. Now it happens outside again. The reason I would like to keep it in is that if someone wants to tests things from inside the container and run make update rsync will be needed for Filebeat.
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Currently all dashboards end up under
_meta/kibanain each Beat. The problem with this directory is that for some Beats it contains the automatically collected and generated files and for others the original. This prevents us from having decoded JSON files for all dashboards across Beats.An other benefit of having the
kibana.generateddirectory is that now_meta/kibanacan become the place for dashboards across modules in one Beat without having to worry about overwriting / removing these dashboards.Community Beats must convert their dashboards with the script under #7224.
Further changes: