Merge pull request #828 from sirensolutions/kibi-issue-6

introduced kibi_version variable

modified_kibana_files.txt

@@ -46,6 +46,7 @@ src/plugins/kibana/public/kibana.js
 
 src/plugins/kibana/public/settings/app.html
 src/plugins/kibana/public/settings/index.js
+src/plugins/kibana/public/settings/sections/about/index.js
 src/plugins/kibana/public/settings/sections/about/index.html
 src/plugins/kibana/public/settings/sections/advanced/lib/to_editable_config.js
 src/plugins/kibana/public/settings/sections/index.js
@@ -74,8 +75,9 @@ src/server/KbnServer.js
 
 src/testUtils/stub_index_pattern.js
 
+src/ui/index.js
 src/ui/UiBundlerEnv.js
-
+src/ui/public/chrome/api/angular.js
 src/ui/public/Vis/VisType.js
 
 src/ui/public/agg_table/agg_table.js
@@ -164,6 +166,7 @@ tasks/build/installNpmDeps.js
 tasks/build/pleaserun.js
 tasks/build/run.js
 tasks/build/versionedLinks.js
+tasks/build/packageJson.js
 
 tasks/config/copy.js
 tasks/config/platforms.js

package.json

@@ -16,7 +16,8 @@
  "SPARQL"
  ],
  "private": false,
- "version": "0.3.2",
+ "version": "4.4.1",
+ "kibi_version": "0.3.2",
  "build": {
  "number": 8467,
  "sha": "6cb7fec4e154faa0a4a3fee4b33dfef91b9870d9"

src/plugins/kibana/public/settings/sections/about/index.html

@@ -11,7 +11,7 @@ <h2>Kibi</h2>
  <table class="table table-condensed kbn-settings-about-versions">
  <tr>
  <td>Version</td>
- <td>{{kbnVersion}}</td>
+ <td>{{kibiVersion}}</td>
  </tr>
 
  <tr>
@@ -26,7 +26,7 @@ <h2>Kibi</h2>
 
  <tr>
  <td>Powered by</td>
- <td><a href="https://www.elastic.co/blog/kibana-4-4-1-and-4-3-2-and-4-1-5">Kibana 4.4.1</a></td>
+ <td><a href="https://www.elastic.co/blog/kibana-4-4-1-and-4-3-2-and-4-1-5">Kibana {{kbnVersion}}</a></td>
  </tr>
 
  </table>

src/plugins/kibana/public/settings/sections/about/index.js

@@ -7,8 +7,9 @@ define(function (require) {
  });
 
  require('ui/modules').get('apps/settings')
- .controller('settingsAbout', function ($scope, kbnVersion, buildNum, buildSha) {
+ .controller('settingsAbout', function ($scope, kbnVersion, kibiVersion, buildNum, buildSha) {
  $scope.kbnVersion = kbnVersion;
+ $scope.kibiVersion = kibiVersion; // kibi: added to manage kibi version
  $scope.buildNum = buildNum;
  $scope.buildSha = buildSha;
  });

src/server/KbnServer.js

@@ -10,6 +10,7 @@ module.exports = class KbnServer {
  constructor(settings) {
  this.name = pkg.name;
  this.version = pkg.version;
+ this.kibi_version = pkg.kibi_version; // kibi: added to manage kibi version
  this.build = pkg.build || false;
  this.rootDir = rootDir;
  this.settings = settings || {};

src/server/config/schema.js

@@ -10,6 +10,7 @@ const randomBytes = require('crypto').randomBytes;
 module.exports = () => Joi.object({
  pkg: Joi.object({
  version: Joi.string().default(Joi.ref('$version')),
+ kibi_version: Joi.string().default(Joi.ref('$kibi_version')), // kibi: added to manage kibi version
  buildNum: Joi.number().default(Joi.ref('$buildNum')),
  buildSha: Joi.string().default(Joi.ref('$buildSha')),
  }).default(),

src/ui/index.js

@@ -21,6 +21,7 @@ module.exports = async (kbnServer, server, config) => {
  bundlerEnv.addContext('urlBasePath', config.get('server.basePath'));
  bundlerEnv.addContext('sourceMaps', config.get('optimize.sourceMaps'));
  bundlerEnv.addContext('kbnVersion', config.get('pkg.version'));
+ bundlerEnv.addContext('kibiVersion', config.get('pkg.kibi_version')); // kibi: added to manage kibi version
  bundlerEnv.addContext('buildNum', config.get('pkg.buildNum'));
  uiExports.addConsumer(bundlerEnv);
 
@@ -73,6 +74,7 @@ module.exports = async (kbnServer, server, config) => {
  app: app,
  nav: uiExports.apps,
  version: kbnServer.version,
+ kibi_version: kbnServer.kibi_version, // kibi: added to manage kibi version
  buildNum: config.get('pkg.buildNum'),
  buildSha: config.get('pkg.buildSha'),
  basePath: config.get('server.basePath'),

src/ui/public/chrome/api/angular.js

@@ -12,6 +12,7 @@ module.exports = function (chrome, internals) {
 
  kibana
  .value('kbnVersion', internals.version)
+ .value('kibiVersion', internals.kibi_version) // kibi: added to manage kibi version
  .value('buildNum', internals.buildNum)
  .value('buildSha', internals.buildSha)
  .value('sessionId', Date.now())

src/ui/views/ui_app.jade

@@ -30,7 +30,7 @@ block content
   is loading. Give me a moment here. I'm loading a whole bunch of code. Don't worry, all this good stuff will be cached up for next time!
  br
  small
- span Version [#{kibanaPayload.version}] - Powered by
+ span Version [#{kibanaPayload.kibi_version}] - Powered by
  a(href="https://www.elastic.co/blog/kibana-4-4-1-and-4-3-2-and-4-1-5") Kibana 4.4.1
 
 

tasks/build/packageJson.js

@@ -13,6 +13,7 @@ module.exports = function (grunt) {
  description: pkg.description,
  keywords: pkg.keywords,
  version: pkg.version,
+ kibi_version: pkg.kibi_version, // kibi: added to manage kibi version
  build: {
  number: grunt.config.get('buildNum'),
  sha: grunt.config.get('buildSha')

tasks/config/platforms.js

@@ -1,7 +1,7 @@
 module.exports = function (grunt) {
  let { resolve } = require('path');
 
- let version = grunt.config.get('pkg.version');
+ let version = grunt.config.get('pkg.kibi_version'); // kibi: use kibi version instead of kibana one
  let nodeVersion = grunt.config.get('nodeVersion');
  let rootPath = grunt.config.get('root');
  let baseUri = `https://nodejs.org/dist/v${nodeVersion}`;