Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fix plugin enabled config options #60998

Merged
merged 4 commits into from
Mar 25, 2020
Merged

Fix plugin enabled config options #60998

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
a49bc02
Add enabled config to plugins that need it
joshdover Mar 23, 2020
6fcbd00
Fix configPath for xpack plugins
joshdover Mar 23, 2020
604a3bb
Merge remote-tracking branch 'upstream/master' into np/fix-enabled-co…
joshdover Mar 24, 2020
7965794
Merge branch 'master' into np/fix-enabled-config
joshdover Mar 25, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions src/plugins/apm_oss/server/index.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,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-*' }),
Expand Down
1 change: 1 addition & 0 deletions src/plugins/timelion/config.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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())),
},
Expand Down
1 change: 1 addition & 0 deletions x-pack/plugins/advanced_ui_actions/kibana.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
{
"id": "advancedUiActions",
"version": "kibana",
"configPath": ["xpack", "advanced_ui_actions"],
"requiredPlugins": [
"embeddable",
"uiActions"
Expand Down
1 change: 1 addition & 0 deletions x-pack/plugins/alerting_builtins/kibana.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,5 +4,6 @@
"version": "8.0.0",
"kibanaVersion": "kibana",
"requiredPlugins": ["alerting"],
"configPath": ["xpack", "alerting_builtins"],
"ui": false
}
2 changes: 1 addition & 1 deletion x-pack/plugins/data_enhanced/kibana.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
"version": "8.0.0",
"kibanaVersion": "kibana",
"configPath": [
"xpack"
"xpack", "data_enhanced"
],
"requiredPlugins": [
"data"
Expand Down
1 change: 1 addition & 0 deletions x-pack/plugins/drilldowns/kibana.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,5 +3,6 @@
"version": "kibana",
"server": false,
"ui": true,
"configPath": ["xpack", "drilldowns"],
"requiredPlugins": ["uiActions", "embeddable", "advancedUiActions"]
}
1 change: 1 addition & 0 deletions x-pack/plugins/features/kibana.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
"version": "8.0.0",
"kibanaVersion": "kibana",
"optionalPlugins": ["timelion"],
"configPath": ["xpack", "features"],
"server": true,
"ui": true
}
3 changes: 2 additions & 1 deletion x-pack/plugins/lens/kibana.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,5 +4,6 @@
"kibanaVersion": "kibana",
"server": true,
"ui": false,
"optionalPlugins": ["usageCollection", "taskManager"]
"optionalPlugins": ["usageCollection", "taskManager"],
"configPath": ["xpack", "lens"]
}
1 change: 1 addition & 0 deletions x-pack/plugins/observability/kibana.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,5 +2,6 @@
"id": "observability",
"version": "8.0.0",
"kibanaVersion": "kibana",
"configPath": ["xpack", "observability"],
"ui": true
}
1 change: 1 addition & 0 deletions x-pack/plugins/oss_telemetry/kibana.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,5 +4,6 @@
"version": "8.0.0",
"kibanaVersion": "kibana",
"requiredPlugins": ["usageCollection", "taskManager"],
"configPath": ["xpack", "oss_telemetry"],
"ui": false
}
1 change: 1 addition & 0 deletions x-pack/plugins/reporting/kibana.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@
"id": "reporting",
"version": "8.0.0",
"kibanaVersion": "kibana",
"configPath": ["xpack", "reporting"],
"requiredPlugins": [
"home",
"management",
Expand Down
1 change: 1 addition & 0 deletions x-pack/plugins/searchprofiler/kibana.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
"version": "8.0.0",
"kibanaVersion": "kibana",
"requiredPlugins": ["devTools", "home", "licensing"],
"configPath": ["xpack", "searchprofiler"],
"server": true,
"ui": true
}
3 changes: 2 additions & 1 deletion x-pack/plugins/triggers_actions_ui/kibana.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,5 +4,6 @@
"server": false,
"ui": true,
"optionalPlugins": ["alerting", "alertingBuiltins"],
"requiredPlugins": ["management", "charts", "data"]
"requiredPlugins": ["management", "charts", "data"],
"configPath": ["xpack", "trigger_actions_ui"]
}
2 changes: 1 addition & 1 deletion x-pack/plugins/uptime/kibana.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"configPath": ["xpack"],
"configPath": ["xpack", "uptime"],
"id": "uptime",
"kibanaVersion": "kibana",
"requiredPlugins": ["alerting", "features", "licensing", "usageCollection"],
Expand Down
1 change: 1 addition & 0 deletions x-pack/plugins/watcher/kibana.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
{
"id": "watcher",
"configPath": ["xpack", "watcher"],
"version": "kibana",
"requiredPlugins": [
"home",
Expand Down