Simplify dashboard handling for developers #1109
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
dashboard-to-beats
branch
from
698ce8a to
e5003dd
Compare
5 tasks
ruflin
force-pushed
the
dashboard-to-beats
branch
2 times, most recently
from
5a5c191 to
360b1d4
Compare
All dashboards from beats-dashboards were moved to their specific beats. Two new functions were introduced in the Makefile to manage import / export of the files from Kibana: * `make kibana-export` * `make kibana-import` If `KIBANA_ES` is not running on localhost, KIBANA_ES has to be overwritten. Be aware that the current implementation is to simplify development of dashboards an is not intended to serve yet for the deployment of dashboards of the users. This should be implemented in a second step. General and reusable dashboard components were moved to libbeat. These should be in a second step automatically move to each beat when running `make update` similar to what is done with `libbeat.yml`. Further: * Basic Redis Dashboard in modules were added * Kibana dir in modules is called .kibana to prevent naming conflicts * README for scripts folder extended * Add `make beats-dashboards` to generate dashboards for https://github.com/elastic/beats-dashboards repo * Add `make kibana` to metricbeat to collect kibana files from modules Currently I'm not happy with the naming of etc/kibana but we should move forward with this and find a better solution on the way. This change is also needed for Metricbeat where the dashboards will be part of each module. This can potentially also be used for packetbeat modules.
ruflin
force-pushed
the
dashboard-to-beats
branch
from
360b1d4 to
4bdcc78
Compare
|
|
||
| # Collects all dashboards and generates dashboard folder for https://github.com/elastic/beats-dashboards/tree/master/dashboards | ||
| .PHONY: beats-dashboards | ||
| beats-dashboards: |
There was a problem hiding this comment.
@monicasarbu I checked that this still generates the exact same output as we have currently in beats-dashboard repository. That should simplify to keep both in sync.
|
@monicasarbu Thanks for the review. I left out all the authentication and special features like index setting here, as I think developer should use our default environment to create and check dashboards: https://github.com/elastic/beats/pull/1109/files#diff-e5ec6ac49971e002393d679796dccb59R17 Like this they always use the newest version and we all test with the same environment. The above implementation is not intended to replace the load.sh scripts as is for development only. |
ruflin
changed the title
monicasarbu
added a commit
that referenced
this pull request
Mar 7, 2016
Simplify dashboard handling for developers
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.
All dashboards from beats-dashboards were moved to their specific beats.
Two new functions were introduced in the Makefile to manage import / export of the files from Kibana:
make kibana-exportmake kibana-importIf
KIBANA_ESis not running on localhost, KIBANA_ES has to be overwritten. Be aware that the current implementation is to simplify development of dashboards an is not intended to serve yet for the deployment of dashboards of the users. This should be implemented in a second step.General and reusable dashboard components were moved to libbeat. These should be in a second step automatically move to each beat when running
make updatesimilar to what is done withlibbeat.yml.Further:
make beats-dashboardsto generate dashboards for https://github.com/elastic/beats-dashboards repomake kibanato metricbeat to collect kibana files from modulesCurrently I'm not happy with the naming of etc/kibana but we should move forward with this and find a better solution on the way.
This change is also needed for Metricbeat where the dashboards will be part of each module. This can potentially also be used for packetbeat modules.