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

fix for #7329 -- plugin versions updated #7747

Merged
merged 3 commits into from
Jul 26, 2016
Merged

fix for #7329 -- plugin versions updated #7747

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
974f7cf
fix for #7329 -- plugin versions updated
ppisljar Jul 14, 2016
d59f530
removed core_plugins version from plugin.json and updated status api …
ppisljar Jul 24, 2016
54d0088
if plugins version is set to 'kibana' then kibana version is used.
ppisljar Jul 25, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 1 addition & 2 deletions src/core_plugins/console/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,5 @@
"contributors": [
"Spencer Alger <spencer.alger@elastic.co>"
],
"name": "console",
"version": "1.0.0"
"name": "console"
}
3 changes: 1 addition & 2 deletions src/core_plugins/dev_mode/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
{
"name": "dev_mode",
"version": "1.0.0"
"name": "dev_mode"
}
3 changes: 1 addition & 2 deletions src/core_plugins/elasticsearch/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
{
"name": "elasticsearch",
"version": "1.0.0"
"name": "elasticsearch"
}
3 changes: 1 addition & 2 deletions src/core_plugins/kbn_doc_views/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
{
"name": "kbn_doc_views",
"version": "1.0.0"
"name": "kbn_doc_views"
}
3 changes: 1 addition & 2 deletions src/core_plugins/kbn_vislib_vis_types/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
{
"name": "kbn_vislib_vis_types",
"version": "1.0.0"
"name": "kbn_vislib_vis_types"
}
3 changes: 1 addition & 2 deletions src/core_plugins/kibana/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
{
"name": "kibana",
"version": "1.0.0"
"name": "kibana"
}
3 changes: 1 addition & 2 deletions src/core_plugins/markdown_vis/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
{
"name": "markdown_vis",
"version": "1.0.0"
"name": "markdown_vis"
}
3 changes: 1 addition & 2 deletions src/core_plugins/metric_vis/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
{
"name": "metric_vis",
"version": "1.0.0"
"name": "metric_vis"
}
3 changes: 1 addition & 2 deletions src/core_plugins/spy_modes/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
{
"name": "spy_modes",
"version": "1.0.0"
"name": "spy_modes"
}
3 changes: 1 addition & 2 deletions src/core_plugins/status_page/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
{
"name": "status_page",
"version": "1.0.0"
"name": "status_page"
}
3 changes: 1 addition & 2 deletions src/core_plugins/table_vis/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
{
"name": "table_vis",
"version": "1.0.0"
"name": "table_vis"
}
3 changes: 1 addition & 2 deletions src/core_plugins/tests_bundle/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
{
"name": "tests_bundle",
"version": "0.0.0"
"name": "tests_bundle"
}
2 changes: 2 additions & 0 deletions src/server/status/server_status.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@ import _ from 'lodash';

import states from './states';
import Status from './status';
import {version} from '../../../package.json';

module.exports = class ServerStatus {
constructor(server) {
Expand All @@ -16,6 +17,7 @@ module.exports = class ServerStatus {
}

createForPlugin(plugin) {
plugin.version = plugin.version || version;
Copy link
Member

Choose a reason for hiding this comment

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

I wonder if this is too loose? I like what it's enabling, but I wonder if the behavior should be explicit?

Instead of removing version from every built-in plugin, just mark it with "version" : "kibana", or something similar, and use that to inherit Kibana's version. That way it at least implies to plugin authors that they should provide their own version number and not just make version irrelevant for every plugin ("oh, it always matches Kibana", which shouldn't be true for things that are compiled + released at the same time).

const status = this.create(`plugin:${plugin.id}@${plugin.version}`);
status.plugin = plugin;
return status;
Expand Down