deprecate and remove elasticsearch.startupTimeout config

elastic · Sep 28, 2020 · 7c111f4 · 7c111f4
1 parent 9aab7d1
commit 7c111f4
Show file tree

Hide file tree

Showing 10 changed files with 4 additions and 16 deletions.
diff --git a/config/kibana.yml b/config/kibana.yml
@@ -76,9 +76,6 @@
 # Time in milliseconds for Elasticsearch to wait for responses from shards. Set to 0 to disable.
 #elasticsearch.shardTimeout: 30000
 
-# Time in milliseconds to wait for Elasticsearch at Kibana startup before retrying.
-#elasticsearch.startupTimeout: 5000
-
 # Logs queries sent to Elasticsearch. Requires logging.verbose set to true.
 #elasticsearch.logQueries: false
 

diff --git a/docs/setup/settings.asciidoc b/docs/setup/settings.asciidoc
@@ -199,10 +199,6 @@ making an outbound SSL/TLS connection to {es}. Valid values are `"full"`,
 using `"certificate"` skips hostname verification, and using `"none"` skips
 verification entirely. *Default: `"full"`*
 
-| `elasticsearch.startupTimeout:`
- | Time in milliseconds to wait for {es} at {kib} startup before retrying.
-*Default: `5000`*
-
 |[[elasticsearch-user-passwd]] `elasticsearch.username:` and `elasticsearch.password:`
  | If your {es} is protected with basic authentication, these settings provide
 the username and password that the {kib} server uses to perform maintenance

diff --git a/src/core/server/config/deprecation/core_deprecations.ts b/src/core/server/config/deprecation/core_deprecations.ts
@@ -137,6 +137,7 @@ export const coreDeprecationProvider: ConfigDeprecationProvider = ({ rename, unu
   unusedFromRoot('optimize.profile'),
   unusedFromRoot('optimize.validateSyntaxOfNodeModules'),
   unusedFromRoot('elasticsearch.preserveHost'),
+  unusedFromRoot('elasticsearch.startupTimeout'),
   rename('cpu.cgroup.path.override', 'ops.cGroupOverrides.cpuPath'),
   rename('cpuacct.cgroup.path.override', 'ops.cGroupOverrides.cpuAcctPath'),
   configPathDeprecation,

diff --git a/src/core/server/elasticsearch/elasticsearch_config.ts b/src/core/server/elasticsearch/elasticsearch_config.ts
@@ -70,7 +70,6 @@ export const configSchema = schema.object({
   shardTimeout: schema.duration({ defaultValue: '30s' }),
   requestTimeout: schema.duration({ defaultValue: '30s' }),
   pingTimeout: schema.duration({ defaultValue: schema.siblingRef('requestTimeout') }),
-  startupTimeout: schema.duration({ defaultValue: '5s' }),
   logQueries: schema.boolean({ defaultValue: false }),
   ssl: schema.object(
     {

diff --git a/src/core/server/mocks.ts b/src/core/server/mocks.ts
@@ -67,7 +67,6 @@ export function pluginInitializerContextConfigMock<T>(config: T) {
       shardTimeout: duration('30s'),
       requestTimeout: duration('30s'),
       pingTimeout: duration('30s'),
-      startupTimeout: duration('30s'),
     },
     path: { data: '/tmp' },
     savedObjects: {

diff --git a/src/core/server/plugins/plugin_context.test.ts b/src/core/server/plugins/plugin_context.test.ts
@@ -91,7 +91,6 @@ describe('createPluginInitializerContext', () => {
         shardTimeout: duration(30, 's'),
         requestTimeout: duration(30, 's'),
         pingTimeout: duration(30, 's'),
-        startupTimeout: duration(5, 's'),
       },
       path: { data: fromRoot('data') },
       savedObjects: { maxImportPayloadBytes: new ByteSizeValue(10485760) },

diff --git a/src/core/server/plugins/types.ts b/src/core/server/plugins/types.ts
@@ -262,7 +262,7 @@ export interface Plugin<
 export const SharedGlobalConfigKeys = {
   // We can add more if really needed
   kibana: ['index', 'autocompleteTerminateAfter', 'autocompleteTimeout'] as const,
-  elasticsearch: ['shardTimeout', 'requestTimeout', 'pingTimeout', 'startupTimeout'] as const,
+  elasticsearch: ['shardTimeout', 'requestTimeout', 'pingTimeout'] as const,
   path: ['data'] as const,
   savedObjects: ['maxImportPayloadBytes'] as const,
 };

diff --git a/src/core/server/server.api.md b/src/core/server/server.api.md
@@ -355,7 +355,6 @@ export const config: {
             shardTimeout: Type<import("moment").Duration>;
             requestTimeout: Type<import("moment").Duration>;
             pingTimeout: Type<import("moment").Duration>;
-            startupTimeout: Type<import("moment").Duration>;
             logQueries: Type<boolean>;
             ssl: import("@kbn/config-schema").ObjectType<{
                 verificationMode: Type<"none" | "certificate" | "full">;

diff --git a/src/dev/build/tasks/os_packages/docker_generator/resources/bin/kibana-docker b/src/dev/build/tasks/os_packages/docker_generator/resources/bin/kibana-docker
@@ -8,11 +8,11 @@
 #
 # eg. Setting the environment variable:
 #
-#       ELASTICSEARCH_STARTUPTIMEOUT=60
+#       ELASTICSEARCH_LOGQUERIES=true
 #
 # will cause Kibana to be invoked with:
 #
-#       --elasticsearch.startupTimeout=60
+#       --elasticsearch.logQueries=true
 
 kibana_vars=(
     console.enabled
@@ -46,7 +46,6 @@ kibana_vars=(
     elasticsearch.ssl.truststore.path
     elasticsearch.ssl.truststore.password
     elasticsearch.ssl.verificationMode
-    elasticsearch.startupTimeout
     elasticsearch.username
     i18n.locale
     interpreter.enableInVisualize

diff --git a/x-pack/plugins/monitoring/server/config.test.ts b/x-pack/plugins/monitoring/server/config.test.ts
@@ -86,7 +86,6 @@ describe('config schema', () => {
               "truststore": Object {},
               "verificationMode": "full",
             },
-            "startupTimeout": "PT5S",
           },
           "enabled": true,
           "logs": Object {