Merge branch 'master' of github.com:sirensolutions/kibi-internal

src/plugins/kibi_core/lib/query_engine.js

@@ -92,7 +92,9 @@ QueryEngine.prototype.loadPredefinedData = function () {
  if (self.config.get('pkg.kibiEnterpriseEnabled')) {
  return self._loadDatasources().then(function () {
  return self._loadQueries().then(function () {
- fulfill(true);
+ return self._refreshKibiIndex().then(function () {
+ fulfill(true);
+ });
  });
  });
  } else {
@@ -143,6 +145,14 @@ QueryEngine.prototype._loadTemplatesMapping = function () {
  });
 };
 
+QueryEngine.prototype._refreshKibiIndex = function () {
+ var self = this;
+ return self.client.indices.refresh({
+ index: self.config.get('kibana.index'),
+ force: true
+ });
+};
+
 QueryEngine.prototype.gremlin = function (datasourceParams, options) {
  // TODO: remove when https://github.com/sirensolutions/kibi-internal/issues/906 is fixed
  var parsedTimeout = parseInt(datasourceParams.timeout);
@@ -369,8 +379,9 @@ QueryEngine.prototype.reloadQueries = function () {
  var queryDefinitions = [];
  var datasourcesIds = [];
  if (resp.hits && resp.hits.hits && resp.hits.hits.length > 0) {
+ self.log.info('Reloading ' + resp.hits.hits.length + ' queries into memory:');
  _.each(resp.hits.hits, function (hit) {
-
+ self.log.info('Reloading [' + hit._id + ']');
  var queryDefinition = {
  id: hit._id,
  label: hit._source.title,
@@ -441,6 +452,7 @@ QueryEngine.prototype.reloadQueries = function () {
  queryDef.datasource = datasource._source;
  return true;
  }
+ self.log.error('Query [' + queryDef.id + '] not loaded because datasource [' + queryDef.datasourceId + '] not found');
  return false;
  }).map(function (queryDef) {
  // now once we have query definitions and datasources load queries