From 0e9e39ea136d0977f74bfe9685dced250d93cef7 Mon Sep 17 00:00:00 2001 From: ppisljar Date: Thu, 14 Jul 2016 15:03:02 +0200 Subject: [PATCH 1/3] fix for #7329 -- plugin versions updated Former-commit-id: 974f7cfc855edb32d85ab15cd93b3abe93526a74 --- src/core_plugins/console/package.json | 2 +- src/core_plugins/dev_mode/package.json | 2 +- src/core_plugins/elasticsearch/package.json | 2 +- src/core_plugins/kbn_doc_views/package.json | 2 +- src/core_plugins/kbn_vislib_vis_types/package.json | 2 +- src/core_plugins/kibana/package.json | 2 +- src/core_plugins/markdown_vis/package.json | 2 +- src/core_plugins/metric_vis/package.json | 2 +- src/core_plugins/spy_modes/package.json | 2 +- src/core_plugins/status_page/package.json | 2 +- src/core_plugins/table_vis/package.json | 2 +- src/core_plugins/tests_bundle/package.json | 2 +- 12 files changed, 12 insertions(+), 12 deletions(-) diff --git a/src/core_plugins/console/package.json b/src/core_plugins/console/package.json index 047796b02a57b6..d8b1bc88163676 100644 --- a/src/core_plugins/console/package.json +++ b/src/core_plugins/console/package.json @@ -4,5 +4,5 @@ "Spencer Alger " ], "name": "console", - "version": "1.0.0" + "version": "5.0.0-alpha5" } diff --git a/src/core_plugins/dev_mode/package.json b/src/core_plugins/dev_mode/package.json index 666d9a81a6a70c..0db8bc060bd2a7 100644 --- a/src/core_plugins/dev_mode/package.json +++ b/src/core_plugins/dev_mode/package.json @@ -1,4 +1,4 @@ { "name": "dev_mode", - "version": "1.0.0" + "version": "5.0.0-alpha5" } diff --git a/src/core_plugins/elasticsearch/package.json b/src/core_plugins/elasticsearch/package.json index 7f441251c3036f..adc8fb2f3821ae 100644 --- a/src/core_plugins/elasticsearch/package.json +++ b/src/core_plugins/elasticsearch/package.json @@ -1,4 +1,4 @@ { "name": "elasticsearch", - "version": "1.0.0" + "version": "5.0.0-alpha5" } diff --git a/src/core_plugins/kbn_doc_views/package.json b/src/core_plugins/kbn_doc_views/package.json index 5541860d7e4500..d4595a5a8aa260 100644 --- a/src/core_plugins/kbn_doc_views/package.json +++ b/src/core_plugins/kbn_doc_views/package.json @@ -1,4 +1,4 @@ { "name": "kbn_doc_views", - "version": "1.0.0" + "version": "5.0.0-alpha5" } diff --git a/src/core_plugins/kbn_vislib_vis_types/package.json b/src/core_plugins/kbn_vislib_vis_types/package.json index fc8863542cc4a9..7eb438cf2d93e4 100644 --- a/src/core_plugins/kbn_vislib_vis_types/package.json +++ b/src/core_plugins/kbn_vislib_vis_types/package.json @@ -1,4 +1,4 @@ { "name": "kbn_vislib_vis_types", - "version": "1.0.0" + "version": "5.0.0-alpha5" } diff --git a/src/core_plugins/kibana/package.json b/src/core_plugins/kibana/package.json index 4ff821e670ce71..fb2ffdc8766ef0 100644 --- a/src/core_plugins/kibana/package.json +++ b/src/core_plugins/kibana/package.json @@ -1,4 +1,4 @@ { "name": "kibana", - "version": "1.0.0" + "version": "5.0.0-alpha5" } diff --git a/src/core_plugins/markdown_vis/package.json b/src/core_plugins/markdown_vis/package.json index e47e6b73a69959..206925bf8ad032 100644 --- a/src/core_plugins/markdown_vis/package.json +++ b/src/core_plugins/markdown_vis/package.json @@ -1,4 +1,4 @@ { "name": "markdown_vis", - "version": "1.0.0" + "version": "5.0.0-alpha5" } diff --git a/src/core_plugins/metric_vis/package.json b/src/core_plugins/metric_vis/package.json index 76c59dab399e5c..cdeffedce71a42 100644 --- a/src/core_plugins/metric_vis/package.json +++ b/src/core_plugins/metric_vis/package.json @@ -1,4 +1,4 @@ { "name": "metric_vis", - "version": "1.0.0" + "version": "5.0.0-alpha5" } diff --git a/src/core_plugins/spy_modes/package.json b/src/core_plugins/spy_modes/package.json index 8bf42bfa865a79..014f417cd7ad9c 100644 --- a/src/core_plugins/spy_modes/package.json +++ b/src/core_plugins/spy_modes/package.json @@ -1,4 +1,4 @@ { "name": "spy_modes", - "version": "1.0.0" + "version": "5.0.0-alpha5" } diff --git a/src/core_plugins/status_page/package.json b/src/core_plugins/status_page/package.json index 551751fda01ca6..ea05f1bce348cc 100644 --- a/src/core_plugins/status_page/package.json +++ b/src/core_plugins/status_page/package.json @@ -1,4 +1,4 @@ { "name": "status_page", - "version": "1.0.0" + "version": "5.0.0-alpha5" } diff --git a/src/core_plugins/table_vis/package.json b/src/core_plugins/table_vis/package.json index cc3d0ef348c9cf..7a2c3bb984ce2c 100644 --- a/src/core_plugins/table_vis/package.json +++ b/src/core_plugins/table_vis/package.json @@ -1,4 +1,4 @@ { "name": "table_vis", - "version": "1.0.0" + "version": "5.0.0-alpha5" } diff --git a/src/core_plugins/tests_bundle/package.json b/src/core_plugins/tests_bundle/package.json index dd351b09560c46..cbee1d7ac26f3a 100644 --- a/src/core_plugins/tests_bundle/package.json +++ b/src/core_plugins/tests_bundle/package.json @@ -1,4 +1,4 @@ { "name": "tests_bundle", - "version": "0.0.0" + "version": "5.0.0-alpha5" } From b749e74ca32b1863df8745fe3e80ea53137fcc9e Mon Sep 17 00:00:00 2001 From: ppisljar Date: Sun, 24 Jul 2016 18:52:04 +0200 Subject: [PATCH 2/3] removed core_plugins version from plugin.json and updated status api to reflect the change Former-commit-id: d59f5309af0f3e49773b3ac845c2c386f62d29af --- src/core_plugins/console/package.json | 3 +-- src/core_plugins/dev_mode/package.json | 3 +-- src/core_plugins/elasticsearch/package.json | 3 +-- src/core_plugins/kbn_doc_views/package.json | 3 +-- src/core_plugins/kbn_vislib_vis_types/package.json | 3 +-- src/core_plugins/kibana/package.json | 3 +-- src/core_plugins/markdown_vis/package.json | 3 +-- src/core_plugins/metric_vis/package.json | 3 +-- src/core_plugins/spy_modes/package.json | 3 +-- src/core_plugins/status_page/package.json | 3 +-- src/core_plugins/table_vis/package.json | 3 +-- src/core_plugins/tests_bundle/package.json | 3 +-- src/server/status/server_status.js | 2 ++ 13 files changed, 14 insertions(+), 24 deletions(-) diff --git a/src/core_plugins/console/package.json b/src/core_plugins/console/package.json index d8b1bc88163676..2fdc703ebaf174 100644 --- a/src/core_plugins/console/package.json +++ b/src/core_plugins/console/package.json @@ -3,6 +3,5 @@ "contributors": [ "Spencer Alger " ], - "name": "console", - "version": "5.0.0-alpha5" + "name": "console" } diff --git a/src/core_plugins/dev_mode/package.json b/src/core_plugins/dev_mode/package.json index 0db8bc060bd2a7..79cd7b88f447e4 100644 --- a/src/core_plugins/dev_mode/package.json +++ b/src/core_plugins/dev_mode/package.json @@ -1,4 +1,3 @@ { - "name": "dev_mode", - "version": "5.0.0-alpha5" + "name": "dev_mode" } diff --git a/src/core_plugins/elasticsearch/package.json b/src/core_plugins/elasticsearch/package.json index adc8fb2f3821ae..5235163db0849d 100644 --- a/src/core_plugins/elasticsearch/package.json +++ b/src/core_plugins/elasticsearch/package.json @@ -1,4 +1,3 @@ { - "name": "elasticsearch", - "version": "5.0.0-alpha5" + "name": "elasticsearch" } diff --git a/src/core_plugins/kbn_doc_views/package.json b/src/core_plugins/kbn_doc_views/package.json index d4595a5a8aa260..dc2679adab3934 100644 --- a/src/core_plugins/kbn_doc_views/package.json +++ b/src/core_plugins/kbn_doc_views/package.json @@ -1,4 +1,3 @@ { - "name": "kbn_doc_views", - "version": "5.0.0-alpha5" + "name": "kbn_doc_views" } diff --git a/src/core_plugins/kbn_vislib_vis_types/package.json b/src/core_plugins/kbn_vislib_vis_types/package.json index 7eb438cf2d93e4..5e714ae49ae6cf 100644 --- a/src/core_plugins/kbn_vislib_vis_types/package.json +++ b/src/core_plugins/kbn_vislib_vis_types/package.json @@ -1,4 +1,3 @@ { - "name": "kbn_vislib_vis_types", - "version": "5.0.0-alpha5" + "name": "kbn_vislib_vis_types" } diff --git a/src/core_plugins/kibana/package.json b/src/core_plugins/kibana/package.json index fb2ffdc8766ef0..f709146d523762 100644 --- a/src/core_plugins/kibana/package.json +++ b/src/core_plugins/kibana/package.json @@ -1,4 +1,3 @@ { - "name": "kibana", - "version": "5.0.0-alpha5" + "name": "kibana" } diff --git a/src/core_plugins/markdown_vis/package.json b/src/core_plugins/markdown_vis/package.json index 206925bf8ad032..438fcde05bde90 100644 --- a/src/core_plugins/markdown_vis/package.json +++ b/src/core_plugins/markdown_vis/package.json @@ -1,4 +1,3 @@ { - "name": "markdown_vis", - "version": "5.0.0-alpha5" + "name": "markdown_vis" } diff --git a/src/core_plugins/metric_vis/package.json b/src/core_plugins/metric_vis/package.json index cdeffedce71a42..5b12ea1ca065ba 100644 --- a/src/core_plugins/metric_vis/package.json +++ b/src/core_plugins/metric_vis/package.json @@ -1,4 +1,3 @@ { - "name": "metric_vis", - "version": "5.0.0-alpha5" + "name": "metric_vis" } diff --git a/src/core_plugins/spy_modes/package.json b/src/core_plugins/spy_modes/package.json index 014f417cd7ad9c..e4264b710cb119 100644 --- a/src/core_plugins/spy_modes/package.json +++ b/src/core_plugins/spy_modes/package.json @@ -1,4 +1,3 @@ { - "name": "spy_modes", - "version": "5.0.0-alpha5" + "name": "spy_modes" } diff --git a/src/core_plugins/status_page/package.json b/src/core_plugins/status_page/package.json index ea05f1bce348cc..5a225c993fbe4e 100644 --- a/src/core_plugins/status_page/package.json +++ b/src/core_plugins/status_page/package.json @@ -1,4 +1,3 @@ { - "name": "status_page", - "version": "5.0.0-alpha5" + "name": "status_page" } diff --git a/src/core_plugins/table_vis/package.json b/src/core_plugins/table_vis/package.json index 7a2c3bb984ce2c..a12fa3650fc639 100644 --- a/src/core_plugins/table_vis/package.json +++ b/src/core_plugins/table_vis/package.json @@ -1,4 +1,3 @@ { - "name": "table_vis", - "version": "5.0.0-alpha5" + "name": "table_vis" } diff --git a/src/core_plugins/tests_bundle/package.json b/src/core_plugins/tests_bundle/package.json index cbee1d7ac26f3a..533fd007bd0ff1 100644 --- a/src/core_plugins/tests_bundle/package.json +++ b/src/core_plugins/tests_bundle/package.json @@ -1,4 +1,3 @@ { - "name": "tests_bundle", - "version": "5.0.0-alpha5" + "name": "tests_bundle" } diff --git a/src/server/status/server_status.js b/src/server/status/server_status.js index e292a41da0c47b..4022238adae498 100644 --- a/src/server/status/server_status.js +++ b/src/server/status/server_status.js @@ -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) { @@ -16,6 +17,7 @@ module.exports = class ServerStatus { } createForPlugin(plugin) { + plugin.version = plugin.version || version; const status = this.create(`plugin:${plugin.id}@${plugin.version}`); status.plugin = plugin; return status; From e0e5fd3cb14d263f2b93d0c870bd0b7ac917abbb Mon Sep 17 00:00:00 2001 From: ppisljar Date: Mon, 25 Jul 2016 10:18:35 +0200 Subject: [PATCH 3/3] if plugins version is set to 'kibana' then kibana version is used. Former-commit-id: 54d0088c6f81f9a656a258d23716fdb12dacf48e --- src/core_plugins/console/package.json | 3 ++- src/core_plugins/dev_mode/package.json | 3 ++- src/core_plugins/elasticsearch/package.json | 3 ++- src/core_plugins/kbn_doc_views/package.json | 3 ++- src/core_plugins/kbn_vislib_vis_types/package.json | 3 ++- src/core_plugins/kibana/package.json | 3 ++- src/core_plugins/markdown_vis/package.json | 3 ++- src/core_plugins/metric_vis/package.json | 3 ++- src/core_plugins/spy_modes/package.json | 3 ++- src/core_plugins/status_page/package.json | 3 ++- src/core_plugins/table_vis/package.json | 3 ++- src/core_plugins/tests_bundle/package.json | 3 ++- src/server/status/server_status.js | 2 +- 13 files changed, 25 insertions(+), 13 deletions(-) diff --git a/src/core_plugins/console/package.json b/src/core_plugins/console/package.json index 2fdc703ebaf174..84ebcb95889c7f 100644 --- a/src/core_plugins/console/package.json +++ b/src/core_plugins/console/package.json @@ -3,5 +3,6 @@ "contributors": [ "Spencer Alger " ], - "name": "console" + "name": "console", + "version": "kibana" } diff --git a/src/core_plugins/dev_mode/package.json b/src/core_plugins/dev_mode/package.json index 79cd7b88f447e4..8d1ceddb721a3b 100644 --- a/src/core_plugins/dev_mode/package.json +++ b/src/core_plugins/dev_mode/package.json @@ -1,3 +1,4 @@ { - "name": "dev_mode" + "name": "dev_mode", + "version": "kibana" } diff --git a/src/core_plugins/elasticsearch/package.json b/src/core_plugins/elasticsearch/package.json index 5235163db0849d..75f95f485f2bda 100644 --- a/src/core_plugins/elasticsearch/package.json +++ b/src/core_plugins/elasticsearch/package.json @@ -1,3 +1,4 @@ { - "name": "elasticsearch" + "name": "elasticsearch", + "version": "kibana" } diff --git a/src/core_plugins/kbn_doc_views/package.json b/src/core_plugins/kbn_doc_views/package.json index dc2679adab3934..efad9ec42f1f29 100644 --- a/src/core_plugins/kbn_doc_views/package.json +++ b/src/core_plugins/kbn_doc_views/package.json @@ -1,3 +1,4 @@ { - "name": "kbn_doc_views" + "name": "kbn_doc_views", + "version": "kibana" } diff --git a/src/core_plugins/kbn_vislib_vis_types/package.json b/src/core_plugins/kbn_vislib_vis_types/package.json index 5e714ae49ae6cf..b6df6eb794de8b 100644 --- a/src/core_plugins/kbn_vislib_vis_types/package.json +++ b/src/core_plugins/kbn_vislib_vis_types/package.json @@ -1,3 +1,4 @@ { - "name": "kbn_vislib_vis_types" + "name": "kbn_vislib_vis_types", + "version": "kibana" } diff --git a/src/core_plugins/kibana/package.json b/src/core_plugins/kibana/package.json index f709146d523762..cdedd49c270524 100644 --- a/src/core_plugins/kibana/package.json +++ b/src/core_plugins/kibana/package.json @@ -1,3 +1,4 @@ { - "name": "kibana" + "name": "kibana", + "version": "kibana" } diff --git a/src/core_plugins/markdown_vis/package.json b/src/core_plugins/markdown_vis/package.json index 438fcde05bde90..5c233d82fe5067 100644 --- a/src/core_plugins/markdown_vis/package.json +++ b/src/core_plugins/markdown_vis/package.json @@ -1,3 +1,4 @@ { - "name": "markdown_vis" + "name": "markdown_vis", + "version": "kibana" } diff --git a/src/core_plugins/metric_vis/package.json b/src/core_plugins/metric_vis/package.json index 5b12ea1ca065ba..e570261fc30dd3 100644 --- a/src/core_plugins/metric_vis/package.json +++ b/src/core_plugins/metric_vis/package.json @@ -1,3 +1,4 @@ { - "name": "metric_vis" + "name": "metric_vis", + "version": "kibana" } diff --git a/src/core_plugins/spy_modes/package.json b/src/core_plugins/spy_modes/package.json index e4264b710cb119..067144133b3a8c 100644 --- a/src/core_plugins/spy_modes/package.json +++ b/src/core_plugins/spy_modes/package.json @@ -1,3 +1,4 @@ { - "name": "spy_modes" + "name": "spy_modes", + "version": "kibana" } diff --git a/src/core_plugins/status_page/package.json b/src/core_plugins/status_page/package.json index 5a225c993fbe4e..cecfe30f1173cb 100644 --- a/src/core_plugins/status_page/package.json +++ b/src/core_plugins/status_page/package.json @@ -1,3 +1,4 @@ { - "name": "status_page" + "name": "status_page", + "version": "kibana" } diff --git a/src/core_plugins/table_vis/package.json b/src/core_plugins/table_vis/package.json index a12fa3650fc639..2809b0e0478365 100644 --- a/src/core_plugins/table_vis/package.json +++ b/src/core_plugins/table_vis/package.json @@ -1,3 +1,4 @@ { - "name": "table_vis" + "name": "table_vis", + "version": "kibana" } diff --git a/src/core_plugins/tests_bundle/package.json b/src/core_plugins/tests_bundle/package.json index 533fd007bd0ff1..4d2df048d41647 100644 --- a/src/core_plugins/tests_bundle/package.json +++ b/src/core_plugins/tests_bundle/package.json @@ -1,3 +1,4 @@ { - "name": "tests_bundle" + "name": "tests_bundle", + "version": "kibana" } diff --git a/src/server/status/server_status.js b/src/server/status/server_status.js index 4022238adae498..88c44354f2e71e 100644 --- a/src/server/status/server_status.js +++ b/src/server/status/server_status.js @@ -17,7 +17,7 @@ module.exports = class ServerStatus { } createForPlugin(plugin) { - plugin.version = plugin.version || version; + if (plugin.version === 'kibana') plugin.version = version; const status = this.create(`plugin:${plugin.id}@${plugin.version}`); status.plugin = plugin; return status;