maxmustermann/kibana
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Always add Manager setup route. Fleet, if enabled (#64859)

Browse source 
Co-authored-by: Elastic Machine <elasticmachine@users.noreply.github.com>
This commit is contained in:
John Schulz 2020-04-30 10:50:55 -04:00 committed by GitHub
parent d75328c476
commit 793d6f5689
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 8 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
x-pack/plugins/ingest_manager/server/plugin.ts
View file

@ -150,6 +150,7 @@ export class IngestManagerPlugin
const config = await this.config$.pipe(first()).toPromise();
// Register routes
registerSetupRoutes(router, config);
registerAgentConfigRoutes(router);
registerDatasourceRoutes(router);
registerOutputRoutes(router);
@ -162,7 +163,6 @@ export class IngestManagerPlugin
}
if (config.fleet.enabled) {
registerSetupRoutes(router);
registerAgentRoutes(router);
registerEnrollmentApiKeyRoutes(router);
registerInstallScriptRoutes({

8
x-pack/plugins/ingest_manager/server/routes/setup/index.ts
View file

@ -5,13 +5,14 @@
*/
import { IRouter } from 'src/core/server';
import { PLUGIN_ID, FLEET_SETUP_API_ROUTES, SETUP_API_ROUTE } from '../../constants';
import { IngestManagerConfigType } from '../../../common';
import {
getFleetSetupHandler,
createFleetSetupHandler,
ingestManagerSetupHandler,
} from './handlers';
export const registerRoutes = (router: IRouter) => {
export const registerRoutes = (router: IRouter, config: IngestManagerConfigType) => {
// Ingest manager setup
router.post(
{
@ -23,6 +24,11 @@ export const registerRoutes = (router: IRouter) => {
},
ingestManagerSetupHandler
);
if (!config.fleet.enabled) {
return;
}
// Get Fleet setup
router.get(
{