From edc9fdc629817cae3c800a1a47d44befa9edba24 Mon Sep 17 00:00:00 2001 From: Spencer Alger Date: Tue, 14 Oct 2014 14:35:28 -0700 Subject: [PATCH] [plugins] move apps into plugins --- src/kibana/components/vis_types/index.js | 15 --------------- .../dashboard/directives/grid.js | 0 .../dashboard/directives/panel.js | 0 .../apps => plugins}/dashboard/index.html | 0 src/{kibana/apps => plugins}/dashboard/index.js | 0 .../dashboard/partials/load_dashboard.html | 0 .../dashboard/partials/panel.html | 0 .../dashboard/partials/pick_visualization.html | 0 .../dashboard/partials/save_dashboard.html | 0 .../dashboard/partials/share.html | 0 .../dashboard/services/_saved_dashboard.js | 0 .../dashboard/services/saved_dashboards.js | 0 .../apps => plugins}/dashboard/styles/main.less | 0 .../apps => plugins}/discover/_hit_sort_fn.js | 0 .../discover/_segmented_fetch.js | 0 .../components/field_chooser/discover_field.html | 0 .../components/field_chooser/discover_field.js | 0 .../field_chooser/discover_field_details.html | 0 .../components/field_chooser/field_chooser.html | 0 .../components/field_chooser/field_chooser.js | 0 .../field_chooser/lib/field_calculator.js | 0 .../discover/controllers/discover.js | 0 .../discover/directives/table.js | 0 .../discover/directives/table_header.js | 0 .../discover/directives/table_row.js | 0 .../discover/directives/timechart.js | 0 src/{kibana/apps => plugins}/discover/index.html | 0 src/{kibana/apps => plugins}/discover/index.js | 0 .../discover/partials/load_search.html | 0 .../discover/partials/save_search.html | 0 .../discover/partials/settings.html | 0 .../discover/partials/table.html | 0 .../discover/partials/table_header.html | 0 .../discover/partials/table_row/cell.html | 0 .../discover/partials/table_row/details.html | 0 .../discover/partials/table_row/open.html | 0 .../discover/saved_searches/_saved_search.js | 0 .../discover/saved_searches/saved_searches.js | 0 .../apps => plugins}/discover/styles/main.less | 0 src/{kibana/apps => plugins}/settings/app.html | 0 src/{kibana/apps => plugins}/settings/index.js | 0 .../settings/saved_object_registry.js | 0 .../settings/sections/about/elk.png | Bin .../settings/sections/about/index.html | 0 .../settings/sections/about/index.js | 0 .../settings/sections/advanced/index.html | 0 .../settings/sections/advanced/index.js | 0 .../apps => plugins}/settings/sections/index.js | 0 .../settings/sections/indices/_create.html | 0 .../settings/sections/indices/_create.js | 0 .../settings/sections/indices/_edit.html | 0 .../settings/sections/indices/_edit.js | 0 .../sections/indices/_refresh_kibana_index.js | 0 .../settings/sections/indices/index.html | 0 .../settings/sections/indices/index.js | 0 .../settings/sections/objects/_objects.html | 0 .../settings/sections/objects/_objects.js | 0 .../settings/sections/objects/_view.html | 0 .../settings/sections/objects/_view.js | 0 .../settings/sections/objects/index.js | 0 .../apps => plugins}/settings/styles/main.less | 0 .../visualize/editor/add_bucket_agg.js | 0 .../apps => plugins}/visualize/editor/agg.html | 0 .../apps => plugins}/visualize/editor/agg.js | 0 .../visualize/editor/agg_filter.js | 0 .../visualize/editor/agg_group.html | 0 .../visualize/editor/agg_group.js | 0 .../visualize/editor/agg_param.js | 0 .../visualize/editor/agg_select.html | 0 .../visualize/editor/editor.html | 0 .../apps => plugins}/visualize/editor/editor.js | 0 .../visualize/editor/nesting_indicator.js | 0 .../visualize/editor/panels/load.html | 0 .../visualize/editor/panels/save.html | 0 .../visualize/editor/panels/share.html | 0 .../visualize/editor/sidebar.html | 0 .../apps => plugins}/visualize/editor/sidebar.js | 0 .../visualize/editor/styles/editor.less | 0 src/{kibana/apps => plugins}/visualize/index.js | 0 .../visualize/saved_visualizations/_saved_vis.js | 0 .../saved_visualizations/saved_visualizations.js | 0 .../apps => plugins}/visualize/styles/main.less | 0 .../visualize/wizard/step_1.html | 0 .../visualize/wizard/step_2.html | 0 .../apps => plugins}/visualize/wizard/wizard.js | 0 src/server/bin/initialize | 11 ++++++++--- src/server/config/kibana.yml | 8 -------- src/server/routes/base.rb | 1 + src/server/routes/home.rb | 6 ++++++ tasks/config/requirejs.js | 9 +++++---- 90 files changed, 20 insertions(+), 30 deletions(-) delete mode 100644 src/kibana/components/vis_types/index.js rename src/{kibana/apps => plugins}/dashboard/directives/grid.js (100%) rename src/{kibana/apps => plugins}/dashboard/directives/panel.js (100%) rename src/{kibana/apps => plugins}/dashboard/index.html (100%) rename src/{kibana/apps => plugins}/dashboard/index.js (100%) rename src/{kibana/apps => plugins}/dashboard/partials/load_dashboard.html (100%) rename src/{kibana/apps => plugins}/dashboard/partials/panel.html (100%) rename src/{kibana/apps => plugins}/dashboard/partials/pick_visualization.html (100%) rename src/{kibana/apps => plugins}/dashboard/partials/save_dashboard.html (100%) rename src/{kibana/apps => plugins}/dashboard/partials/share.html (100%) rename src/{kibana/apps => plugins}/dashboard/services/_saved_dashboard.js (100%) rename src/{kibana/apps => plugins}/dashboard/services/saved_dashboards.js (100%) rename src/{kibana/apps => plugins}/dashboard/styles/main.less (100%) rename src/{kibana/apps => plugins}/discover/_hit_sort_fn.js (100%) rename src/{kibana/apps => plugins}/discover/_segmented_fetch.js (100%) rename src/{kibana/apps => plugins}/discover/components/field_chooser/discover_field.html (100%) rename src/{kibana/apps => plugins}/discover/components/field_chooser/discover_field.js (100%) rename src/{kibana/apps => plugins}/discover/components/field_chooser/discover_field_details.html (100%) rename src/{kibana/apps => plugins}/discover/components/field_chooser/field_chooser.html (100%) rename src/{kibana/apps => plugins}/discover/components/field_chooser/field_chooser.js (100%) rename src/{kibana/apps => plugins}/discover/components/field_chooser/lib/field_calculator.js (100%) rename src/{kibana/apps => plugins}/discover/controllers/discover.js (100%) rename src/{kibana/apps => plugins}/discover/directives/table.js (100%) rename src/{kibana/apps => plugins}/discover/directives/table_header.js (100%) rename src/{kibana/apps => plugins}/discover/directives/table_row.js (100%) rename src/{kibana/apps => plugins}/discover/directives/timechart.js (100%) rename src/{kibana/apps => plugins}/discover/index.html (100%) rename src/{kibana/apps => plugins}/discover/index.js (100%) rename src/{kibana/apps => plugins}/discover/partials/load_search.html (100%) rename src/{kibana/apps => plugins}/discover/partials/save_search.html (100%) rename src/{kibana/apps => plugins}/discover/partials/settings.html (100%) rename src/{kibana/apps => plugins}/discover/partials/table.html (100%) rename src/{kibana/apps => plugins}/discover/partials/table_header.html (100%) rename src/{kibana/apps => plugins}/discover/partials/table_row/cell.html (100%) rename src/{kibana/apps => plugins}/discover/partials/table_row/details.html (100%) rename src/{kibana/apps => plugins}/discover/partials/table_row/open.html (100%) rename src/{kibana/apps => plugins}/discover/saved_searches/_saved_search.js (100%) rename src/{kibana/apps => plugins}/discover/saved_searches/saved_searches.js (100%) rename src/{kibana/apps => plugins}/discover/styles/main.less (100%) rename src/{kibana/apps => plugins}/settings/app.html (100%) rename src/{kibana/apps => plugins}/settings/index.js (100%) rename src/{kibana/apps => plugins}/settings/saved_object_registry.js (100%) rename src/{kibana/apps => plugins}/settings/sections/about/elk.png (100%) rename src/{kibana/apps => plugins}/settings/sections/about/index.html (100%) rename src/{kibana/apps => plugins}/settings/sections/about/index.js (100%) rename src/{kibana/apps => plugins}/settings/sections/advanced/index.html (100%) rename src/{kibana/apps => plugins}/settings/sections/advanced/index.js (100%) rename src/{kibana/apps => plugins}/settings/sections/index.js (100%) rename src/{kibana/apps => plugins}/settings/sections/indices/_create.html (100%) rename src/{kibana/apps => plugins}/settings/sections/indices/_create.js (100%) rename src/{kibana/apps => plugins}/settings/sections/indices/_edit.html (100%) rename src/{kibana/apps => plugins}/settings/sections/indices/_edit.js (100%) rename src/{kibana/apps => plugins}/settings/sections/indices/_refresh_kibana_index.js (100%) rename src/{kibana/apps => plugins}/settings/sections/indices/index.html (100%) rename src/{kibana/apps => plugins}/settings/sections/indices/index.js (100%) rename src/{kibana/apps => plugins}/settings/sections/objects/_objects.html (100%) rename src/{kibana/apps => plugins}/settings/sections/objects/_objects.js (100%) rename src/{kibana/apps => plugins}/settings/sections/objects/_view.html (100%) rename src/{kibana/apps => plugins}/settings/sections/objects/_view.js (100%) rename src/{kibana/apps => plugins}/settings/sections/objects/index.js (100%) rename src/{kibana/apps => plugins}/settings/styles/main.less (100%) rename src/{kibana/apps => plugins}/visualize/editor/add_bucket_agg.js (100%) rename src/{kibana/apps => plugins}/visualize/editor/agg.html (100%) rename src/{kibana/apps => plugins}/visualize/editor/agg.js (100%) rename src/{kibana/apps => plugins}/visualize/editor/agg_filter.js (100%) rename src/{kibana/apps => plugins}/visualize/editor/agg_group.html (100%) rename src/{kibana/apps => plugins}/visualize/editor/agg_group.js (100%) rename src/{kibana/apps => plugins}/visualize/editor/agg_param.js (100%) rename src/{kibana/apps => plugins}/visualize/editor/agg_select.html (100%) rename src/{kibana/apps => plugins}/visualize/editor/editor.html (100%) rename src/{kibana/apps => plugins}/visualize/editor/editor.js (100%) rename src/{kibana/apps => plugins}/visualize/editor/nesting_indicator.js (100%) rename src/{kibana/apps => plugins}/visualize/editor/panels/load.html (100%) rename src/{kibana/apps => plugins}/visualize/editor/panels/save.html (100%) rename src/{kibana/apps => plugins}/visualize/editor/panels/share.html (100%) rename src/{kibana/apps => plugins}/visualize/editor/sidebar.html (100%) rename src/{kibana/apps => plugins}/visualize/editor/sidebar.js (100%) rename src/{kibana/apps => plugins}/visualize/editor/styles/editor.less (100%) rename src/{kibana/apps => plugins}/visualize/index.js (100%) rename src/{kibana/apps => plugins}/visualize/saved_visualizations/_saved_vis.js (100%) rename src/{kibana/apps => plugins}/visualize/saved_visualizations/saved_visualizations.js (100%) rename src/{kibana/apps => plugins}/visualize/styles/main.less (100%) rename src/{kibana/apps => plugins}/visualize/wizard/step_1.html (100%) rename src/{kibana/apps => plugins}/visualize/wizard/step_2.html (100%) rename src/{kibana/apps => plugins}/visualize/wizard/wizard.js (100%) diff --git a/src/kibana/components/vis_types/index.js b/src/kibana/components/vis_types/index.js deleted file mode 100644 index 278d18cd3381..000000000000 --- a/src/kibana/components/vis_types/index.js +++ /dev/null @@ -1,15 +0,0 @@ -define(function (require) { - return function VisTypeService(Private) { - var _ = require('lodash'); - var Registry = require('utils/registry/registry'); - - return new Registry({ - index: ['name'], - initialSet: [ - Private(require('components/vis_types/histogram')), - Private(require('components/vis_types/line')), - Private(require('components/vis_types/pie')) - ] - }); - }; -}); \ No newline at end of file diff --git a/src/kibana/apps/dashboard/directives/grid.js b/src/plugins/dashboard/directives/grid.js similarity index 100% rename from src/kibana/apps/dashboard/directives/grid.js rename to src/plugins/dashboard/directives/grid.js diff --git a/src/kibana/apps/dashboard/directives/panel.js b/src/plugins/dashboard/directives/panel.js similarity index 100% rename from src/kibana/apps/dashboard/directives/panel.js rename to src/plugins/dashboard/directives/panel.js diff --git a/src/kibana/apps/dashboard/index.html b/src/plugins/dashboard/index.html similarity index 100% rename from src/kibana/apps/dashboard/index.html rename to src/plugins/dashboard/index.html diff --git a/src/kibana/apps/dashboard/index.js b/src/plugins/dashboard/index.js similarity index 100% rename from src/kibana/apps/dashboard/index.js rename to src/plugins/dashboard/index.js diff --git a/src/kibana/apps/dashboard/partials/load_dashboard.html b/src/plugins/dashboard/partials/load_dashboard.html similarity index 100% rename from src/kibana/apps/dashboard/partials/load_dashboard.html rename to src/plugins/dashboard/partials/load_dashboard.html diff --git a/src/kibana/apps/dashboard/partials/panel.html b/src/plugins/dashboard/partials/panel.html similarity index 100% rename from src/kibana/apps/dashboard/partials/panel.html rename to src/plugins/dashboard/partials/panel.html diff --git a/src/kibana/apps/dashboard/partials/pick_visualization.html b/src/plugins/dashboard/partials/pick_visualization.html similarity index 100% rename from src/kibana/apps/dashboard/partials/pick_visualization.html rename to src/plugins/dashboard/partials/pick_visualization.html diff --git a/src/kibana/apps/dashboard/partials/save_dashboard.html b/src/plugins/dashboard/partials/save_dashboard.html similarity index 100% rename from src/kibana/apps/dashboard/partials/save_dashboard.html rename to src/plugins/dashboard/partials/save_dashboard.html diff --git a/src/kibana/apps/dashboard/partials/share.html b/src/plugins/dashboard/partials/share.html similarity index 100% rename from src/kibana/apps/dashboard/partials/share.html rename to src/plugins/dashboard/partials/share.html diff --git a/src/kibana/apps/dashboard/services/_saved_dashboard.js b/src/plugins/dashboard/services/_saved_dashboard.js similarity index 100% rename from src/kibana/apps/dashboard/services/_saved_dashboard.js rename to src/plugins/dashboard/services/_saved_dashboard.js diff --git a/src/kibana/apps/dashboard/services/saved_dashboards.js b/src/plugins/dashboard/services/saved_dashboards.js similarity index 100% rename from src/kibana/apps/dashboard/services/saved_dashboards.js rename to src/plugins/dashboard/services/saved_dashboards.js diff --git a/src/kibana/apps/dashboard/styles/main.less b/src/plugins/dashboard/styles/main.less similarity index 100% rename from src/kibana/apps/dashboard/styles/main.less rename to src/plugins/dashboard/styles/main.less diff --git a/src/kibana/apps/discover/_hit_sort_fn.js b/src/plugins/discover/_hit_sort_fn.js similarity index 100% rename from src/kibana/apps/discover/_hit_sort_fn.js rename to src/plugins/discover/_hit_sort_fn.js diff --git a/src/kibana/apps/discover/_segmented_fetch.js b/src/plugins/discover/_segmented_fetch.js similarity index 100% rename from src/kibana/apps/discover/_segmented_fetch.js rename to src/plugins/discover/_segmented_fetch.js diff --git a/src/kibana/apps/discover/components/field_chooser/discover_field.html b/src/plugins/discover/components/field_chooser/discover_field.html similarity index 100% rename from src/kibana/apps/discover/components/field_chooser/discover_field.html rename to src/plugins/discover/components/field_chooser/discover_field.html diff --git a/src/kibana/apps/discover/components/field_chooser/discover_field.js b/src/plugins/discover/components/field_chooser/discover_field.js similarity index 100% rename from src/kibana/apps/discover/components/field_chooser/discover_field.js rename to src/plugins/discover/components/field_chooser/discover_field.js diff --git a/src/kibana/apps/discover/components/field_chooser/discover_field_details.html b/src/plugins/discover/components/field_chooser/discover_field_details.html similarity index 100% rename from src/kibana/apps/discover/components/field_chooser/discover_field_details.html rename to src/plugins/discover/components/field_chooser/discover_field_details.html diff --git a/src/kibana/apps/discover/components/field_chooser/field_chooser.html b/src/plugins/discover/components/field_chooser/field_chooser.html similarity index 100% rename from src/kibana/apps/discover/components/field_chooser/field_chooser.html rename to src/plugins/discover/components/field_chooser/field_chooser.html diff --git a/src/kibana/apps/discover/components/field_chooser/field_chooser.js b/src/plugins/discover/components/field_chooser/field_chooser.js similarity index 100% rename from src/kibana/apps/discover/components/field_chooser/field_chooser.js rename to src/plugins/discover/components/field_chooser/field_chooser.js diff --git a/src/kibana/apps/discover/components/field_chooser/lib/field_calculator.js b/src/plugins/discover/components/field_chooser/lib/field_calculator.js similarity index 100% rename from src/kibana/apps/discover/components/field_chooser/lib/field_calculator.js rename to src/plugins/discover/components/field_chooser/lib/field_calculator.js diff --git a/src/kibana/apps/discover/controllers/discover.js b/src/plugins/discover/controllers/discover.js similarity index 100% rename from src/kibana/apps/discover/controllers/discover.js rename to src/plugins/discover/controllers/discover.js diff --git a/src/kibana/apps/discover/directives/table.js b/src/plugins/discover/directives/table.js similarity index 100% rename from src/kibana/apps/discover/directives/table.js rename to src/plugins/discover/directives/table.js diff --git a/src/kibana/apps/discover/directives/table_header.js b/src/plugins/discover/directives/table_header.js similarity index 100% rename from src/kibana/apps/discover/directives/table_header.js rename to src/plugins/discover/directives/table_header.js diff --git a/src/kibana/apps/discover/directives/table_row.js b/src/plugins/discover/directives/table_row.js similarity index 100% rename from src/kibana/apps/discover/directives/table_row.js rename to src/plugins/discover/directives/table_row.js diff --git a/src/kibana/apps/discover/directives/timechart.js b/src/plugins/discover/directives/timechart.js similarity index 100% rename from src/kibana/apps/discover/directives/timechart.js rename to src/plugins/discover/directives/timechart.js diff --git a/src/kibana/apps/discover/index.html b/src/plugins/discover/index.html similarity index 100% rename from src/kibana/apps/discover/index.html rename to src/plugins/discover/index.html diff --git a/src/kibana/apps/discover/index.js b/src/plugins/discover/index.js similarity index 100% rename from src/kibana/apps/discover/index.js rename to src/plugins/discover/index.js diff --git a/src/kibana/apps/discover/partials/load_search.html b/src/plugins/discover/partials/load_search.html similarity index 100% rename from src/kibana/apps/discover/partials/load_search.html rename to src/plugins/discover/partials/load_search.html diff --git a/src/kibana/apps/discover/partials/save_search.html b/src/plugins/discover/partials/save_search.html similarity index 100% rename from src/kibana/apps/discover/partials/save_search.html rename to src/plugins/discover/partials/save_search.html diff --git a/src/kibana/apps/discover/partials/settings.html b/src/plugins/discover/partials/settings.html similarity index 100% rename from src/kibana/apps/discover/partials/settings.html rename to src/plugins/discover/partials/settings.html diff --git a/src/kibana/apps/discover/partials/table.html b/src/plugins/discover/partials/table.html similarity index 100% rename from src/kibana/apps/discover/partials/table.html rename to src/plugins/discover/partials/table.html diff --git a/src/kibana/apps/discover/partials/table_header.html b/src/plugins/discover/partials/table_header.html similarity index 100% rename from src/kibana/apps/discover/partials/table_header.html rename to src/plugins/discover/partials/table_header.html diff --git a/src/kibana/apps/discover/partials/table_row/cell.html b/src/plugins/discover/partials/table_row/cell.html similarity index 100% rename from src/kibana/apps/discover/partials/table_row/cell.html rename to src/plugins/discover/partials/table_row/cell.html diff --git a/src/kibana/apps/discover/partials/table_row/details.html b/src/plugins/discover/partials/table_row/details.html similarity index 100% rename from src/kibana/apps/discover/partials/table_row/details.html rename to src/plugins/discover/partials/table_row/details.html diff --git a/src/kibana/apps/discover/partials/table_row/open.html b/src/plugins/discover/partials/table_row/open.html similarity index 100% rename from src/kibana/apps/discover/partials/table_row/open.html rename to src/plugins/discover/partials/table_row/open.html diff --git a/src/kibana/apps/discover/saved_searches/_saved_search.js b/src/plugins/discover/saved_searches/_saved_search.js similarity index 100% rename from src/kibana/apps/discover/saved_searches/_saved_search.js rename to src/plugins/discover/saved_searches/_saved_search.js diff --git a/src/kibana/apps/discover/saved_searches/saved_searches.js b/src/plugins/discover/saved_searches/saved_searches.js similarity index 100% rename from src/kibana/apps/discover/saved_searches/saved_searches.js rename to src/plugins/discover/saved_searches/saved_searches.js diff --git a/src/kibana/apps/discover/styles/main.less b/src/plugins/discover/styles/main.less similarity index 100% rename from src/kibana/apps/discover/styles/main.less rename to src/plugins/discover/styles/main.less diff --git a/src/kibana/apps/settings/app.html b/src/plugins/settings/app.html similarity index 100% rename from src/kibana/apps/settings/app.html rename to src/plugins/settings/app.html diff --git a/src/kibana/apps/settings/index.js b/src/plugins/settings/index.js similarity index 100% rename from src/kibana/apps/settings/index.js rename to src/plugins/settings/index.js diff --git a/src/kibana/apps/settings/saved_object_registry.js b/src/plugins/settings/saved_object_registry.js similarity index 100% rename from src/kibana/apps/settings/saved_object_registry.js rename to src/plugins/settings/saved_object_registry.js diff --git a/src/kibana/apps/settings/sections/about/elk.png b/src/plugins/settings/sections/about/elk.png similarity index 100% rename from src/kibana/apps/settings/sections/about/elk.png rename to src/plugins/settings/sections/about/elk.png diff --git a/src/kibana/apps/settings/sections/about/index.html b/src/plugins/settings/sections/about/index.html similarity index 100% rename from src/kibana/apps/settings/sections/about/index.html rename to src/plugins/settings/sections/about/index.html diff --git a/src/kibana/apps/settings/sections/about/index.js b/src/plugins/settings/sections/about/index.js similarity index 100% rename from src/kibana/apps/settings/sections/about/index.js rename to src/plugins/settings/sections/about/index.js diff --git a/src/kibana/apps/settings/sections/advanced/index.html b/src/plugins/settings/sections/advanced/index.html similarity index 100% rename from src/kibana/apps/settings/sections/advanced/index.html rename to src/plugins/settings/sections/advanced/index.html diff --git a/src/kibana/apps/settings/sections/advanced/index.js b/src/plugins/settings/sections/advanced/index.js similarity index 100% rename from src/kibana/apps/settings/sections/advanced/index.js rename to src/plugins/settings/sections/advanced/index.js diff --git a/src/kibana/apps/settings/sections/index.js b/src/plugins/settings/sections/index.js similarity index 100% rename from src/kibana/apps/settings/sections/index.js rename to src/plugins/settings/sections/index.js diff --git a/src/kibana/apps/settings/sections/indices/_create.html b/src/plugins/settings/sections/indices/_create.html similarity index 100% rename from src/kibana/apps/settings/sections/indices/_create.html rename to src/plugins/settings/sections/indices/_create.html diff --git a/src/kibana/apps/settings/sections/indices/_create.js b/src/plugins/settings/sections/indices/_create.js similarity index 100% rename from src/kibana/apps/settings/sections/indices/_create.js rename to src/plugins/settings/sections/indices/_create.js diff --git a/src/kibana/apps/settings/sections/indices/_edit.html b/src/plugins/settings/sections/indices/_edit.html similarity index 100% rename from src/kibana/apps/settings/sections/indices/_edit.html rename to src/plugins/settings/sections/indices/_edit.html diff --git a/src/kibana/apps/settings/sections/indices/_edit.js b/src/plugins/settings/sections/indices/_edit.js similarity index 100% rename from src/kibana/apps/settings/sections/indices/_edit.js rename to src/plugins/settings/sections/indices/_edit.js diff --git a/src/kibana/apps/settings/sections/indices/_refresh_kibana_index.js b/src/plugins/settings/sections/indices/_refresh_kibana_index.js similarity index 100% rename from src/kibana/apps/settings/sections/indices/_refresh_kibana_index.js rename to src/plugins/settings/sections/indices/_refresh_kibana_index.js diff --git a/src/kibana/apps/settings/sections/indices/index.html b/src/plugins/settings/sections/indices/index.html similarity index 100% rename from src/kibana/apps/settings/sections/indices/index.html rename to src/plugins/settings/sections/indices/index.html diff --git a/src/kibana/apps/settings/sections/indices/index.js b/src/plugins/settings/sections/indices/index.js similarity index 100% rename from src/kibana/apps/settings/sections/indices/index.js rename to src/plugins/settings/sections/indices/index.js diff --git a/src/kibana/apps/settings/sections/objects/_objects.html b/src/plugins/settings/sections/objects/_objects.html similarity index 100% rename from src/kibana/apps/settings/sections/objects/_objects.html rename to src/plugins/settings/sections/objects/_objects.html diff --git a/src/kibana/apps/settings/sections/objects/_objects.js b/src/plugins/settings/sections/objects/_objects.js similarity index 100% rename from src/kibana/apps/settings/sections/objects/_objects.js rename to src/plugins/settings/sections/objects/_objects.js diff --git a/src/kibana/apps/settings/sections/objects/_view.html b/src/plugins/settings/sections/objects/_view.html similarity index 100% rename from src/kibana/apps/settings/sections/objects/_view.html rename to src/plugins/settings/sections/objects/_view.html diff --git a/src/kibana/apps/settings/sections/objects/_view.js b/src/plugins/settings/sections/objects/_view.js similarity index 100% rename from src/kibana/apps/settings/sections/objects/_view.js rename to src/plugins/settings/sections/objects/_view.js diff --git a/src/kibana/apps/settings/sections/objects/index.js b/src/plugins/settings/sections/objects/index.js similarity index 100% rename from src/kibana/apps/settings/sections/objects/index.js rename to src/plugins/settings/sections/objects/index.js diff --git a/src/kibana/apps/settings/styles/main.less b/src/plugins/settings/styles/main.less similarity index 100% rename from src/kibana/apps/settings/styles/main.less rename to src/plugins/settings/styles/main.less diff --git a/src/kibana/apps/visualize/editor/add_bucket_agg.js b/src/plugins/visualize/editor/add_bucket_agg.js similarity index 100% rename from src/kibana/apps/visualize/editor/add_bucket_agg.js rename to src/plugins/visualize/editor/add_bucket_agg.js diff --git a/src/kibana/apps/visualize/editor/agg.html b/src/plugins/visualize/editor/agg.html similarity index 100% rename from src/kibana/apps/visualize/editor/agg.html rename to src/plugins/visualize/editor/agg.html diff --git a/src/kibana/apps/visualize/editor/agg.js b/src/plugins/visualize/editor/agg.js similarity index 100% rename from src/kibana/apps/visualize/editor/agg.js rename to src/plugins/visualize/editor/agg.js diff --git a/src/kibana/apps/visualize/editor/agg_filter.js b/src/plugins/visualize/editor/agg_filter.js similarity index 100% rename from src/kibana/apps/visualize/editor/agg_filter.js rename to src/plugins/visualize/editor/agg_filter.js diff --git a/src/kibana/apps/visualize/editor/agg_group.html b/src/plugins/visualize/editor/agg_group.html similarity index 100% rename from src/kibana/apps/visualize/editor/agg_group.html rename to src/plugins/visualize/editor/agg_group.html diff --git a/src/kibana/apps/visualize/editor/agg_group.js b/src/plugins/visualize/editor/agg_group.js similarity index 100% rename from src/kibana/apps/visualize/editor/agg_group.js rename to src/plugins/visualize/editor/agg_group.js diff --git a/src/kibana/apps/visualize/editor/agg_param.js b/src/plugins/visualize/editor/agg_param.js similarity index 100% rename from src/kibana/apps/visualize/editor/agg_param.js rename to src/plugins/visualize/editor/agg_param.js diff --git a/src/kibana/apps/visualize/editor/agg_select.html b/src/plugins/visualize/editor/agg_select.html similarity index 100% rename from src/kibana/apps/visualize/editor/agg_select.html rename to src/plugins/visualize/editor/agg_select.html diff --git a/src/kibana/apps/visualize/editor/editor.html b/src/plugins/visualize/editor/editor.html similarity index 100% rename from src/kibana/apps/visualize/editor/editor.html rename to src/plugins/visualize/editor/editor.html diff --git a/src/kibana/apps/visualize/editor/editor.js b/src/plugins/visualize/editor/editor.js similarity index 100% rename from src/kibana/apps/visualize/editor/editor.js rename to src/plugins/visualize/editor/editor.js diff --git a/src/kibana/apps/visualize/editor/nesting_indicator.js b/src/plugins/visualize/editor/nesting_indicator.js similarity index 100% rename from src/kibana/apps/visualize/editor/nesting_indicator.js rename to src/plugins/visualize/editor/nesting_indicator.js diff --git a/src/kibana/apps/visualize/editor/panels/load.html b/src/plugins/visualize/editor/panels/load.html similarity index 100% rename from src/kibana/apps/visualize/editor/panels/load.html rename to src/plugins/visualize/editor/panels/load.html diff --git a/src/kibana/apps/visualize/editor/panels/save.html b/src/plugins/visualize/editor/panels/save.html similarity index 100% rename from src/kibana/apps/visualize/editor/panels/save.html rename to src/plugins/visualize/editor/panels/save.html diff --git a/src/kibana/apps/visualize/editor/panels/share.html b/src/plugins/visualize/editor/panels/share.html similarity index 100% rename from src/kibana/apps/visualize/editor/panels/share.html rename to src/plugins/visualize/editor/panels/share.html diff --git a/src/kibana/apps/visualize/editor/sidebar.html b/src/plugins/visualize/editor/sidebar.html similarity index 100% rename from src/kibana/apps/visualize/editor/sidebar.html rename to src/plugins/visualize/editor/sidebar.html diff --git a/src/kibana/apps/visualize/editor/sidebar.js b/src/plugins/visualize/editor/sidebar.js similarity index 100% rename from src/kibana/apps/visualize/editor/sidebar.js rename to src/plugins/visualize/editor/sidebar.js diff --git a/src/kibana/apps/visualize/editor/styles/editor.less b/src/plugins/visualize/editor/styles/editor.less similarity index 100% rename from src/kibana/apps/visualize/editor/styles/editor.less rename to src/plugins/visualize/editor/styles/editor.less diff --git a/src/kibana/apps/visualize/index.js b/src/plugins/visualize/index.js similarity index 100% rename from src/kibana/apps/visualize/index.js rename to src/plugins/visualize/index.js diff --git a/src/kibana/apps/visualize/saved_visualizations/_saved_vis.js b/src/plugins/visualize/saved_visualizations/_saved_vis.js similarity index 100% rename from src/kibana/apps/visualize/saved_visualizations/_saved_vis.js rename to src/plugins/visualize/saved_visualizations/_saved_vis.js diff --git a/src/kibana/apps/visualize/saved_visualizations/saved_visualizations.js b/src/plugins/visualize/saved_visualizations/saved_visualizations.js similarity index 100% rename from src/kibana/apps/visualize/saved_visualizations/saved_visualizations.js rename to src/plugins/visualize/saved_visualizations/saved_visualizations.js diff --git a/src/kibana/apps/visualize/styles/main.less b/src/plugins/visualize/styles/main.less similarity index 100% rename from src/kibana/apps/visualize/styles/main.less rename to src/plugins/visualize/styles/main.less diff --git a/src/kibana/apps/visualize/wizard/step_1.html b/src/plugins/visualize/wizard/step_1.html similarity index 100% rename from src/kibana/apps/visualize/wizard/step_1.html rename to src/plugins/visualize/wizard/step_1.html diff --git a/src/kibana/apps/visualize/wizard/step_2.html b/src/plugins/visualize/wizard/step_2.html similarity index 100% rename from src/kibana/apps/visualize/wizard/step_2.html rename to src/plugins/visualize/wizard/step_2.html diff --git a/src/kibana/apps/visualize/wizard/wizard.js b/src/plugins/visualize/wizard/wizard.js similarity index 100% rename from src/kibana/apps/visualize/wizard/wizard.js rename to src/plugins/visualize/wizard/wizard.js diff --git a/src/server/bin/initialize b/src/server/bin/initialize index e6ebfb047641..c297875878eb 100755 --- a/src/server/bin/initialize +++ b/src/server/bin/initialize @@ -62,6 +62,9 @@ host = (options[:host] || config['host']) # Set the override for Elasticsaerch elasticsearch = (options[:elasticsearch] || config['elasticsearch']) +# absolute path to this directory +dir = File.dirname(__FILE__) + # If the env isn't set we need to set it to development ENV["RACK_ENV"] = "development" if ENV["RACK_ENV"].nil? @@ -70,14 +73,16 @@ Kibana.global_settings[:port] = port || 5601 Kibana.global_settings[:host] = host || '0.0.0.0' Kibana.global_settings[:config] = config Kibana.global_settings[:elasticsearch] = elasticsearch -Kibana.global_settings[:root] = File.expand_path("#{File.dirname(__FILE__)}/../") +Kibana.global_settings[:root] = File.expand_path("#{dir}/../") Kibana.global_settings[:quiet] = options[:quiet] # Set the public folder based on whether we are running in production or not. if ENV['RACK_ENV'] == ('production') - Kibana.global_settings[:public_folder] = File.expand_path("#{File.dirname(__FILE__)}/../public/") + Kibana.global_settings[:public_folder] = File.expand_path("#{dir}/../public/") + Kibana.global_settings[:plugin_folder] = File.expand_path("#{dir}/../../plugins/") else - Kibana.global_settings[:public_folder] = File.expand_path("#{File.dirname(__FILE__)}/../../kibana/") + Kibana.global_settings[:public_folder] = File.expand_path("#{dir}/../../kibana/") + Kibana.global_settings[:plugin_folder] = File.expand_path("#{dir}/../../../plugins/") end # Add the root of the project to the load path diff --git a/src/server/config/kibana.yml b/src/server/config/kibana.yml index f47cc553e98a..1dc3aa848f97 100644 --- a/src/server/config/kibana.yml +++ b/src/server/config/kibana.yml @@ -8,13 +8,5 @@ elasticsearch: "http://localhost:9200" # and dashboards. It will create an new index if it doesn't already exist. kibanaIndex: "kibana-int" -# Applications loaded and included into Kibana. Use the settings below to -# customize the applications and thier names. -apps: - - { id: "discover", name: "Discover" } - - { id: "visualize", name: "Visualize" } - - { id: "dashboard", name: "Dashboard" } - - { id: "settings", name: "Settings" } - # The default application to laad. defaultAppId: "discover" diff --git a/src/server/routes/base.rb b/src/server/routes/base.rb index 392960376da8..05fd1bd19971 100644 --- a/src/server/routes/base.rb +++ b/src/server/routes/base.rb @@ -13,6 +13,7 @@ module Kibana set :root, Kibana.global_settings[:root] set :public_folder, Kibana.global_settings[:public_folder] + set :plugin_folder, Kibana.global_settings[:plugin_folder] set :httponly, true set :config, config end diff --git a/src/server/routes/home.rb b/src/server/routes/home.rb index dc63b369d878..19986192d43b 100644 --- a/src/server/routes/home.rb +++ b/src/server/routes/home.rb @@ -13,6 +13,12 @@ module Kibana # to the proxy for elasticsearch data = settings.config.clone() data['elasticsearch'] = "#{request.scheme}://#{request.host}:#{request.port}/elasticsearch" + + plugin_pattern = File.join(settings.plugin_folder, '*', 'index.js') + data['plugins'] = Dir.glob(plugin_pattern).map { |path| + path.sub(settings.plugin_folder, 'plugins').sub(/\.js$/, '') + } + json data end diff --git a/tasks/config/requirejs.js b/tasks/config/requirejs.js index 4c3ea6bb0ca4..0df6b2df9d1b 100644 --- a/tasks/config/requirejs.js +++ b/tasks/config/requirejs.js @@ -61,10 +61,11 @@ module.exports = function (grunt) { // include each app var main = config.build.options.modules[0]; - var configFile = grunt.file.readYAML(grunt.config.get('configFile')); - configFile.apps.forEach(function (app) { - main.include.push('apps/' + app.id + '/index'); - }); + // TODO: load files as plugins + // var configFile = grunt.file.readYAML(grunt.config.get('configFile')); + // configFile.apps.forEach(function (app) { + // main.include.push('apps/' + app.id + '/index'); + // }); return config; };