Skip to content

Commit 9429f18

Browse files
author
John Schulz
committed
Default EPM & Fleet to enabled
1 parent 5a55c9a commit 9429f18

File tree

5 files changed

+7
-11
lines changed

5 files changed

+7
-11
lines changed

x-pack/plugins/ingest_manager/README.md

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
# Ingest Manager
22
## Plugin
3-
- No features enabled by default. See the TypeScript type for the [the available plugin configuration options](https://github.com/elastic/kibana/blob/feature-ingest/x-pack/plugins/ingest_manager/common/types/index.ts#L9-L19)
4-
- Setting `xpack.ingestManager.enabled=true` is required to enable the plugin. It adds the `DATASOURCE_API_ROUTES` and `AGENT_CONFIG_API_ROUTES` values in [`common/constants/routes.ts`](./common/constants/routes.ts)
5-
- Adding `--xpack.ingestManager.epm.enabled=true` will add the EPM API & UI
6-
- Adding `--xpack.ingestManager.fleet.enabled=true` will add the Fleet API & UI
3+
- The plugin is disabled by default. See the TypeScript type for the [the available plugin configuration options](https://github.com/elastic/kibana/blob/master/x-pack/plugins/ingest_manager/common/types/index.ts#L9-L27)
4+
- Setting `xpack.ingestManager.enabled=true` enables the plugin including the EPM and Fleet features. It also adds the `DATASOURCE_API_ROUTES` and `AGENT_CONFIG_API_ROUTES` values in [`common/constants/routes.ts`](./common/constants/routes.ts)
5+
- Adding `--xpack.ingestManager.epm.enabled=false` will disable the EPM API & UI
6+
- Adding `--xpack.ingestManager.fleet.enabled=false` will disable the Fleet API & UI
77
- [code for adding the routes](https://github.com/elastic/kibana/blob/1f27d349533b1c2865c10c45b2cf705d7416fb36/x-pack/plugins/ingest_manager/server/plugin.ts#L115-L133)
88
- [Integration tests](server/integration_tests/router.test.ts)
99
- Both EPM and Fleet require `ingestManager` be enabled. They are not standalone features.
@@ -25,7 +25,7 @@ One common development workflow is:
2525
```
2626
- Start Kibana in another shell
2727
```
28-
yarn start --xpack.ingestManager.enabled=true --xpack.ingestManager.epm.enabled=true --xpack.ingestManager.fleet.enabled=true --no-base-path --xpack.endpoint.enabled=true
28+
yarn start --xpack.ingestManager.enabled=true --no-base-path --xpack.endpoint.enabled=true
2929
```
3030
3131
This plugin follows the `common`, `server`, `public` structure from the [Architecture Style Guide

x-pack/plugins/ingest_manager/server/index.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,11 +18,11 @@ export const config = {
1818
schema: schema.object({
1919
enabled: schema.boolean({ defaultValue: false }),
2020
epm: schema.object({
21-
enabled: schema.boolean({ defaultValue: false }),
21+
enabled: schema.boolean({ defaultValue: true }),
2222
registryUrl: schema.uri({ defaultValue: 'https://epr-staging.elastic.co' }),
2323
}),
2424
fleet: schema.object({
25-
enabled: schema.boolean({ defaultValue: false }),
25+
enabled: schema.boolean({ defaultValue: true }),
2626
kibana: schema.object({
2727
host: schema.maybe(schema.string()),
2828
ca_sha256: schema.maybe(schema.string()),

x-pack/test/api_integration/config.js

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,6 @@ export async function getApiIntegrationConfig({ readConfigFile }) {
3030
'--telemetry.optIn=true',
3131
'--xpack.endpoint.enabled=true',
3232
'--xpack.ingestManager.enabled=true',
33-
'--xpack.ingestManager.fleet.enabled=true',
3433
'--xpack.endpoint.alertResultListDefaultDateRange.from=2018-01-10T00:00:00.000Z',
3534
],
3635
},

x-pack/test/epm_api_integration/config.ts

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,6 @@ export default async function({ readConfigFile }: FtrConfigProviderContext) {
2828
...xPackAPITestsConfig.get('kbnTestServer'),
2929
serverArgs: [
3030
...xPackAPITestsConfig.get('kbnTestServer.serverArgs'),
31-
'--xpack.ingestManager.epm.enabled=true',
3231
'--xpack.ingestManager.epm.registryUrl=http://localhost:6666',
3332
],
3433
},

x-pack/test/functional_endpoint/config.ts

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -30,8 +30,6 @@ export default async function({ readConfigFile }: FtrConfigProviderContext) {
3030
...xpackFunctionalConfig.get('kbnTestServer.serverArgs'),
3131
'--xpack.endpoint.enabled=true',
3232
'--xpack.ingestManager.enabled=true',
33-
'--xpack.ingestManager.epm.enabled=true',
34-
'--xpack.ingestManager.fleet.enabled=true',
3533
],
3634
},
3735
};

0 commit comments

Comments
 (0)