Merge pull request #7428 from ycombinator/gh-7424

Don't turn Kibana plugin red if Kibana index is not yet ready
elastic · Jun 10, 2016 · 5cf440c · 5cf440c
2 parents 60d3374 + 3425818
commit 5cf440c
Showing 1 changed file with 5 additions and 2 deletions.
diff --git a/src/ui/settings/index.js b/src/ui/settings/index.js
@@ -24,8 +24,11 @@ export default function setupSettings(kbnServer, server, config) {
   }
 
   function userSettingsNotFound(kibanaVersion) {
-    const message = 'Could not find user-provided settings for this version of Kibana (' + kibanaVersion + ')';
-    server.plugins.kibana.status.red(message);
+    if (server.plugins.elasticsearch.status.state === 'green') {
+      server.plugins.kibana.status.red(`Could not find user-provided settings for this version of Kibana (${kibanaVersion})`);
+    } else {
+      server.log(['warning', 'settings'], 'User-provided settings were requested before the Kibana index was ready');
+    }
     return {};
   }