Kibana index template

package.json

@@ -189,6 +189,7 @@
     "rimraf": "2.4.3",
     "rison-node": "1.0.0",
     "rjs-repack-loader": "1.0.6",
+    "rxjs": "5.4.3",
     "script-loader": "0.6.1",
     "semver": "5.1.0",
     "style-loader": "0.12.3",

src/cli/cluster/cluster_manager.js

@@ -15,7 +15,6 @@ export default class ClusterManager {
     const serverArgv = [];
     const optimizerArgv = [
       '--plugins.initialize=false',
-      '--uiSettings.enabled=false',
       '--server.autoListen=false',
     ];
 

src/cli/serve/__tests__/fixtures/reload_logging_config/kibana.test.yml

@@ -4,3 +4,5 @@ logging:
   json: true
 optimize:
   enabled: false
+plugins:
+  initialize: false

src/cli/serve/__tests__/reload_logging_config.js

@@ -72,7 +72,7 @@ describe(`Server logging configuration`, function () {
       }
 
       function switchToPlainTextLog() {
-        json = 3; // ignore both "reloading" messages + ui settings status message
+        json = 2; // ignore both "reloading" messages
         setLoggingJson(false);
         child.kill(`SIGHUP`); // reload logging config
       }

src/core_plugins/elasticsearch/index.js

@@ -119,9 +119,14 @@ export default function (kibana) {
       createProxy(server, 'POST', '/{index}/_search');
       createProxy(server, 'POST', '/_msearch');
 
+      server.expose('waitUntilReady', () => {
+        return new Promise(resolve => {
+          this.status.once('green', resolve);
+        });
+      });
+
       // Set up the health check service and start it.
-      const { start, waitUntilReady } = healthCheck(this, server);
-      server.expose('waitUntilReady', waitUntilReady);
+      const { start } = healthCheck(this, server);
       start();
     }
   });

src/core_plugins/elasticsearch/lib/__tests__/health_check.js

@@ -4,12 +4,9 @@ import expect from 'expect.js';
 
 const NoConnections = require('elasticsearch').errors.NoConnections;
 
-import mappings from './fixtures/mappings';
 import healthCheck from '../health_check';
 import kibanaVersion from '../kibana_version';
 import { esTestConfig } from '../../../../test_utils/es';
-import * as patchKibanaIndexNS from '../patch_kibana_index';
-import * as migrateConfigNS from '../migrate_config';
 
 const esPort = esTestConfig.getPort();
 const esUrl = esTestConfig.getUrl();
@@ -33,8 +30,6 @@ describe('plugins/elasticsearch', () => {
 
       // Stub the Kibana version instead of drawing from package.json.
       sandbox.stub(kibanaVersion, 'get').returns(COMPATIBLE_VERSION_NUMBER);
-      sandbox.stub(patchKibanaIndexNS, 'patchKibanaIndex');
-      sandbox.stub(migrateConfigNS, 'migrateConfig');
 
       // setup the plugin stub
       plugin = {
@@ -80,9 +75,6 @@ describe('plugins/elasticsearch', () => {
             getCluster: sinon.stub().returns(cluster)
           }
         },
-        getKibanaIndexMappingsDsl() {
-          return mappings;
-        },
         ext: sinon.stub()
       };
 
@@ -126,7 +118,6 @@ describe('plugins/elasticsearch', () => {
 
           sinon.assert.calledOnce(cluster.callWithInternalUser.withArgs('ping'));
           sinon.assert.calledTwice(cluster.callWithInternalUser.withArgs('nodes.info', sinon.match.any));
-          sinon.assert.calledOnce(cluster.callWithInternalUser.withArgs('cluster.health', sinon.match.any));
           sinon.assert.notCalled(plugin.status.red);
           sinon.assert.calledOnce(plugin.status.green);
 
@@ -155,68 +146,9 @@ describe('plugins/elasticsearch', () => {
 
           sinon.assert.calledTwice(ping);
           sinon.assert.calledTwice(cluster.callWithInternalUser.withArgs('nodes.info', sinon.match.any));
-          sinon.assert.calledOnce(cluster.callWithInternalUser.withArgs('cluster.health', sinon.match.any));
-          sinon.assert.calledOnce(plugin.status.green);
-          expect(plugin.status.green.args[0][0]).to.be('Kibana index ready');
-        });
-    });
-
-    it('should set the cluster red if the health check status is red, then to green', function () {
-      cluster.callWithInternalUser.withArgs('ping').returns(Promise.resolve());
-
-      const clusterHealth = cluster.callWithInternalUser.withArgs('cluster.health', sinon.match.any);
-      clusterHealth.onCall(0).returns(Promise.resolve({ timed_out: false, status: 'red' }));
-      clusterHealth.onCall(1).returns(Promise.resolve({ timed_out: false, status: 'green' }));
-
-      return health.run()
-        .then(function () {
-          sinon.assert.calledOnce(plugin.status.yellow);
-          expect(plugin.status.yellow.args[0][0]).to.be('Waiting for Elasticsearch');
-          sinon.assert.calledOnce(plugin.status.red);
-          expect(plugin.status.red.args[0][0]).to.be(
-            'Elasticsearch is still initializing the kibana index.'
-          );
-          sinon.assert.calledOnce(cluster.callWithInternalUser.withArgs('ping'));
-          sinon.assert.calledTwice(cluster.callWithInternalUser.withArgs('nodes.info', sinon.match.any));
-          sinon.assert.calledTwice(cluster.callWithInternalUser.withArgs('cluster.health', sinon.match.any));
           sinon.assert.calledOnce(plugin.status.green);
           expect(plugin.status.green.args[0][0]).to.be('Kibana index ready');
         });
     });
-
-    it('should set the cluster yellow if the health check timed_out and create index', function () {
-      cluster.callWithInternalUser.withArgs('ping').returns(Promise.resolve());
-
-      const clusterHealth = cluster.callWithInternalUser.withArgs('cluster.health', sinon.match.any);
-      clusterHealth.onCall(0).returns(Promise.resolve({ timed_out: true, status: 'red' }));
-      clusterHealth.onCall(1).returns(Promise.resolve({ timed_out: false, status: 'green' }));
-
-      cluster.callWithInternalUser.withArgs('indices.create', sinon.match.any).returns(Promise.resolve());
-
-      return health.run()
-        .then(function () {
-          sinon.assert.calledTwice(plugin.status.yellow);
-          expect(plugin.status.yellow.args[0][0]).to.be('Waiting for Elasticsearch');
-          expect(plugin.status.yellow.args[1][0]).to.be('No existing Kibana index found');
-
-          sinon.assert.calledOnce(cluster.callWithInternalUser.withArgs('ping'));
-          sinon.assert.calledOnce(cluster.callWithInternalUser.withArgs('indices.create', sinon.match.any));
-          sinon.assert.calledTwice(cluster.callWithInternalUser.withArgs('nodes.info', sinon.match.any));
-          sinon.assert.calledTwice(clusterHealth);
-        });
-    });
-
-    describe('#waitUntilReady', function () {
-      it('polls health until index is ready', function () {
-        const clusterHealth = cluster.callWithInternalUser.withArgs('cluster.health', sinon.match.any);
-        clusterHealth.onCall(0).returns(Promise.resolve({ timed_out: true }));
-        clusterHealth.onCall(1).returns(Promise.resolve({ status: 'red' }));
-        clusterHealth.onCall(2).returns(Promise.resolve({ status: 'green' }));
-
-        return health.waitUntilReady().then(function () {
-          sinon.assert.calledThrice(clusterHealth);
-        });
-      });
-    });
   });
 });