Fix plugin enabled config options (elastic#60998)

joshdover · Mar 25, 2020 · b19fb5e · b19fb5e
1 parent fcad526
commit b19fb5e
Show file tree

Hide file tree

Showing 15 changed files with 17 additions and 4 deletions.
diff --git a/src/plugins/apm_oss/server/index.ts b/src/plugins/apm_oss/server/index.ts
@@ -23,6 +23,7 @@ import { APMOSSPlugin } from './plugin';
 
 export const config = {
   schema: schema.object({
+    enabled: schema.boolean({ defaultValue: true }),
     transactionIndices: schema.string({ defaultValue: 'apm-*' }),
     spanIndices: schema.string({ defaultValue: 'apm-*' }),
     errorIndices: schema.string({ defaultValue: 'apm-*' }),

diff --git a/src/plugins/timelion/config.ts b/src/plugins/timelion/config.ts
@@ -21,6 +21,7 @@ import { schema, TypeOf } from '@kbn/config-schema';
 
 export const configSchema = schema.object(
   {
+    enabled: schema.boolean({ defaultValue: true }),
     ui: schema.object({ enabled: schema.boolean({ defaultValue: false }) }),
     graphiteUrls: schema.maybe(schema.arrayOf(schema.string())),
   },

diff --git a/x-pack/plugins/advanced_ui_actions/kibana.json b/x-pack/plugins/advanced_ui_actions/kibana.json
@@ -1,6 +1,7 @@
 {
   "id": "advancedUiActions",
   "version": "kibana",
+  "configPath": ["xpack", "advanced_ui_actions"],
   "requiredPlugins": [
     "embeddable",
     "uiActions"

diff --git a/x-pack/plugins/alerting_builtins/kibana.json b/x-pack/plugins/alerting_builtins/kibana.json
@@ -4,5 +4,6 @@
   "version": "8.0.0",
   "kibanaVersion": "kibana",
   "requiredPlugins": ["alerting"],
+  "configPath": ["xpack", "alerting_builtins"],
   "ui": false
 }
diff --git a/x-pack/plugins/data_enhanced/kibana.json b/x-pack/plugins/data_enhanced/kibana.json
@@ -3,7 +3,7 @@
   "version": "8.0.0",
   "kibanaVersion": "kibana",
   "configPath": [
-    "xpack"
+    "xpack", "data_enhanced"
   ],
   "requiredPlugins": [
     "data"

diff --git a/x-pack/plugins/drilldowns/kibana.json b/x-pack/plugins/drilldowns/kibana.json
@@ -3,6 +3,7 @@
   "version": "kibana",
   "server": false,
   "ui": true,
+  "configPath": ["xpack", "drilldowns"],
   "requiredPlugins": [
     "uiActions",
     "embeddable"

diff --git a/x-pack/plugins/features/kibana.json b/x-pack/plugins/features/kibana.json
@@ -3,6 +3,7 @@
   "version": "8.0.0",
   "kibanaVersion": "kibana",
   "optionalPlugins": ["timelion"],
+  "configPath": ["xpack", "features"],
   "server": true,
   "ui": true
 }
diff --git a/x-pack/plugins/lens/kibana.json b/x-pack/plugins/lens/kibana.json
@@ -4,5 +4,6 @@
   "kibanaVersion": "kibana",
   "server": true,
   "ui": false,
-  "optionalPlugins": ["usageCollection", "taskManager"]
+  "optionalPlugins": ["usageCollection", "taskManager"],
+  "configPath": ["xpack", "lens"]
 }
diff --git a/x-pack/plugins/observability/kibana.json b/x-pack/plugins/observability/kibana.json
@@ -2,5 +2,6 @@
   "id": "observability",
   "version": "8.0.0",
   "kibanaVersion": "kibana",
+  "configPath": ["xpack", "observability"],
   "ui": true
 }
diff --git a/x-pack/plugins/oss_telemetry/kibana.json b/x-pack/plugins/oss_telemetry/kibana.json
@@ -4,5 +4,6 @@
   "version": "8.0.0",
   "kibanaVersion": "kibana",
   "requiredPlugins": ["usageCollection", "taskManager"],
+  "configPath": ["xpack", "oss_telemetry"],
   "ui": false
 }
diff --git a/x-pack/plugins/reporting/kibana.json b/x-pack/plugins/reporting/kibana.json
@@ -2,6 +2,7 @@
   "id": "reporting",
   "version": "8.0.0",
   "kibanaVersion": "kibana",
+  "configPath": ["xpack", "reporting"],
   "requiredPlugins": [
     "home",
     "management",

diff --git a/x-pack/plugins/searchprofiler/kibana.json b/x-pack/plugins/searchprofiler/kibana.json
@@ -3,6 +3,7 @@
   "version": "8.0.0",
   "kibanaVersion": "kibana",
   "requiredPlugins": ["devTools", "home", "licensing"],
+  "configPath": ["xpack", "searchprofiler"],
   "server": true,
   "ui": true
 }
diff --git a/x-pack/plugins/triggers_actions_ui/kibana.json b/x-pack/plugins/triggers_actions_ui/kibana.json
@@ -4,5 +4,6 @@
   "server": false,
   "ui": true,
   "optionalPlugins": ["alerting", "alertingBuiltins"],
-  "requiredPlugins": ["management", "charts", "data"]
+  "requiredPlugins": ["management", "charts", "data"],
+  "configPath": ["xpack", "trigger_actions_ui"]
 }
diff --git a/x-pack/plugins/uptime/kibana.json b/x-pack/plugins/uptime/kibana.json
@@ -1,5 +1,5 @@
 {
-  "configPath": ["xpack"],
+  "configPath": ["xpack", "uptime"],
   "id": "uptime",
   "kibanaVersion": "kibana",
   "requiredPlugins": ["alerting", "features", "licensing", "usageCollection"],

diff --git a/x-pack/plugins/watcher/kibana.json b/x-pack/plugins/watcher/kibana.json
@@ -1,5 +1,6 @@
 {
   "id": "watcher",
+  "configPath": ["xpack", "watcher"],
   "version": "kibana",
   "requiredPlugins": [
     "home",